@vesk/vesk-cli 0.2.94 → 0.2.96

package/dist/cli.js

@@ -608,6 +608,14 @@ var init_errors = __esm({
 });
 
 // ../compiler/src/ir.ts
+function regionMarkerId(node) {
+  const ast = node.condition.ast;
+  if (ast && typeof ast.start === "number") return `s${ast.start}`;
+  const raw2 = node.condition.raw;
+  let hash = 5381;
+  for (let i = 0; i < raw2.length; i++) hash = (hash << 5) + hash + raw2.charCodeAt(i) | 0;
+  return `h${(hash >>> 0).toString(36)}`;
+}
 var Expression, IRRoot, ComponentIR, StaticNode, TextNode, DynamicBinding, OpaqueDynamicRegion, MapRegion, ComponentRef, ComponentCall, SlotNode, PropSlot, PropSlotRender, WhileLoop, SwitchCase, SwitchBlock, TryCatch, TrackDecl, RuntimeStatement, BreakSignal, ForLoop, ServerBlock, ClientBlock, HeadBlock;
 var init_ir = __esm({
   "../compiler/src/ir.ts"() {
@@ -2143,7 +2151,7 @@ function buildRequestInit(options) {
 function resolveFetchUrl(url) {
   if (/^[a-z][a-z0-9+.-]*:/i.test(url) || url.startsWith("//")) return url;
   const ctx2 = g().__vesk_request;
-  const resolver = ctx2 && typeof ctx2.resolveUrl === "function" ? ctx2.resolveUrl : null;
+  const resolver = ctx2 && typeof ctx2.resolveUrl === "function" ? ctx2.resolveUrl.bind(ctx2) : null;
   if (resolver) return resolver(url);
   const reqUrl = ctx2?.url;
   let base = typeof reqUrl === "string" && /^https?:\/\//i.test(reqUrl) ? reqUrl : globalThis.__vesk_ssr_base_url || "";
@@ -2434,7 +2442,17 @@ function mutate(key, data2) {
 }
 function createResourceAccessor(handle2) {
   const state = handle2.state;
-  const accessor = {};
+  const read = async () => {
+    for (; ; ) {
+      const s = get(state);
+      if (!s.loading) {
+        if (s.error) throw s.error;
+        return s.data;
+      }
+      await handle2.settled;
+    }
+  };
+  const accessor = new ResourcePromise(read);
   Object.defineProperty(accessor, "loading", {
     get() {
       return get(state).loading;
@@ -2451,19 +2469,6 @@ function createResourceAccessor(handle2) {
     }
   });
   accessor._state = state;
-  const toData = async () => {
-    for (; ; ) {
-      const s = get(state);
-      if (!s.loading) {
-        if (s.error) throw s.error;
-        return s.data;
-      }
-      await handle2.settled;
-    }
-  };
-  accessor.then = (onFulfilled, onRejected) => toData().then(onFulfilled, onRejected);
-  accessor.catch = (onRejected) => toData().catch(onRejected);
-  accessor.finally = (onFinally) => toData().finally(onFinally);
   accessor.refresh = () => revalidate(handle2);
   accessor.abort = () => {
     if (!isServer()) handle2.controller?.abort();
@@ -2546,7 +2551,7 @@ async function resolveSsrResources() {
   delete g().__vsk_ssr_failures;
   return data2;
 }
-var HttpError, TimeoutError, g, isServer, ssrSink, DEFAULT_FAILURE_TTL;
+var HttpError, TimeoutError, g, isServer, ssrSink, DEFAULT_FAILURE_TTL, ResourcePromise;
 var init_resource = __esm({
   "../runtime/src/resource.ts"() {
     "use strict";
@@ -2572,6 +2577,23 @@ var init_resource = __esm({
     isServer = () => !!g().__vsk_ssr;
     ssrSink = null;
     DEFAULT_FAILURE_TTL = 1e4;
+    ResourcePromise = class extends Promise {
+      read;
+      constructor(read) {
+        super(() => {
+        });
+        this.read = read;
+      }
+      then(onfulfilled, onrejected) {
+        return this.read().then(onfulfilled, onrejected);
+      }
+      catch(onrejected) {
+        return this.read().catch(onrejected);
+      }
+      finally(onfinally) {
+        return this.read().finally(onfinally);
+      }
+    };
     useFetch.text = (url, options) => useFetch(async () => {
       const res = await doFetch(resolveFetchUrl(url), buildRequestInit(options ?? {}));
       if (!res.ok) throw new HttpError(res.status, res.statusText);
@@ -2963,6 +2985,47 @@ function adoptElementRaw(root3, marker, tag) {
   recordAdopted(root3, el, tag || el.tagName.toLowerCase());
   return el;
 }
+function classTokens(value) {
+  const out = [];
+  let token = "";
+  for (let i = 0; i < value.length; i++) {
+    const ch = value[i];
+    if (ch === " " || ch === "\n" || ch === "	" || ch === "\r" || ch === "\f") {
+      if (token) {
+        out.push(token);
+        token = "";
+      }
+    } else {
+      token += ch;
+    }
+  }
+  if (token) out.push(token);
+  return out;
+}
+function descriptorMatches(el, descriptor) {
+  if (!descriptor || !descriptor.class) return true;
+  const wanted = classTokens(descriptor.class);
+  if (wanted.length === 0) return true;
+  const actual = el.classList;
+  if (actual) {
+    for (const token of wanted) {
+      if (!actual.contains(token)) return false;
+    }
+    return true;
+  }
+  const raw2 = el.getAttribute("class") ?? el.className ?? "";
+  const present2 = classTokens(String(raw2));
+  for (const token of wanted) {
+    if (!present2.includes(token)) return false;
+  }
+  return true;
+}
+function structuralBranchMatches(el, branch2) {
+  const actualTag = el.tagName.toLowerCase();
+  if (branch2.tag && actualTag !== branch2.tag) return false;
+  if (branch2.descriptor) return descriptorMatches(el, branch2.descriptor);
+  return !!branch2.tag;
+}
 function createHydrateWalker(container, markerList) {
   const markers = markerList || (container ? collectVskMarkers(container) : []);
   if (!markerList && container && markers.length === 0 && container.children.length > 0) {
@@ -3575,7 +3638,7 @@ ${String(this.root.outerHTML).slice(0, 800)}` : ""),
         this.inheritOffset = 0;
         return n;
       }
-      claimAt(tag, skipK, raw2) {
+      claimAt(tag, skipK, raw2, descriptor) {
         if (globalThis.__vesk_hydrate_debug) {
           console.error("[hyd-dbg] claimAt", tag, "skip=", skipK, "idx=", this.idx, "els=", this.els.length);
         }
@@ -3587,14 +3650,18 @@ ${String(this.root.outerHTML).slice(0, 800)}` : ""),
         if (target > this.els.length) target = this.idx;
         while (target < this.els.length) {
           const el = this.els[target];
-          if (tag && el.tagName.toLowerCase() !== tag) {
+          const actualTag = el.tagName.toLowerCase();
+          const tagMismatch = !!tag && actualTag !== tag;
+          const descriptorMismatch = !tagMismatch && !descriptorMatches(el, descriptor);
+          if (tagMismatch || descriptorMismatch) {
             this.idx = this.advancePastSkippable(target + 1);
+            const expectedTag = tag || "div";
             const ghost = {
               state: "ghost",
               el,
               owner: this.root,
-              expectedTag: tag || "div",
-              actualTag: el.tagName.toLowerCase(),
+              expectedTag,
+              actualTag,
               detached: false
             };
             recordClaim(this.root, ghost);
@@ -3605,20 +3672,18 @@ ${String(this.root.outerHTML).slice(0, 800)}` : ""),
               } catch {
               }
             }
-            const fresh2 = document.createElement(tag || "div");
+            const fresh2 = document.createElement(expectedTag);
             recordClaim(this.root, {
               state: "fresh",
               el: fresh2,
               owner: this.root,
-              expectedTag: tag || "div",
+              expectedTag,
               actualTag: fresh2.tagName.toLowerCase(),
               detached: false
             });
-            reportMiss(
-              "tag-mismatch",
-              `descriptor wanted <${tag}> but the SSR slot holds <${el.tagName.toLowerCase()}>; consumed one slot, detached the local ghost, and rendered fresh.`,
-              false
-            );
+            const actualClass = el.getAttribute("class") || "";
+            const detail = descriptorMismatch ? `descriptor wanted <${expectedTag} class="${descriptor?.class || ""}"> but the SSR slot holds <${actualTag} class="${actualClass}">; consumed one slot, detached the local ghost, and rendered fresh.` : `descriptor wanted <${tag}> but the SSR slot holds <${actualTag}>; consumed one slot, detached the local ghost, and rendered fresh.`;
+            reportMiss(descriptorMismatch ? "descriptor-mismatch" : "tag-mismatch", detail, false);
             return fresh2;
           }
           if (this.adopted.has(el)) {
@@ -3652,11 +3717,74 @@ ${String(this.root.outerHTML).slice(0, 800)}` : ""),
         );
         return fresh;
       }
-      nextElement(tag, skipK = 0) {
-        return this.claimAt(tag, skipK, false);
+      nextElement(tag, skipK = 0, descriptor) {
+        return this.claimAt(tag, skipK, false, descriptor);
+      }
+      claimOnly(tag, skipK = 0, descriptor) {
+        return this.claimAt(tag, skipK, true, descriptor);
       }
-      claimOnly(tag, skipK = 0) {
-        return this.claimAt(tag, skipK, true);
+      discardStructuralRegion(branches, selected, skipK = 0) {
+        if (!branches || branches.length === 0) return false;
+        let offset2 = skipK || 0;
+        if (!offset2) offset2 = this.inheritOffset;
+        let target = this.advancePastSkippable(this.idx + offset2);
+        if (target > this.els.length) target = this.idx;
+        target = this.advancePastSkippable(target);
+        while (target < this.els.length) {
+          const el = this.els[target];
+          if (this.adopted.has(el)) {
+            target = this.advancePastSkippable(target + 1);
+            continue;
+          }
+          let matchCount = 0;
+          let matchIdx = -1;
+          for (let i = 0; i < branches.length; i++) {
+            if (structuralBranchMatches(el, branches[i])) {
+              matchCount++;
+              matchIdx = i;
+            }
+          }
+          if (matchCount !== 1 || matchIdx === selected) return false;
+          const count = branches[matchIdx].count;
+          if (!count || count < 1) return false;
+          this.inheritOffset = 0;
+          let p = target;
+          let removed = 0;
+          while (removed < count && p < this.els.length) {
+            const candidate = this.els[p];
+            if (this.adopted.has(candidate)) {
+              p = this.advancePastSkippable(p + 1);
+              continue;
+            }
+            const actualTag = candidate.tagName.toLowerCase();
+            const ghost = {
+              state: "ghost",
+              el: candidate,
+              owner: this.root,
+              expectedTag: branches[matchIdx].tag || actualTag,
+              actualTag,
+              detached: false
+            };
+            recordClaim(this.root, ghost);
+            if (this.root && candidate.parentNode === this.root) {
+              try {
+                candidate.remove();
+                ghost.detached = true;
+              } catch {
+              }
+            }
+            p = this.advancePastSkippable(p + 1);
+            removed++;
+          }
+          this.idx = p;
+          reportMiss(
+            "descriptor-mismatch",
+            `structural region reconciliation removed SSR branch ${matchIdx}; the client selected branch ${selected}.`,
+            false
+          );
+          return true;
+        }
+        return false;
       }
       subWalker(rootEl) {
         if (globalThis.__vesk_hydrate_debug) {
@@ -3836,6 +3964,7 @@ function flattenLayoutChain(tree, pathParts, result = []) {
       const remaining = pathParts.slice(consumeCount);
       const isLeaf2 = remaining.length === 0 || remaining.every((p) => p === "");
       if (node.standalone) result.length = 0;
+      const marker = result.length;
       result.push(node);
       if (isLeaf2) {
         if (!node.page && (node.children || []).length > 0) {
@@ -3845,8 +3974,17 @@ function flattenLayoutChain(tree, pathParts, result = []) {
         }
         break;
       } else if ((node.children || []).length > 0) {
+        const before = result.length;
         flattenLayoutChain(node.children || [], remaining, result);
+        if (result.length > before) break;
+        if (node.isDynamic) {
+          result.length = marker;
+          continue;
+        }
         break;
+      } else if (node.isDynamic) {
+        result.length = marker;
+        continue;
       }
     }
   }
@@ -4395,7 +4533,8 @@ function Link(props, registry, hydrate) {
     props.class ? `class="${String(props.class).replace(/"/g, "&quot;")}"` : "",
     props.style ? `style="${String(props.style).replace(/"/g, "&quot;")}"` : "",
     props.target ? `target="${String(props.target).replace(/"/g, "&quot;")}"` : "",
-    props.rel ? `rel="${String(props.rel).replace(/"/g, "&quot;")}"` : ""
+    props.rel ? `rel="${String(props.rel).replace(/"/g, "&quot;")}"` : "",
+    ...passThroughAttrs(props).map(([key, value]) => `${key}="${value.replace(/"/g, "&quot;")}"`)
   ].filter(Boolean).join(" ");
   let childStr = "";
   if (props.children != null) {
@@ -4426,6 +4565,17 @@ function Link(props, registry, hydrate) {
   });
   return a;
 }
+function passThroughAttrs(props) {
+  const out = [];
+  for (const [key, value] of Object.entries(props)) {
+    if (value == null || value === false) continue;
+    const lower2 = key.toLowerCase();
+    const allowed = lower2.startsWith("data-") || lower2.startsWith("aria-") || lower2 === "role" || lower2 === "id" || lower2 === "title" || lower2 === "tabindex" || lower2 === "download" || lower2 === "hreflang" || lower2 === "referrerpolicy";
+    if (!allowed) continue;
+    out.push([key, value === true ? "" : String(value)]);
+  }
+  return out;
+}
 function applyLinkDom(a, props, href) {
   const displayHref = routerMode() && !href.startsWith("#") ? "#" + href : href;
   a.href = displayHref;
@@ -4433,6 +4583,7 @@ function applyLinkDom(a, props, href) {
   if (props.style) a.setAttribute("style", props.style);
   if (props.target) a.target = props.target;
   if (props.rel) a.rel = props.rel;
+  for (const [key, value] of passThroughAttrs(props)) a.setAttribute(key, value);
 }
 function NavLink(props, registry, hydrate) {
   if (typeof document === "undefined") {
@@ -5510,6 +5661,19 @@ async function renderErrorPage(router, match, container, error, navToken) {
     container.innerHTML = dom;
   }
 }
+function trackHydration(promise) {
+  const g5 = globalThis;
+  g5.__vesk_hydrated = false;
+  promise.then(
+    () => {
+      g5.__vesk_hydrated = true;
+    },
+    () => {
+      g5.__vesk_hydrated = true;
+    }
+  );
+  return promise;
+}
 async function hydrateInitial(router, match, container, strategy) {
   const hydrationNavToken = router._navToken || 0;
   const chain = match.matchChain;
@@ -5821,13 +5985,15 @@ function createRouter(routes, options = {}) {
         const match = matchRoute(this.routeTree, url.pathname);
         if (match) {
           match.pathname = url.pathname;
-          hydrateInitial(this, match, container, hydrateStrategy);
+          trackHydration(hydrateInitial(this, match, container, hydrateStrategy));
           this._currentMatch = match;
         } else {
           this.navigate(path, { replace: true });
+          globalThis.__vesk_hydrated = true;
         }
       } else {
         this.navigate(path, { replace: true });
+        globalThis.__vesk_hydrated = true;
       }
       return this;
     },
@@ -5861,7 +6027,9 @@ function createRouter(routes, options = {}) {
         const updateUrl = () => {
           const fullPath = url.pathname + url.search;
           const target = mode ? fullPath.startsWith("/") ? "#" + fullPath : "#" + fullPath : fullPath;
-          if (!opts.replace) {
+          const liveFull = window.location.pathname + window.location.search + window.location.hash;
+          if (!opts.replace && target === liveFull) {
+          } else if (!opts.replace) {
             window.history.pushState({ path: url.pathname }, "", target);
           } else {
             window.history.replaceState({ path: url.pathname }, "", target);
@@ -6056,6 +6224,41 @@ function createFileRouter(routeTree, options = {}) {
   const renderFn = options.render || renderMatch;
   const hydrateStrategy = options.hydrate || "full";
   const hashMode = options.hash === true;
+  const serverMiddlewareCache = /* @__PURE__ */ new Map();
+  let serverMiddlewareDisabled = false;
+  const runServerMiddleware = async (ctx2, next) => {
+    if (options.serverMiddleware !== true || typeof window === "undefined" || serverMiddlewareDisabled) return next();
+    const path = String(ctx2.url || "/");
+    const cached = serverMiddlewareCache.get(path);
+    if (cached && Date.now() - cached.at < 2500) {
+      if (cached.body && typeof cached.body.redirect === "string" && cached.body.redirect) {
+        return { redirect: cached.body.redirect };
+      }
+      if (cached.body && typeof cached.body.rewrite === "string" && cached.body.rewrite) return next(cached.body.rewrite);
+      return next();
+    }
+    const endpoint = globalThis.__veskServerMiddlewareEndpoint ?? "/_vesk/middleware";
+    try {
+      const res = await fetch(`${endpoint}?path=${encodeURIComponent(path)}`, {
+        credentials: "include",
+        headers: { Accept: "application/json" },
+        cache: "no-store"
+      });
+      if (res.status === 404) {
+        serverMiddlewareDisabled = true;
+        return next();
+      }
+      const body = await res.json().catch(() => null);
+      serverMiddlewareCache.set(path, { at: Date.now(), body });
+      if (body && typeof body.redirect === "string" && body.redirect) {
+        return { redirect: body.redirect };
+      }
+      if (body && typeof body.rewrite === "string" && body.rewrite) return next(body.rewrite);
+      return next();
+    } catch {
+      return next();
+    }
+  };
   const router = {
     _hydrateStrategy: hydrateStrategy,
     routeTree,
@@ -6168,13 +6371,15 @@ function createFileRouter(routeTree, options = {}) {
         const match = matchRoute(routeTree, path);
         if (match) {
           match.pathname = path;
-          hydrateInitial(router, match, container, hydrateStrategy);
+          trackHydration(hydrateInitial(router, match, container, hydrateStrategy));
           router._currentMatch = match;
         } else {
           router.navigate(path, { replace: true });
+          globalThis.__vesk_hydrated = true;
         }
       } else {
         router.navigate(path, { replace: true });
+        globalThis.__vesk_hydrated = true;
       }
       return router;
     },
@@ -6228,12 +6433,17 @@ function createFileRouter(routeTree, options = {}) {
         navDebug("navigate", url.pathname, "token=" + router._navToken, "pendingChunks", hasPendingChunks(match.matchChain));
         const navToken = router._navToken;
         loadingStart();
-        const middlewareFns = Array.isArray(middleware) ? middleware : middleware ? [middleware] : [];
+        const middlewareFns = [
+          ...options.serverMiddleware === true ? [runServerMiddleware] : [],
+          ...Array.isArray(middleware) ? middleware : middleware ? [middleware] : []
+        ];
         let firstRenderFailed = false;
         const updateUrl = () => {
           const fullUrl = url.pathname + url.search;
           const target = mode ? fullUrl.startsWith("/") ? "#" + fullUrl : "#" + fullUrl : fullUrl;
-          if (!opts.replace) {
+          const liveFull = window.location.pathname + window.location.search + window.location.hash;
+          if (!opts.replace && target === liveFull) {
+          } else if (!opts.replace) {
             window.history.pushState({ path: fullUrl }, "", target);
           } else {
             window.history.replaceState({ path: fullUrl }, "", target);
@@ -32393,6 +32603,17 @@ function emitNode(ctx2, node, tracked2, effectsVar, parentVar, compPrefix = "__c
   }
   return null;
 }
+function staticClassDescriptor(node) {
+  const hasDynamicClass = node.children.some(
+    (child) => child instanceof DynamicBinding && child.kind === "attribute" && child.target === "class"
+  );
+  if (hasDynamicClass) return null;
+  const attr = node.attributes.find((a) => a.name === "class");
+  if (!attr) return null;
+  const value = attr.value.trim();
+  if (!value) return null;
+  return JSON.stringify({ class: value });
+}
 function emitStatic(ctx2, node, tracked2, effectsVar, skipK = 0, regionBudget) {
   const el = ctx2.n();
   if (ctx2.hydrate) {
@@ -32403,7 +32624,11 @@ function emitStatic(ctx2, node, tracked2, effectsVar, skipK = 0, regionBudget) {
     ctx2.rootClaim = false;
     const skipExpr = regionBudget && ctx2.markerless ? markerlessSkipExpr(regionBudget, skipK) : skipK;
     const skipArg = ctx2.markerless ? `, ${skipExpr}` : "";
-    const claimedExpr = rootClaim ? `__root || document.createElement(${JSON.stringify(node.tag)})` : `${ctx2.walker}.nextElement(${JSON.stringify(node.tag)}${skipArg})`;
+    const wantsDescriptor = ctx2.markerless && ctx2.descriptorClaim;
+    ctx2.descriptorClaim = false;
+    const descriptor = wantsDescriptor && !rootClaim ? staticClassDescriptor(node) : null;
+    const descriptorArg = descriptor ? `, ${descriptor}` : "";
+    const claimedExpr = rootClaim ? `__root || document.createElement(${JSON.stringify(node.tag)})` : `${ctx2.walker}.nextElement(${JSON.stringify(node.tag)}${skipArg}${descriptorArg})`;
     ctx2.push(`const ${el} = ${claimedExpr};`);
     if (regionBudget && ctx2.markerless) ctx2.push(`${regionBudget} = 0;`);
   } else {
@@ -32787,6 +33012,7 @@ function emitComponentCall(ctx2, node, tracked2, effectsVar, parentVar, compPref
   }
   const callArgs = () => plainTarget ? `reactiveProps({ ${propsEntries.join(", ")} })` : `{ ${propsEntries.join(", ")} }`;
   if (ctx2.hydrate) {
+    ctx2.descriptorClaim = false;
     const access = calleeExpr ?? (ctx2.importedNames.has(node.componentName) ? node.componentName : `${ctx2.hydrateRegistry}[${JSON.stringify(node.componentName)}]`);
     if (!calleeExpr && !ctx2.importedNames.has(node.componentName)) {
       ctx2.push(`if (${access} == null) throw new Error(${JSON.stringify(`Component "${node.componentName}" was not found while rendering. Declare it with the \`component\` keyword, import it, or register it in the component registry.`)});`);
@@ -33009,13 +33235,14 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regio
   const hyd = ctx2.hydrate;
   const parent = parentVar || "$root";
   const budget = hyd ? regionBudgetVar(ctx2, skipK, regionBudget) : null;
+  const rid = regionMarkerId(node);
   const isOpaque = (n) => !!n && typeof n.condition !== "undefined";
   if (hyd && node.alternateNodes.length === 1 && isOpaque(node.alternateNodes[0])) {
     const chain = [];
     let cur = node;
     let finalElse = null;
     while (cur) {
-      chain.push({ cond: transformTracked(cur.condition, tracked2), nodes: cur.consequentNodes });
+      chain.push({ cond: transformTracked(cur.condition, tracked2), nodes: cur.consequentNodes, id: regionMarkerId(cur) });
       if (cur.alternateNodes.length === 1 && isOpaque(cur.alternateNodes[0])) {
         cur = cur.alternateNodes[0];
       } else {
@@ -33039,6 +33266,8 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regio
       ctx2.push(`const ${rn} = ${fnOpen2}`);
       const cl = ctx2.n();
       ctx2.push(indent2(`const ${cl} = [];`));
+      const savedDescriptor = ctx2.descriptorClaim;
+      if (hyd && ctx2.markerless) ctx2.descriptorClaim = true;
       for (const n of chain[i].nodes) {
         const savedClaim = ctx2.claimStatic;
         if (hyd) ctx2.claimStatic = true;
@@ -33046,6 +33275,7 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regio
         ctx2.claimStatic = savedClaim;
         if (v) ctx2.push(indent2(`${cl}.push(${v});`));
       }
+      ctx2.descriptorClaim = savedDescriptor;
       ctx2.push(indent2(`__place(${anchor2}, ${endAnchor2}, ${cl}, ${parent});`));
       ctx2.push(`};`);
     }
@@ -33055,6 +33285,8 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regio
       ctx2.push(`const ${finalRender} = ${fnOpen2}`);
       const cl2 = ctx2.n();
       ctx2.push(indent2(`const ${cl2} = [];`));
+      const savedDescriptor = ctx2.descriptorClaim;
+      if (hyd && ctx2.markerless) ctx2.descriptorClaim = true;
       for (const n of finalElse) {
         const savedClaim = ctx2.claimStatic;
         if (hyd) ctx2.claimStatic = true;
@@ -33062,23 +33294,34 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regio
         ctx2.claimStatic = savedClaim;
         if (v) ctx2.push(indent2(`${cl2}.push(${v});`));
       }
+      ctx2.descriptorClaim = savedDescriptor;
       ctx2.push(indent2(`__place(${anchor2}, ${endAnchor2}, ${cl2}, ${parent});`));
       ctx2.push(`};`);
     }
-    let init = `if (${chain[0].cond}) { ${asyncKw2}${renderNames[0]}(); }`;
-    for (let i = 1; i < chain.length; i++) init += ` else if (${chain[i].cond}) { ${asyncKw2}${renderNames[i]}(); }`;
-    if (finalRender) init += ` else { ${asyncKw2}${finalRender}(); }`;
-    ctx2.push(init);
     let branchInitFallback = finalRender ? `${chain.length}` : "-1";
     for (let i = chain.length - 1; i >= 0; i--) {
       branchInitFallback = `(${chain[i].cond} ? ${i} : ${branchInitFallback})`;
     }
     const branchInit = `(${branchInitFallback})`;
+    const branchSnapshot = ctx2.n();
+    ctx2.push(`const ${branchSnapshot} = ${branchInit};`);
+    if (!ctx2.markerless) {
+      for (let i = 0; i < chain.length; i++) {
+        ctx2.push(`if (__hydrate) __reconcileRegion(${parent}, '${chain[i].id}', ${branchSnapshot} === ${i} ? 0 : 1, ${ctx2.walker});`);
+      }
+    } else {
+      const chainBranches = chain.map((c) => c.nodes);
+      if (finalElse) chainBranches.push(finalElse);
+      emitStructuralRegionDiscard(ctx2, chainBranches, branchSnapshot, budget);
+    }
+    let init = `if (${branchSnapshot} === 0) { ${asyncKw2}${renderNames[0]}(); }`;
+    for (let i = 1; i < chain.length; i++) init += ` else if (${branchSnapshot} === ${i}) { ${asyncKw2}${renderNames[i]}(); }`;
+    if (finalRender) init += ` else { ${asyncKw2}${finalRender}(); }`;
+    ctx2.push(init);
     let effInner = `if (__new === 0) { ${asyncKw2}${renderNames[0]}(); }`;
     for (let i = 1; i < chain.length; i++) effInner += ` else if (__new === ${i}) { ${asyncKw2}${renderNames[i]}(); }`;
     if (finalRender) effInner += ` else { ${asyncKw2}${finalRender}(); }`;
     const effBody = `effect(${ctx2.isAsyncScope ? "async () => {" : "() => {"}
-        if (__first) { __first = false; __iv = ${branchInit}; return; }
         const __new = ${branchInit};
         if (__new !== __iv) {
           for (const e of ${effectsVar2}) destroy_block(e);
@@ -33090,14 +33333,12 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regio
       }, true);`;
     if (effTarget) {
       ctx2.push(`${effTarget}.push((() => {
-      let __iv = ${branchInit};
-      let __first = true;
+      let __iv = ${branchSnapshot};
       return ${effBody}
     })());`);
     } else {
       ctx2.effects.push(`{
-      let __iv = ${branchInit};
-      let __first = true;
+      let __iv = ${branchSnapshot};
       ${effBody}
     }`);
     }
@@ -33121,6 +33362,8 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regio
   const conFrag = ctx2.n();
   if (!hyd) ctx2.push(indent2(`const ${conFrag} = document.createDocumentFragment();`));
   if (hyd) ctx2.push(indent2(`const __cl = [];`));
+  const savedConDescriptor = ctx2.descriptorClaim;
+  if (hyd && ctx2.markerless) ctx2.descriptorClaim = true;
   for (const n of node.consequentNodes) {
     const savedClaim = ctx2.claimStatic;
     if (hyd) ctx2.claimStatic = true;
@@ -33131,6 +33374,7 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regio
       else ctx2.push(indent2(`${conFrag}.appendChild(${v});`));
     }
   }
+  ctx2.descriptorClaim = savedConDescriptor;
   if (hyd) ctx2.push(indent2(`__place(${anchor}, ${endAnchor}, __cl, ${parent});`));
   else ctx2.push(indent2(`__p.insertBefore(${conFrag}, ${endAnchor});`));
   ctx2.push(`};`);
@@ -33142,6 +33386,8 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regio
     const altFrag = ctx2.n();
     if (!hyd) ctx2.push(indent2(`const ${altFrag} = document.createDocumentFragment();`));
     if (hyd) ctx2.push(indent2(`const __cl = [];`));
+    const savedAltDescriptor = ctx2.descriptorClaim;
+    if (hyd && ctx2.markerless) ctx2.descriptorClaim = true;
     for (const n of node.alternateNodes) {
       const savedAltClaim = ctx2.claimStatic;
       if (hyd) ctx2.claimStatic = true;
@@ -33152,15 +33398,19 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regio
         else ctx2.push(indent2(`${altFrag}.appendChild(${v});`));
       }
     }
+    ctx2.descriptorClaim = savedAltDescriptor;
     if (hyd) ctx2.push(indent2(`__place(${anchor}, ${endAnchor}, __cl, ${parent});`));
     else ctx2.push(indent2(`__p.insertBefore(${altFrag}, ${endAnchor});`));
     ctx2.push(`};`);
   }
   if (!hyd) ctx2.push(`${parent}.appendChild(${endAnchor});`);
-  ctx2.push(`if (${condExpr}) { ${asyncKw}${conRenderName}(); }` + (hasElse ? ` else { ${asyncKw}${altRenderName}(); }` : ""));
+  const condSnapshot = ctx2.n();
+  ctx2.push(`const ${condSnapshot} = ${condExpr};`);
+  if (hyd && !ctx2.markerless) ctx2.push(`if (__hydrate) __reconcileRegion(${parent}, '${rid}', ${condSnapshot} ? 0 : 1, ${ctx2.walker});`);
+  if (hyd && ctx2.markerless) emitStructuralRegionDiscard(ctx2, [node.consequentNodes, node.alternateNodes], hasElse ? `(${condSnapshot} ? 0 : 1)` : `(${condSnapshot} ? 0 : -1)`, budget);
+  ctx2.push(`if (${condSnapshot}) { ${asyncKw}${conRenderName}(); }` + (hasElse ? ` else { ${asyncKw}${altRenderName}(); }` : ""));
   const renderBranch = `if (__nv) { ${asyncKw}${conRenderName}(); }` + (hasElse ? ` else { ${asyncKw}${altRenderName}(); }` : "");
   const effectBody = `effect(${ctx2.isAsyncScope ? "async () => {" : "() => {"}
-      if (__first) { __first = false; __iv = ${condExpr}; return; }
       const __nv = ${condExpr};
       if (__nv !== __iv) {
         for (const e of ${effectsVar}) destroy_block(e);
@@ -33173,14 +33423,12 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regio
   if (!isReactiveExpression(node.condition, tracked2)) return null;
   if (effTarget) {
     ctx2.push(`${effTarget}.push((() => {
-    let __iv = ${condExpr};
-    let __first = true;
+    let __iv = ${condSnapshot};
     return ${effectBody}
   })());`);
   } else {
     ctx2.effects.push(`{
-    let __iv = ${condExpr};
-    let __first = true;
+    let __iv = ${condSnapshot};
     ${effectBody}
   }`);
   }
@@ -33561,25 +33809,23 @@ function emitMap(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regionBu
   let emptyRenderName = null;
   if (node.alternateNodes.length > 0) {
     emptyRenderName = ctx2.n();
-    const emptySig = !hyd ? ctx2.isAsyncScope ? "async () => {" : "() => {" : ctx2.isAsyncScope ? "async (__cl) => {" : "(__cl) => {";
+    const emptyClaims = ctx2.hydrate;
+    const emptySig = !emptyClaims ? ctx2.isAsyncScope ? "async () => {" : "() => {" : ctx2.isAsyncScope ? "async (__cl) => {" : "(__cl) => {";
     ctx2.push(`const ${emptyRenderName} = ${emptySig}`);
     ctx2.push(indent2(`const __p = ${anchor}.parentNode;`));
     const frag = ctx2.n();
-    if (!hyd) ctx2.push(indent2(`const ${frag} = document.createDocumentFragment();`));
+    if (!emptyClaims) ctx2.push(indent2(`const ${frag} = document.createDocumentFragment();`));
     const savedClaim = ctx2.claimStatic;
-    const savedHydrate = ctx2.hydrate;
-    if (hydKeyed) ctx2.hydrate = false;
     for (const n of node.alternateNodes) {
       ctx2.claimStatic = true;
-      const v = emitNode(ctx2, n, tracked2, effectsVar, hyd ? void 0 : frag, "__components", 0, budget || void 0);
+      const v = emitNode(ctx2, n, tracked2, effectsVar, emptyClaims ? void 0 : frag, "__components", 0, budget || void 0);
       if (v) {
-        if (hyd) ctx2.push(indent2(`if (__cl) __cl.push(${v}); else __p.insertBefore(${v}, ${endAnchor});`));
+        if (emptyClaims) ctx2.push(indent2(`if (__cl) __cl.push(${v}); else __p.insertBefore(${v}, ${endAnchor});`));
         else ctx2.push(indent2(`${frag}.appendChild(${v});`));
       }
     }
     ctx2.claimStatic = savedClaim;
-    ctx2.hydrate = savedHydrate;
-    if (!hyd) ctx2.push(indent2(`if (${frag}.childNodes.length > 0) __p.insertBefore(${frag}, ${endAnchor});`));
+    if (!emptyClaims) ctx2.push(indent2(`if (${frag}.childNodes.length > 0) __p.insertBefore(${frag}, ${endAnchor});`));
     ctx2.push(`};`);
   }
   if (!hyd && !hydKeyed) ctx2.push(`${parent}.appendChild(${endAnchor});`);
@@ -33599,8 +33845,11 @@ function emitMap(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regionBu
     }
     if (emptyRenderName) {
       const isEmptyVar = ctx2.n();
+      const collectVar = hydKeyed ? ctx2.n() : null;
       ctx2.push(`let ${isEmptyVar} = !${hasItems}();`);
-      ctx2.push(`if (!${isEmptyVar}) { ${initList}(); } else { ${aw}${emptyRenderName}(); }`);
+      if (collectVar) ctx2.push(`const ${collectVar} = [];`);
+      ctx2.push(`if (!${isEmptyVar}) { ${initList}(); } else { ${aw}${emptyRenderName}(${collectVar || ""}); }`);
+      if (collectVar) ctx2.push(`__place(${anchor}, ${endAnchor}, ${collectVar}, ${parent});`);
       if (!reactiveSource) return null;
       pushEffect(`let __first = true;`, `effect(${effOpen}
     const __new = ${hasItems}();
@@ -33671,7 +33920,7 @@ ${renderAllItems("        ", null)}
     __cleanup(${anchor}, ${endAnchor});
     if (__new) {
 ${renderAllItems("      ", null)}
-    } else { ${aw}${emptyRenderName}(${collectVar ? collectVar : ""}); }
+    } else { ${aw}${emptyRenderName}(); }
   }, true)`);
     } else {
       const collectVar = hyd ? ctx2.n() : null;
@@ -33762,6 +34011,7 @@ function generateComponent(comp, importedNames = /* @__PURE__ */ new Set(), hydr
       }
     }
   }
+  if (ctx2.hydrate && ctx2.markerless) ctx2.descriptorClaim = true;
   for (const node of comp.body) {
     if (node instanceof TrackDecl) {
       if (deferredTrackDecls.has(node)) emitNode(ctx2, node, tracked2, null);
@@ -33842,6 +34092,33 @@ function buildComponentMap(irRoot, hydrate = false, alloc, markerless = true) {
     const code = generateComponent(comp, directNames, hydrate, asyncComps, linkNames, selfClaimNames, alloc, markerless);
     mapLines.push(`${registry}[${JSON.stringify(comp.name)}] = ${code};`);
   }
+  if (hydrate && !markerless) {
+    mapLines.push(`function __reconcileRegion(parent, id, branch, walker) {`);
+    mapLines.push(`	if (!parent) return;`);
+    mapLines.push(`	let start = null;`);
+    mapLines.push(`	let end = null;`);
+    mapLines.push(`	for (let n = parent.firstChild; n; n = n.nextSibling) {`);
+    mapLines.push(`		if (n.nodeType !== 8) continue;`);
+    mapLines.push(`		const text = n.textContent || '';`);
+    mapLines.push(`		if (text === 'vesk-r:' + id + ':0' || text === 'vesk-r:' + id + ':1') start = n;`);
+    mapLines.push(`		else if (text === 'vesk-r-end:' + id) end = n;`);
+    mapLines.push(`		if (start && end) break;`);
+    mapLines.push(`	}`);
+    mapLines.push(`	if (!start || !end) return;`);
+    mapLines.push(`	const ssrBranch = (start.textContent || '').slice(-2) === ':1' ? 1 : 0;`);
+    mapLines.push(`	if (ssrBranch !== branch) {`);
+    mapLines.push(`		let n = start.nextSibling;`);
+    mapLines.push(`		while (n && n !== end) {`);
+    mapLines.push(`			const next = n.nextSibling;`);
+    mapLines.push(`			n.remove();`);
+    mapLines.push(`			n = next;`);
+    mapLines.push(`		}`);
+    mapLines.push(`		if (walker && walker.retireDetached) walker.retireDetached();`);
+    mapLines.push(`	}`);
+    mapLines.push(`	start.remove();`);
+    mapLines.push(`	end.remove();`);
+    mapLines.push(`}`);
+  }
   mapLines.push(`function __cleanup(start, end) {`);
   mapLines.push(`	let n = start.nextSibling;`);
   mapLines.push(`	while (n && n !== end) {`);
@@ -33900,6 +34177,43 @@ function ssrResidueEstimate(node) {
   }
   return 0;
 }
+function firstBranchRoot(nodes) {
+  for (const n of nodes) {
+    if (n instanceof StaticNode) return { tag: n.tag, descriptor: staticClassDescriptor(n) };
+    if (n instanceof ComponentCall || n instanceof ComponentRef) return null;
+    if (n instanceof OpaqueDynamicRegion) return null;
+    if (n instanceof MapRegion || n instanceof ForLoop || n instanceof WhileLoop) {
+      const child = firstBranchRoot(n.bodyTemplate);
+      if (child) return child;
+    }
+    if (n instanceof SwitchBlock) {
+      for (const c of n.cases) {
+        const child = firstBranchRoot(c.body);
+        if (child) return child;
+      }
+    }
+    if (n instanceof TryCatch) {
+      const child = firstBranchRoot(n.bodyTemplate) || firstBranchRoot(n.catchBody);
+      if (child) return child;
+    }
+  }
+  return null;
+}
+function structuralRegionMetadata(branches) {
+  const parts = branches.map((nodes) => {
+    const first = firstBranchRoot(nodes);
+    const tag = first ? JSON.stringify(first.tag) : "undefined";
+    const descriptor = first && first.descriptor ? first.descriptor : "null";
+    return `{ tag: ${tag}, descriptor: ${descriptor}, count: ${ssrResidueEstimate(nodes)} }`;
+  });
+  return `[${parts.join(", ")}]`;
+}
+function emitStructuralRegionDiscard(ctx2, branches, selectedExpr, budget) {
+  if (!ctx2.hydrate || !ctx2.markerless) return;
+  const offset2 = budget ? `, ${budget}` : "";
+  const consume = budget ? ` ${budget} = 0;` : "";
+  ctx2.push(`if (${ctx2.walker} && typeof ${ctx2.walker}.discardStructuralRegion === 'function' && ${ctx2.walker}.discardStructuralRegion(${structuralRegionMetadata(branches)}, ${selectedExpr}${offset2})) {${consume}}`);
+}
 function isStaticIR(body) {
   for (const node of body) {
     if (node instanceof StaticNode) {
@@ -34230,6 +34544,10 @@ var init_client_codegen = __esm({
       markerless = true;
       inTryBody = false;
       claimStatic = false;
+      // Markerless only: the next real claim carries a compiler-generated static
+      // class descriptor so a same-tag but structurally different SSR slot is
+      // substituted instead of adopted (e.g. an empty-state <div> vs a list <div>).
+      descriptorClaim = false;
       // While set, the next StaticNode claimed in hydrate mode uses `__root` (the
       // item element already claimed by key) instead of walking for a new element.
       rootClaim = false;
@@ -35081,15 +35399,19 @@ function dynamicBindingToJS(node, tracked2) {
 function opaqueRegionToJS(node, isAsync = false, tracked2) {
   const lines = [];
   const cond = exprJSX(node.condition, tracked2);
+  const rid = regionMarkerId(node);
+  const mark = __vskHydrate && !__vskMarkerless;
   lines.push(`if (${cond}) {`);
+  if (mark) lines.push(indent(`__out.push('<!--vesk-r:${rid}:0-->');`));
   setVskForceClaim(true);
   for (const n of node.consequentNodes) {
     const code = irNodeToJS(n, null, isAsync, tracked2);
     if (code) lines.push(indent(code));
   }
   setVskForceClaim(false);
+  lines.push(`} else {`);
+  if (mark) lines.push(indent(`__out.push('<!--vesk-r:${rid}:1-->');`));
   if (node.alternateNodes.length > 0) {
-    lines.push(`} else {`);
     setVskForceClaim(true);
     for (const n of node.alternateNodes) {
       const code = irNodeToJS(n, null, isAsync, tracked2);
@@ -35098,6 +35420,7 @@ function opaqueRegionToJS(node, isAsync = false, tracked2) {
     setVskForceClaim(false);
   }
   lines.push(`}`);
+  if (mark) lines.push(`__out.push('<!--vesk-r-end:${rid}-->');`);
   return lines.join("\n");
 }
 function mapRegionToJS(node, isAsync = false, tracked2) {
@@ -49833,20 +50156,16 @@ interface VeskLocals<T extends object> {
   all(): T;
 }
 declare function createLocals<T extends object = Record<string, unknown>>(): VeskLocals<T>;
-// useFetch returns a THENABLE resource, not the data itself. In async
-// components you must \`await\` it before reading/iterating the payload;
-// passing \`into: <tracked cell>\` writes the payload into the cell and makes
-// awaiting unnecessary (the return value can be ignored).
-interface VeskResource<T> {
+// useFetch returns a real Promise carrying resource state. In async components
+// you must \`await\` it before reading/iterating the payload; passing
+// \`into: <tracked cell>\` writes the payload into the cell and makes awaiting
+// unnecessary (the return value can be ignored).
+interface VeskResource<T> extends Promise<T> {
   loading: boolean;
   error: unknown;
   data: T | undefined;
   refresh(): void;
   abort(): void;
-  then<TResult1 = T, TResult2 = never>(
-    onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null,
-    onrejected?: ((reason: unknown) => TResult2 | PromiseLike<TResult2>) | undefined | null,
-  ): PromiseLike<TResult1 | TResult2>;
 }
 interface VeskUseFetchOptions<T> {
   /** Cache/SSR key \u2014 defaults to the URL string. */
@@ -51613,7 +51932,10 @@ function __getNotFoundCompiled() { if (!_notFoundCompiled) _notFoundCompiled = $
     "    }"
   ];
   const dataNavWrap = (body) => [
-    "  return withSsrStore(async () => {",
+    // Awaited for the same reason as the main render below: the caller restores
+    // `__vesk_request` in a finally, and that must happen only after the async
+    // data render (which reads params through useParams) has fully resolved.
+    "  return await withSsrStore(async () => {",
     ...body.map((l) => l ? "  " + l : l),
     "  });"
   ];
@@ -51641,7 +51963,13 @@ function __getNotFoundCompiled() { if (!_notFoundCompiled) _notFoundCompiled = $
         ...dataNavCleanup
       ]),
       "  }",
-      "  return __renderHtml(params, url.href);"
+      // Awaited so the surrounding try/finally keeps `__vesk_request` installed
+      // for the whole async render. Without the await the finally restores the
+      // previous context synchronously, while the async page body is still
+      // suspended on its SSR fetches; every render pass after the first `await`
+      // then reads an empty params object and `useParams()`-derived keys/URLs
+      // collapse (e.g. a verify page rendering its not-found branch).
+      "  return await __renderHtml(params, url.href);"
     ].join("\n");
   } else {
     dataCode = [
@@ -51662,7 +51990,13 @@ function __getNotFoundCompiled() { if (!_notFoundCompiled) _notFoundCompiled = $
         ...dataNavCleanup
       ]),
       "  }",
-      "  return __renderHtml(params, url.href);"
+      // Awaited so the surrounding try/finally keeps `__vesk_request` installed
+      // for the whole async render. Without the await the finally restores the
+      // previous context synchronously, while the async page body is still
+      // suspended on its SSR fetches; every render pass after the first `await`
+      // then reads an empty params object and `useParams()`-derived keys/URLs
+      // collapse (e.g. a verify page rendering its not-found branch).
+      "  return await __renderHtml(params, url.href);"
     ].join("\n");
   }
   const hasMiddleware = !!middlewareCode;
@@ -52157,8 +52491,18 @@ function extractMiddlewareParts(src2) {
         decls.push(src2.slice(stmt.declaration.start, stmt.declaration.end).trim());
       }
     }
+    const imports = [];
+    for (const stmt of ast.body) {
+      if (stmt.type !== "ImportDeclaration") continue;
+      if (stmt.importKind === "type") continue;
+      const source = stmt.source?.value;
+      if (typeof source !== "string") continue;
+      if (source.startsWith(".") || source.startsWith("/")) continue;
+      const line = src2.slice(stmt.start, stmt.end).trim();
+      if (line && !imports.includes(line)) imports.push(line);
+    }
     const bodyWithDecls = decls.length > 0 ? decls.join("\n") + "\n" + body.trim() : body.trim();
-    return { params, body: bodyWithDecls };
+    return { params, body: bodyWithDecls, imports };
   } catch {
     return fallbackExtractMiddleware(src2);
   }
@@ -52199,7 +52543,7 @@ function fallbackExtractMiddleware(src2) {
       m++;
     }
     const body = src2.slice(b + 1, m - 1);
-    return { params, body: body.trim() };
+    return { params, body: body.trim(), imports: [] };
   }
   return null;
 }
@@ -52221,16 +52565,18 @@ ${parts.body}
 function extractMiddlewareBody(src2) {
   const parts = extractMiddlewareParts(src2);
   if (!parts) return null;
-  return { params: parts.params, body: parts.body };
+  return { params: parts.params, body: parts.body, imports: parts.imports };
 }
 function compileMiddleware(mwChain, _appDir) {
   if (mwChain.length === 0) return null;
   const parts = [];
+  const imports = [];
   for (let i = 0; i < mwChain.length; i++) {
     const { sourcePath: sourcePath2 } = mwChain[i];
     const src2 = readFileSync10(sourcePath2, "utf-8");
     const extracted = extractMiddlewareBody(src2);
     if (!extracted) continue;
+    for (const line of extracted.imports) if (!imports.includes(line)) imports.push(line);
     parts.push(`async function mw_${i}(${extracted.params}) {
 ${extracted.body}
 }`);
@@ -52239,6 +52585,8 @@ ${extracted.body}
   const code = [
     "// Auto-generated middleware chain \u2014 do not edit",
     "",
+    ...imports,
+    ...imports.length ? [""] : [],
     parts.join("\n\n"),
     "",
     `const chain = [${parts.map((_, i) => `mw_${i}`).join(", ")}];`,
@@ -52308,9 +52656,11 @@ ${extracted.body}
 function compileMiddlewareCode(mwSourceTexts) {
   if (!mwSourceTexts || mwSourceTexts.length === 0) return null;
   const parts = [];
+  const imports = [];
   for (let i = 0; i < mwSourceTexts.length; i++) {
     const extracted = extractMiddlewareBody(mwSourceTexts[i]);
     if (!extracted) continue;
+    for (const line of extracted.imports) if (!imports.includes(line)) imports.push(line);
     parts.push(`async function mw_${i}(${extracted.params}) {
 ${extracted.body}
 }`);
@@ -52319,6 +52669,8 @@ ${extracted.body}
   const code = [
     "// \u2500\u2500 Middleware chain (inline) \u2500\u2500",
     "",
+    ...imports,
+    ...imports.length ? [""] : [],
     parts.join("\n\n"),
     "",
     `const __mwChain = [${parts.map((_, i) => `mw_${i}`).join(", ")}];`,
@@ -52695,12 +53047,21 @@ function fileUnchanged(filePath, cached) {
     return false;
   }
 }
-function buildRouterOpts(options) {
+function hasServerMiddleware(nodes) {
+  for (const node of nodes) {
+    if (node.hasMiddleware) return true;
+    if (node.children?.length && hasServerMiddleware(node.children)) return true;
+  }
+  return false;
+}
+function buildRouterOpts(options, serverMiddleware) {
   const ttl = options?.routeDataCache;
+  const opts = [];
+  if (serverMiddleware) opts.push("serverMiddleware: true");
   if (typeof ttl === "number" && ttl > 0) {
-    return `, { routeDataCache: ${ttl} }`;
+    opts.push(`routeDataCache: ${ttl}`);
   }
-  return "";
+  return opts.length ? `, { ${opts.join(", ")} }` : "";
 }
 function findRuntimeSrc2(appDir) {
   const monorepoRoot = resolve10(__dirname3, "..", "..", "..");
@@ -52748,7 +53109,7 @@ function isAnyImport(node) {
   return node.type === "ImportDeclaration";
 }
 function isRuntimePreamble(node) {
-  if (node.type === "FunctionDeclaration" && (node.id?.name === "__cleanup" || node.id?.name === "__place")) {
+  if (node.type === "FunctionDeclaration" && (node.id?.name === "__cleanup" || node.id?.name === "__place" || node.id?.name === "__reconcileRegion")) {
     return true;
   }
   if (node.type === "VariableDeclaration") {
@@ -53909,12 +54270,13 @@ async function buildMainBundle(routeTree, runtimeDir, codeSplit, mono, hmr, impo
 ` : runtimeCode + "\n";
   const cleanupFn = "function __cleanup(start, end) {\n	let n = start.nextSibling;\n	while (n && n !== end) {\n		const next = n.nextSibling;\n		n.remove();\n		n = next;\n	}\n}\n";
   const placeFn = "function __place(start, end, nodes, fallback) {\n	if (start.parentNode !== null) {\n		const p = start.parentNode;\n		for (let i = 0; i < nodes.length; i++) p.insertBefore(nodes[i], end);\n		return;\n	}\n	if (nodes.length > 0 && nodes[0].parentNode) {\n		const p = nodes[0].parentNode;\n		p.insertBefore(start, nodes[0]);\n		p.insertBefore(end, nodes[nodes.length - 1].nextSibling);\n		// Client-surplus nodes (SSR rendered fewer items than the client data)\n		// are freshly claimed and still detached \u2014 move them into the region in\n		// client order before `end`, instead of stranding them off-parent.\n		for (let i = 0; i < nodes.length; i++) {\n			if (nodes[i].parentNode === null) p.insertBefore(nodes[i], end);\n		}\n		return;\n	}\n	fallback.appendChild(start);\n	fallback.appendChild(end);\n	for (let i = 0; i < nodes.length; i++) fallback.insertBefore(nodes[i], end);\n}\n";
+  const reconcileRegionFn = "function __reconcileRegion(parent, id, branch, walker) {\n	if (!parent) return;\n	let start = null;\n	let end = null;\n	for (let n = parent.firstChild; n; n = n.nextSibling) {\n		if (n.nodeType !== 8) continue;\n		const text = n.textContent || '';\n		if (text === 'vesk-r:' + id + ':0' || text === 'vesk-r:' + id + ':1') start = n;\n		else if (text === 'vesk-r-end:' + id) end = n;\n		if (start && end) break;\n	}\n	if (!start || !end) return;\n	const ssrBranch = (start.textContent || '').slice(-2) === ':1' ? 1 : 0;\n	if (ssrBranch !== branch) {\n		let n = start.nextSibling;\n		while (n && n !== end) {\n			const next = n.nextSibling;\n			n.remove();\n			n = next;\n		}\n		if (walker && walker.retireDetached) walker.retireDetached();\n	}\n	start.remove();\n	end.remove();\n}\n";
   const updateComponentsFn = "function __updateComponents(nodes) {\n  for (const n of nodes) {\n    if (n._pageName && __components[n._pageName]) n.page = __components[n._pageName];\n    if (n._layoutName && __components[n._layoutName]) n.layout = __components[n._layoutName];\n    if (n._errorName && __components[n._errorName]) n.error = __components[n._errorName];\n    if (n._notFoundName && __components[n._notFoundName]) n.notFound = __components[n._notFoundName];\n    if (n._offlineName && __components[n._offlineName]) n.offline = __components[n._offlineName];\n    if (n._networkName && __components[n._networkName]) n.network = __components[n._networkName];\n    if (n.children) __updateComponents(n.children);\n  }\n}\n";
   const routeTreeJson = JSON.stringify(routeTree);
   if (codeSplit) {
     const resolveNamesFn = "function __resolveNames(nodes) {\n  for (const n of nodes) {\n    if (n.chunk) n._chunk = n.chunk;\n    if (n.chunkError) n._chunkError = n.chunkError;\n    if (typeof n.page === 'string') n._pageName = n.page;\n    if (typeof n.layout === 'string') n._layoutName = n.layout;\n    if (typeof n.error === 'string') n._errorName = n.error;\n    if (typeof n.notFound === 'string') n._notFoundName = n.notFound;\n    if (typeof n.offline === 'string') n._offlineName = n.offline;\n    if (typeof n.network === 'string') n._networkName = n.network;\n    if (n.children) __resolveNames(n.children);\n  }\n}\n";
     const pendCode = "const __pendChunks = [];\nconst __currentPath = typeof window !== 'undefined' ? window.location.pathname : '/';\nif (typeof matchRoute === 'function') {\n  const __currentMatch = matchRoute(__routeTree, __currentPath);\n  if (__currentMatch) {\n    for (const n of __currentMatch.matchChain) {\n      if (n._chunk && !__pendChunks.includes(n._chunk)) __pendChunks.push(n._chunk);\n    }\n  }\n}\n";
-    const routerOpts2 = buildRouterOpts({ routeDataCache });
+    const routerOpts2 = buildRouterOpts({ routeDataCache }, hasServerMiddleware(routeTree));
     const startRouterCode = `const __startRouter = function() {
   __updateComponents(__routeTree);
   const __router = createFileRouter(__routeTree${routerOpts2});
@@ -53953,14 +54315,14 @@ if (__pendChunks.length > 0 && typeof ensureChunk === 'function') {
     ];
     const importedSet = new Set(allRuntimeImports);
     const runtimeGlobals2 = globalNames.filter((n) => importedSet.has(n)).map((n) => `globalThis.${n} = ${n};
-`).join("") + "globalThis.__runtime_comps = __runtime_comps;\nglobalThis.__cleanup = __cleanup;\nglobalThis.__place = __place;\n\n";
+`).join("") + "globalThis.__runtime_comps = __runtime_comps;\nglobalThis.__cleanup = __cleanup;\nglobalThis.__place = __place;\nglobalThis.__reconcileRegion = __reconcileRegion;\n\n";
     const extraGlobals = [...runtimeImportNames || []].filter((n) => n && n !== "default").map((n) => `globalThis.${n} = ${n};
 `).join("");
     const code2 = preamble + "const __components = globalThis.__components || (globalThis.__components = {});\nconst __hydrators = globalThis.__hydrators || (globalThis.__hydrators = {});\nconst __runtime_comps = __components;\n\n" + runtimeGlobals2 + extraGlobals + // Shared app modules run HERE: after the runtime bindings are published,
     // before anything can request a route chunk. Earlier (at the top of the
     // bundle) `globalThis.track` was still undefined, so every module-scope
     // cell in a store was created against a missing runtime.
-    (sharedModuleBundle ? sharedModuleBundle + "\n" : "") + cleanupFn + placeFn + "globalThis.__components = __components;\n" + resolveNamesFn + updateComponentsFn + "const __routeTree = " + routeTreeJson + ";\n__resolveNames(__routeTree);\n" + pendCode + startRouterCode;
+    (sharedModuleBundle ? sharedModuleBundle + "\n" : "") + cleanupFn + placeFn + reconcileRegionFn + "globalThis.__components = __components;\n" + resolveNamesFn + updateComponentsFn + "const __routeTree = " + routeTreeJson + ";\n__resolveNames(__routeTree);\n" + pendCode + startRouterCode;
     return hmr ? appendHmrGlobals(code2) : code2;
   }
   const componentLines = mono?.componentLines || [];
@@ -53969,8 +54331,8 @@ if (__pendChunks.length > 0 && typeof ensureChunk === 'function') {
   const hydratorAliasLines = mono?.hydratorAliasLines || [];
   const aliasCode = aliasLines.length > 0 ? aliasLines.join("\n") + "\n" : "";
   const hydratorAliasCode = hydratorAliasLines.length > 0 ? hydratorAliasLines.join("\n") + "\n" : "";
-  const routerOpts = buildRouterOpts({ routeDataCache });
-  const code = preamble + "const __components = {};\nconst __hydrators = {};\nconst __runtime_comps = __components;\n\n" + componentLines.join("\n\n") + "\n" + aliasCode + hydratorLines.join("\n\n") + "\n" + hydratorAliasCode + cleanupFn + placeFn + "globalThis.__components = __components;\nglobalThis.__runtime_comps = __runtime_comps;\nglobalThis.__cleanup = __cleanup;\nglobalThis.__place = __place;\n" + allRuntimeImports.map((n) => `globalThis.${n} = ${n};
+  const routerOpts = buildRouterOpts({ routeDataCache }, hasServerMiddleware(routeTree));
+  const code = preamble + "const __components = {};\nconst __hydrators = {};\nconst __runtime_comps = __components;\n\n" + componentLines.join("\n\n") + "\n" + aliasCode + hydratorLines.join("\n\n") + "\n" + hydratorAliasCode + cleanupFn + placeFn + reconcileRegionFn + "globalThis.__components = __components;\nglobalThis.__runtime_comps = __runtime_comps;\nglobalThis.__cleanup = __cleanup;\nglobalThis.__place = __place;\nglobalThis.__reconcileRegion = __reconcileRegion;\n" + allRuntimeImports.map((n) => `globalThis.${n} = ${n};
 `).join("") + "function __resolveNames(nodes) {\n  for (const n of nodes) {\n    if (typeof n.page === 'string') {\n      n._pageName = n.page;\n      n.page = __components[n.page];\n    }\n    if (typeof n.layout === 'string') {\n      n._layoutName = n.layout;\n      n.layout = __components[n.layout];\n    }\n    if (typeof n.error === 'string') n.error = __components[n.error];\n    if (typeof n.notFound === 'string') n.notFound = __components[n.notFound];\n    if (typeof n.offline === 'string') n.offline = __components[n.offline];\n    if (typeof n.network === 'string') n.network = __components[n.network];\n    if (n.children) __resolveNames(n.children);\n  }\n}\n" + updateComponentsFn + "const __routeTree = " + routeTreeJson + `;
 __resolveNames(__routeTree);
 const __router = createFileRouter(__routeTree${routerOpts});
@@ -54942,6 +55304,41 @@ async function startProdServer(outDir, options) {
         }
       }
     }
+    if (url.pathname === "/_vesk/middleware" && middlewareMod) {
+      const targetPath = url.searchParams.get("path") || "/";
+      const targetUrl = new URL(targetPath, url.origin);
+      const middlewareRequest = new Request(targetUrl.href, {
+        method: "GET",
+        headers: req.headers
+      });
+      const mwEndpointCtx = {
+        request: middlewareRequest,
+        params: {},
+        url: targetUrl,
+        locals: Object.assign({}, globalThis.__vesk_server_ctx || {}),
+        cookies: {},
+        set(key, value) {
+          this.locals[key] = value;
+        },
+        get(key) {
+          return this.locals[key];
+        }
+      };
+      const mwResult = await middlewareMod.execute(mwEndpointCtx);
+      res.writeHead(200, {
+        "Content-Type": "application/json; charset=utf-8",
+        "Cache-Control": "no-store"
+      });
+      if (mwResult.response) {
+        const location = mwResult.response.headers.get("location") || mwResult.response.headers.get("Location");
+        if (location) {
+          res.end(JSON.stringify({ redirect: location }));
+          return;
+        }
+      }
+      res.end(JSON.stringify(mwResult.rewriteUrl ? { rewrite: mwResult.rewriteUrl } : { allow: true }));
+      return;
+    }
     let mwCtx;
     const serverStore = globalThis.__vesk_server_ctx;
     if (middlewareMod) {
@@ -54991,186 +55388,191 @@ async function startProdServer(outDir, options) {
         url.pathname = mwResult.rewriteUrl;
       }
     }
+    const __outerRequest = globalThis.__vesk_request;
     globalThis.__vesk_request = mwCtx;
-    if (url.pathname.startsWith("/_vesk/action/")) {
-      const actionId = url.pathname.replace("/_vesk/action/", "");
-      const actionEntry = buildConfig.actions && buildConfig.actions.find((a) => a.id === actionId);
-      if (!actionEntry) {
-        res.writeHead(404, { "Content-Type": "application/json" });
-        res.end(JSON.stringify({ ok: false, error: "Action not found" }));
-        return;
-      }
-      const mod = await loadFunction(actionEntry.function);
-      if (!mod || !mod.handleAction) {
-        res.writeHead(404, { "Content-Type": "application/json" });
-        res.end(JSON.stringify({ ok: false, error: "Action not found" }));
+    try {
+      if (url.pathname.startsWith("/_vesk/action/")) {
+        const actionId = url.pathname.replace("/_vesk/action/", "");
+        const actionEntry = buildConfig.actions && buildConfig.actions.find((a) => a.id === actionId);
+        if (!actionEntry) {
+          res.writeHead(404, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ ok: false, error: "Action not found" }));
+          return;
+        }
+        const mod = await loadFunction(actionEntry.function);
+        if (!mod || !mod.handleAction) {
+          res.writeHead(404, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ ok: false, error: "Action not found" }));
+          return;
+        }
+        try {
+          const webRequest = makeWebRequest(req, url.href, maxBodyBytes);
+          const handleAction = mod.handleAction.bind(mod);
+          const response = await withSecurityScope(() => handleAction(webRequest, actionId));
+          await deliverResponse(res, response);
+        } catch (e) {
+          const status = errorStatus(e, 500);
+          const message = status === 500 && process.env.NODE_ENV === "production" ? "Internal Server Error" : e instanceof Error ? e.message : String(e);
+          res.writeHead(status, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ ok: false, error: message }));
+        }
         return;
       }
-      try {
-        const webRequest = makeWebRequest(req, url.href, maxBodyBytes);
-        const handleAction = mod.handleAction.bind(mod);
-        const response = await withSecurityScope(() => handleAction(webRequest, actionId));
-        await deliverResponse(res, response);
-      } catch (e) {
-        const status = errorStatus(e, 500);
-        const message = status === 500 && process.env.NODE_ENV === "production" ? "Internal Server Error" : e instanceof Error ? e.message : String(e);
-        res.writeHead(status, { "Content-Type": "application/json" });
-        res.end(JSON.stringify({ ok: false, error: message }));
-      }
-      return;
-    }
-    if (url.pathname.startsWith("/api")) {
-      for (const route of buildConfig.routes) {
-        if (route.type === "api") {
-          const params = matchPath(route.path, url.pathname);
-          if (params) {
-            const mod = await loadFunction(route.function);
-            if (!mod) {
-              if (functionFailure(route.function)) {
-                res.writeHead(500, { "Content-Type": "application/json" });
-                res.end(JSON.stringify({ error: "Internal Server Error" }));
+      if (url.pathname.startsWith("/api")) {
+        for (const route of buildConfig.routes) {
+          if (route.type === "api") {
+            const params = matchPath(route.path, url.pathname);
+            if (params) {
+              const mod = await loadFunction(route.function);
+              if (!mod) {
+                if (functionFailure(route.function)) {
+                  res.writeHead(500, { "Content-Type": "application/json" });
+                  res.end(JSON.stringify({ error: "Internal Server Error" }));
+                  return;
+                }
+                continue;
+              }
+              try {
+                const webRequest = makeWebRequest(req, url.href, maxBodyBytes);
+                const response = await withSecurityScope(() => mod.handle(webRequest));
+                await deliverResponse(res, response);
+                return;
+              } catch (e) {
+                const status = errorStatus(e, 500);
+                res.writeHead(status, { "Content-Type": "application/json" });
+                res.end(JSON.stringify({ error: status === 500 ? "Internal Server Error" : e instanceof Error ? e.message : String(e) }));
                 return;
               }
-              continue;
-            }
-            try {
-              const webRequest = makeWebRequest(req, url.href, maxBodyBytes);
-              const response = await withSecurityScope(() => mod.handle(webRequest));
-              await deliverResponse(res, response);
-              return;
-            } catch (e) {
-              const status = errorStatus(e, 500);
-              res.writeHead(status, { "Content-Type": "application/json" });
-              res.end(JSON.stringify({ error: status === 500 ? "Internal Server Error" : e instanceof Error ? e.message : String(e) }));
-              return;
             }
           }
         }
       }
-    }
-    const appDir = resolve14(projectDir, "app");
-    const pageCssUrls = resolveCssUrls({
-      enabled: hasBuiltGlobalCss(outDir)
-    });
-    const boundaryCache = /* @__PURE__ */ new Map();
-    async function renderBoundaryFile(file, pathname, props) {
-      const boundaryPath = resolveBoundaryFileForUrl(pathname, appDir, file);
-      if (!boundaryPath) return null;
-      const key = `${file}:${boundaryPath}`;
-      let html = boundaryCache.has(key) ? boundaryCache.get(key) : null;
-      if (html === null) {
-        try {
-          const runtimePath = resolve14(outDir, "server", "runtime.js");
-          const { renderFullPage: renderFullPage2, storeDataScriptGlobal } = await import(runtimePath);
-          const src2 = readFileSync18(boundaryPath, "utf-8");
-          const compName = resolveComponentName(src2) || (file === "error.vsk" ? "Error" : "NotFound");
-          html = await renderFullPage2(src2, compName, props, /* @__PURE__ */ new Map(), { hydrate: true, cssUrls: pageCssUrls, clientScriptUrl: buildConfig?.assets?.client?.url || "/_vesk/static/client.js", clientScriptIntegrity: buildConfig?.assets?.client?.integrity, security: securityConfig?.security || {}, externalDataScript: storeDataScriptGlobal, sourcePath: boundaryPath, headExtra: bakedHeadExtra });
-        } catch {
-          return null;
+      const appDir = resolve14(projectDir, "app");
+      const pageCssUrls = resolveCssUrls({
+        enabled: hasBuiltGlobalCss(outDir)
+      });
+      const boundaryCache = /* @__PURE__ */ new Map();
+      async function renderBoundaryFile(file, pathname, props) {
+        const boundaryPath = resolveBoundaryFileForUrl(pathname, appDir, file);
+        if (!boundaryPath) return null;
+        const key = `${file}:${boundaryPath}`;
+        let html = boundaryCache.has(key) ? boundaryCache.get(key) : null;
+        if (html === null) {
+          try {
+            const runtimePath = resolve14(outDir, "server", "runtime.js");
+            const { renderFullPage: renderFullPage2, storeDataScriptGlobal } = await import(runtimePath);
+            const src2 = readFileSync18(boundaryPath, "utf-8");
+            const compName = resolveComponentName(src2) || (file === "error.vsk" ? "Error" : "NotFound");
+            html = await renderFullPage2(src2, compName, props, /* @__PURE__ */ new Map(), { hydrate: true, cssUrls: pageCssUrls, clientScriptUrl: buildConfig?.assets?.client?.url || "/_vesk/static/client.js", clientScriptIntegrity: buildConfig?.assets?.client?.integrity, security: securityConfig?.security || {}, externalDataScript: storeDataScriptGlobal, sourcePath: boundaryPath, headExtra: bakedHeadExtra });
+          } catch {
+            return null;
+          }
         }
+        return html;
       }
-      return html;
-    }
-    let notFoundHtml = null;
-    {
-      const rendered = await renderBoundaryFile("not-found.vsk", url.pathname, { params: {}, url: url.pathname });
-      notFoundHtml = rendered;
-    }
-    for (const route of buildConfig.routes) {
-      if (route.type === "ssr") {
-        const params = matchPath(route.path, url.pathname);
-        if (params) {
-          const mod = await loadFunction(route.function);
-          if (mod) {
-            const webRequest = makeWebRequest(req, url.href, maxBodyBytes);
-            const origin = new URL(url.href).origin;
-            const origFetch = globalThis.fetch;
-            globalThis.fetch = async (input, init) => {
-              if (typeof input === "string" && input.startsWith("/")) {
-                input = origin + input;
-              }
-              return origFetch(input, init);
-            };
-            try {
-              let cachedResult = null;
-              if (route.revalidate && route.revalidate > 0) {
-                const { pageIsr: pageIsr2 } = await Promise.resolve().then(() => (init_index_server(), index_server_exports));
-                cachedResult = await pageIsr2(url.pathname, async () => {
-                  const response2 = await withSecurityScope(() => mod.handle(webRequest));
-                  return { html: await response2.text(), headers: Object.fromEntries(response2.headers) };
-                }, { revalidate: route.revalidate, tags: route.tags || [] });
-              }
-              if (cachedResult) {
-                res.writeHead(200, cachedResult.headers || { "Content-Type": "text/html" });
-                res.end(cachedResult.html);
-                return;
-              }
-              const response = await withSecurityScope(() => mod.handle(webRequest));
-              const headers2 = Object.fromEntries(response.headers);
-              if (!headers2["content-type"] && !headers2["Content-Type"]) headers2["Content-Type"] = "text/html";
-              if (response.body && typeof response.body.getReader === "function") {
-                res.writeHead(response.status, headers2);
-                const reader = response.body.getReader();
-                const pump = () => {
-                  reader.read().then(({ done, value }) => {
-                    if (done) {
-                      res.end();
-                      return;
-                    }
-                    res.write(value);
-                    pump();
-                  }).catch(() => res.end());
-                };
-                pump();
-              } else {
-                const body = await response.text();
-                res.writeHead(response.status, headers2);
-                res.end(body);
-              }
-              return;
-            } catch (e) {
-              const err = e instanceof Error ? e : new Error(String(e));
-              if (err.name === "Redirect") {
-                const redirect2 = err;
-                res.writeHead(Number(redirect2.status) || 302, { Location: typeof redirect2.url === "string" ? redirect2.url : "/" });
-                res.end();
+      let notFoundHtml = null;
+      {
+        const rendered = await renderBoundaryFile("not-found.vsk", url.pathname, { params: {}, url: url.pathname });
+        notFoundHtml = rendered;
+      }
+      for (const route of buildConfig.routes) {
+        if (route.type === "ssr") {
+          const params = matchPath(route.path, url.pathname);
+          if (params) {
+            const mod = await loadFunction(route.function);
+            if (mod) {
+              const webRequest = makeWebRequest(req, url.href, maxBodyBytes);
+              const origin = new URL(url.href).origin;
+              const origFetch = globalThis.fetch;
+              globalThis.fetch = async (input, init) => {
+                if (typeof input === "string" && input.startsWith("/")) {
+                  input = origin + input;
+                }
+                return origFetch(input, init);
+              };
+              try {
+                let cachedResult = null;
+                if (route.revalidate && route.revalidate > 0) {
+                  const { pageIsr: pageIsr2 } = await Promise.resolve().then(() => (init_index_server(), index_server_exports));
+                  cachedResult = await pageIsr2(url.pathname, async () => {
+                    const response2 = await withSecurityScope(() => mod.handle(webRequest));
+                    return { html: await response2.text(), headers: Object.fromEntries(response2.headers) };
+                  }, { revalidate: route.revalidate, tags: route.tags || [] });
+                }
+                if (cachedResult) {
+                  res.writeHead(200, cachedResult.headers || { "Content-Type": "text/html" });
+                  res.end(cachedResult.html);
+                  return;
+                }
+                const response = await withSecurityScope(() => mod.handle(webRequest));
+                const headers2 = Object.fromEntries(response.headers);
+                if (!headers2["content-type"] && !headers2["Content-Type"]) headers2["Content-Type"] = "text/html";
+                if (response.body && typeof response.body.getReader === "function") {
+                  res.writeHead(response.status, headers2);
+                  const reader = response.body.getReader();
+                  const pump = () => {
+                    reader.read().then(({ done, value }) => {
+                      if (done) {
+                        res.end();
+                        return;
+                      }
+                      res.write(value);
+                      pump();
+                    }).catch(() => res.end());
+                  };
+                  pump();
+                } else {
+                  const body = await response.text();
+                  res.writeHead(response.status, headers2);
+                  res.end(body);
+                }
                 return;
-              }
-              if (err.name === "NotFoundError") {
-                res.writeHead(404, { "Content-Type": "text/html" });
-                res.end(notFoundHtml || renderDefaultNotFoundPage({ url: url.pathname, headExtra: bakedHeadExtra }));
+              } catch (e) {
+                const err = e instanceof Error ? e : new Error(String(e));
+                if (err.name === "Redirect") {
+                  const redirect2 = err;
+                  res.writeHead(Number(redirect2.status) || 302, { Location: typeof redirect2.url === "string" ? redirect2.url : "/" });
+                  res.end();
+                  return;
+                }
+                if (err.name === "NotFoundError") {
+                  res.writeHead(404, { "Content-Type": "text/html" });
+                  res.end(notFoundHtml || renderDefaultNotFoundPage({ url: url.pathname, headExtra: bakedHeadExtra }));
+                  return;
+                }
+                console.error("vesk ssr error:", err.message);
+                await reportServerError(err, {
+                  url: url.pathname + url.search,
+                  routePath: route.path,
+                  target: "node",
+                  status: 500,
+                  buildConfig
+                });
+                if (eventsMod) {
+                  await executeError(err, { url: url.href, routePath: route.path, target: "node", status: 500 }, eventsMod);
+                }
+                const expose = process.env.NODE_ENV !== "production";
+                const errorHtml = await renderBoundaryFile("error.vsk", url.pathname, {
+                  error: expose ? err.message : "Internal Server Error",
+                  stack: expose ? err.stack : "",
+                  statusCode: 500,
+                  url: url.pathname
+                });
+                res.writeHead(500, { "Content-Type": "text/html" });
+                res.end(errorHtml || renderDefaultErrorPage({ message: process.env.NODE_ENV !== "production" ? err.message : void 0, url: url.pathname, headExtra: bakedHeadExtra }));
                 return;
+              } finally {
+                globalThis.fetch = origFetch;
               }
-              console.error("vesk ssr error:", err.message);
-              await reportServerError(err, {
-                url: url.pathname + url.search,
-                routePath: route.path,
-                target: "node",
-                status: 500,
-                buildConfig
-              });
-              if (eventsMod) {
-                await executeError(err, { url: url.href, routePath: route.path, target: "node", status: 500 }, eventsMod);
-              }
-              const expose = process.env.NODE_ENV !== "production";
-              const errorHtml = await renderBoundaryFile("error.vsk", url.pathname, {
-                error: expose ? err.message : "Internal Server Error",
-                stack: expose ? err.stack : "",
-                statusCode: 500,
-                url: url.pathname
-              });
-              res.writeHead(500, { "Content-Type": "text/html" });
-              res.end(errorHtml || renderDefaultErrorPage({ message: process.env.NODE_ENV !== "production" ? err.message : void 0, url: url.pathname, headExtra: bakedHeadExtra }));
-              return;
-            } finally {
-              globalThis.fetch = origFetch;
             }
           }
         }
       }
+      res.writeHead(404, { "Content-Type": "text/html" });
+      res.end(notFoundHtml || renderDefaultNotFoundPage({ url: url.pathname, headExtra: bakedHeadExtra }));
+    } finally {
+      globalThis.__vesk_request = __outerRequest;
     }
-    res.writeHead(404, { "Content-Type": "text/html" });
-    res.end(notFoundHtml || renderDefaultNotFoundPage({ url: url.pathname, headExtra: bakedHeadExtra }));
   });
   try {
     await eventsMod?.executeStart?.({ server, port, host });
@@ -56403,6 +56805,10 @@ var Ctx2 = class {
   markerless = true;
   inTryBody = false;
   claimStatic = false;
+  // Markerless only: the next real claim carries a compiler-generated static
+  // class descriptor so a same-tag but structurally different SSR slot is
+  // substituted instead of adopted (e.g. an empty-state <div> vs a list <div>).
+  descriptorClaim = false;
   // While set, the next StaticNode claimed in hydrate mode uses `__root` (the
   // item element already claimed by key) instead of walking for a new element.
   rootClaim = false;
@@ -56592,6 +56998,18 @@ var PROPERTY_ATTRS2 = {
   option: /* @__PURE__ */ new Set(["selected"]),
   progress: /* @__PURE__ */ new Set(["value"])
 };
+function staticClassDescriptor2(node) {
+  const hasDynamicClass = node.children.some((child) => child instanceof DynamicBinding && child.kind === "attribute" && child.target === "class");
+  if (hasDynamicClass)
+    return null;
+  const attr = node.attributes.find((a) => a.name === "class");
+  if (!attr)
+    return null;
+  const value = attr.value.trim();
+  if (!value)
+    return null;
+  return JSON.stringify({ class: value });
+}
 function emitStatic2(ctx2, node, tracked2, effectsVar, skipK = 0, regionBudget) {
   const el = ctx2.n();
   if (ctx2.hydrate) {
@@ -56603,7 +57021,11 @@ function emitStatic2(ctx2, node, tracked2, effectsVar, skipK = 0, regionBudget)
     ctx2.rootClaim = false;
     const skipExpr = regionBudget && ctx2.markerless ? markerlessSkipExpr2(regionBudget, skipK) : skipK;
     const skipArg = ctx2.markerless ? `, ${skipExpr}` : "";
-    const claimedExpr = rootClaim ? `__root || document.createElement(${JSON.stringify(node.tag)})` : `${ctx2.walker}.nextElement(${JSON.stringify(node.tag)}${skipArg})`;
+    const wantsDescriptor = ctx2.markerless && ctx2.descriptorClaim;
+    ctx2.descriptorClaim = false;
+    const descriptor = wantsDescriptor && !rootClaim ? staticClassDescriptor2(node) : null;
+    const descriptorArg = descriptor ? `, ${descriptor}` : "";
+    const claimedExpr = rootClaim ? `__root || document.createElement(${JSON.stringify(node.tag)})` : `${ctx2.walker}.nextElement(${JSON.stringify(node.tag)}${skipArg}${descriptorArg})`;
     ctx2.push(`const ${el} = ${claimedExpr};`);
     if (regionBudget && ctx2.markerless)
       ctx2.push(`${regionBudget} = 0;`);
@@ -57046,6 +57468,7 @@ function emitComponentCall2(ctx2, node, tracked2, effectsVar, parentVar, compPre
   }
   const callArgs = () => plainTarget ? `reactiveProps({ ${propsEntries.join(", ")} })` : `{ ${propsEntries.join(", ")} }`;
   if (ctx2.hydrate) {
+    ctx2.descriptorClaim = false;
     const access = calleeExpr ?? (ctx2.importedNames.has(node.componentName) ? node.componentName : `${ctx2.hydrateRegistry}[${JSON.stringify(node.componentName)}]`);
     if (!calleeExpr && !ctx2.importedNames.has(node.componentName)) {
       ctx2.push(`if (${access} == null) throw new Error(${JSON.stringify(`Component "${node.componentName}" was not found while rendering. Declare it with the \`component\` keyword, import it, or register it in the component registry.`)});`);
@@ -57287,13 +57710,14 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regi
   const hyd = ctx2.hydrate;
   const parent = parentVar || "$root";
   const budget = hyd ? regionBudgetVar2(ctx2, skipK, regionBudget) : null;
+  const rid = regionMarkerId(node);
   const isOpaque = (n) => !!n && typeof n.condition !== "undefined";
   if (hyd && node.alternateNodes.length === 1 && isOpaque(node.alternateNodes[0])) {
     const chain = [];
     let cur = node;
     let finalElse = null;
     while (cur) {
-      chain.push({ cond: transformTracked2(cur.condition, tracked2), nodes: cur.consequentNodes });
+      chain.push({ cond: transformTracked2(cur.condition, tracked2), nodes: cur.consequentNodes, id: regionMarkerId(cur) });
       if (cur.alternateNodes.length === 1 && isOpaque(cur.alternateNodes[0])) {
         cur = cur.alternateNodes[0];
       } else {
@@ -57317,6 +57741,9 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regi
       ctx2.push(`const ${rn} = ${fnOpen2}`);
       const cl = ctx2.n();
       ctx2.push(indent3(`const ${cl} = [];`));
+      const savedDescriptor = ctx2.descriptorClaim;
+      if (hyd && ctx2.markerless)
+        ctx2.descriptorClaim = true;
       for (const n of chain[i].nodes) {
         const savedClaim = ctx2.claimStatic;
         if (hyd)
@@ -57326,6 +57753,7 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regi
         if (v)
           ctx2.push(indent3(`${cl}.push(${v});`));
       }
+      ctx2.descriptorClaim = savedDescriptor;
       ctx2.push(indent3(`__place(${anchor2}, ${endAnchor2}, ${cl}, ${parent});`));
       ctx2.push(`};`);
     }
@@ -57335,6 +57763,9 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regi
       ctx2.push(`const ${finalRender} = ${fnOpen2}`);
       const cl2 = ctx2.n();
       ctx2.push(indent3(`const ${cl2} = [];`));
+      const savedDescriptor = ctx2.descriptorClaim;
+      if (hyd && ctx2.markerless)
+        ctx2.descriptorClaim = true;
       for (const n of finalElse) {
         const savedClaim = ctx2.claimStatic;
         if (hyd)
@@ -57344,27 +57775,39 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regi
         if (v)
           ctx2.push(indent3(`${cl2}.push(${v});`));
       }
+      ctx2.descriptorClaim = savedDescriptor;
       ctx2.push(indent3(`__place(${anchor2}, ${endAnchor2}, ${cl2}, ${parent});`));
       ctx2.push(`};`);
     }
-    let init = `if (${chain[0].cond}) { ${asyncKw2}${renderNames[0]}(); }`;
-    for (let i = 1; i < chain.length; i++)
-      init += ` else if (${chain[i].cond}) { ${asyncKw2}${renderNames[i]}(); }`;
-    if (finalRender)
-      init += ` else { ${asyncKw2}${finalRender}(); }`;
-    ctx2.push(init);
     let branchInitFallback = finalRender ? `${chain.length}` : "-1";
     for (let i = chain.length - 1; i >= 0; i--) {
       branchInitFallback = `(${chain[i].cond} ? ${i} : ${branchInitFallback})`;
     }
     const branchInit = `(${branchInitFallback})`;
+    const branchSnapshot = ctx2.n();
+    ctx2.push(`const ${branchSnapshot} = ${branchInit};`);
+    if (!ctx2.markerless) {
+      for (let i = 0; i < chain.length; i++) {
+        ctx2.push(`if (__hydrate) __reconcileRegion(${parent}, '${chain[i].id}', ${branchSnapshot} === ${i} ? 0 : 1, ${ctx2.walker});`);
+      }
+    } else {
+      const chainBranches = chain.map((c) => c.nodes);
+      if (finalElse)
+        chainBranches.push(finalElse);
+      emitStructuralRegionDiscard2(ctx2, chainBranches, branchSnapshot, budget);
+    }
+    let init = `if (${branchSnapshot} === 0) { ${asyncKw2}${renderNames[0]}(); }`;
+    for (let i = 1; i < chain.length; i++)
+      init += ` else if (${branchSnapshot} === ${i}) { ${asyncKw2}${renderNames[i]}(); }`;
+    if (finalRender)
+      init += ` else { ${asyncKw2}${finalRender}(); }`;
+    ctx2.push(init);
     let effInner = `if (__new === 0) { ${asyncKw2}${renderNames[0]}(); }`;
     for (let i = 1; i < chain.length; i++)
       effInner += ` else if (__new === ${i}) { ${asyncKw2}${renderNames[i]}(); }`;
     if (finalRender)
       effInner += ` else { ${asyncKw2}${finalRender}(); }`;
     const effBody = `effect(${ctx2.isAsyncScope ? "async () => {" : "() => {"}
-        if (__first) { __first = false; __iv = ${branchInit}; return; }
         const __new = ${branchInit};
         if (__new !== __iv) {
           for (const e of ${effectsVar2}) destroy_block(e);
@@ -57376,14 +57819,12 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regi
       }, true);`;
     if (effTarget) {
       ctx2.push(`${effTarget}.push((() => {
-      let __iv = ${branchInit};
-      let __first = true;
+      let __iv = ${branchSnapshot};
       return ${effBody}
     })());`);
     } else {
       ctx2.effects.push(`{
-      let __iv = ${branchInit};
-      let __first = true;
+      let __iv = ${branchSnapshot};
       ${effBody}
     }`);
     }
@@ -57411,6 +57852,9 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regi
     ctx2.push(indent3(`const ${conFrag} = document.createDocumentFragment();`));
   if (hyd)
     ctx2.push(indent3(`const __cl = [];`));
+  const savedConDescriptor = ctx2.descriptorClaim;
+  if (hyd && ctx2.markerless)
+    ctx2.descriptorClaim = true;
   for (const n of node.consequentNodes) {
     const savedClaim = ctx2.claimStatic;
     if (hyd)
@@ -57424,6 +57868,7 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regi
         ctx2.push(indent3(`${conFrag}.appendChild(${v});`));
     }
   }
+  ctx2.descriptorClaim = savedConDescriptor;
   if (hyd)
     ctx2.push(indent3(`__place(${anchor}, ${endAnchor}, __cl, ${parent});`));
   else
@@ -57440,6 +57885,9 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regi
       ctx2.push(indent3(`const ${altFrag} = document.createDocumentFragment();`));
     if (hyd)
       ctx2.push(indent3(`const __cl = [];`));
+    const savedAltDescriptor = ctx2.descriptorClaim;
+    if (hyd && ctx2.markerless)
+      ctx2.descriptorClaim = true;
     for (const n of node.alternateNodes) {
       const savedAltClaim = ctx2.claimStatic;
       if (hyd)
@@ -57453,6 +57901,7 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regi
           ctx2.push(indent3(`${altFrag}.appendChild(${v});`));
       }
     }
+    ctx2.descriptorClaim = savedAltDescriptor;
     if (hyd)
       ctx2.push(indent3(`__place(${anchor}, ${endAnchor}, __cl, ${parent});`));
     else
@@ -57461,10 +57910,15 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regi
   }
   if (!hyd)
     ctx2.push(`${parent}.appendChild(${endAnchor});`);
-  ctx2.push(`if (${condExpr}) { ${asyncKw}${conRenderName}(); }` + (hasElse ? ` else { ${asyncKw}${altRenderName}(); }` : ""));
+  const condSnapshot = ctx2.n();
+  ctx2.push(`const ${condSnapshot} = ${condExpr};`);
+  if (hyd && !ctx2.markerless)
+    ctx2.push(`if (__hydrate) __reconcileRegion(${parent}, '${rid}', ${condSnapshot} ? 0 : 1, ${ctx2.walker});`);
+  if (hyd && ctx2.markerless)
+    emitStructuralRegionDiscard2(ctx2, [node.consequentNodes, node.alternateNodes], hasElse ? `(${condSnapshot} ? 0 : 1)` : `(${condSnapshot} ? 0 : -1)`, budget);
+  ctx2.push(`if (${condSnapshot}) { ${asyncKw}${conRenderName}(); }` + (hasElse ? ` else { ${asyncKw}${altRenderName}(); }` : ""));
   const renderBranch = `if (__nv) { ${asyncKw}${conRenderName}(); }` + (hasElse ? ` else { ${asyncKw}${altRenderName}(); }` : "");
   const effectBody = `effect(${ctx2.isAsyncScope ? "async () => {" : "() => {"}
-      if (__first) { __first = false; __iv = ${condExpr}; return; }
       const __nv = ${condExpr};
       if (__nv !== __iv) {
         for (const e of ${effectsVar}) destroy_block(e);
@@ -57478,14 +57932,12 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regi
     return null;
   if (effTarget) {
     ctx2.push(`${effTarget}.push((() => {
-    let __iv = ${condExpr};
-    let __first = true;
+    let __iv = ${condSnapshot};
     return ${effectBody}
   })());`);
   } else {
     ctx2.effects.push(`{
-    let __iv = ${condExpr};
-    let __first = true;
+    let __iv = ${condSnapshot};
     ${effectBody}
   }`);
   }
@@ -57920,29 +58372,26 @@ function emitMap2(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regionB
   let emptyRenderName = null;
   if (node.alternateNodes.length > 0) {
     emptyRenderName = ctx2.n();
-    const emptySig = !hyd ? ctx2.isAsyncScope ? "async () => {" : "() => {" : ctx2.isAsyncScope ? "async (__cl) => {" : "(__cl) => {";
+    const emptyClaims = ctx2.hydrate;
+    const emptySig = !emptyClaims ? ctx2.isAsyncScope ? "async () => {" : "() => {" : ctx2.isAsyncScope ? "async (__cl) => {" : "(__cl) => {";
     ctx2.push(`const ${emptyRenderName} = ${emptySig}`);
     ctx2.push(indent3(`const __p = ${anchor}.parentNode;`));
     const frag = ctx2.n();
-    if (!hyd)
+    if (!emptyClaims)
       ctx2.push(indent3(`const ${frag} = document.createDocumentFragment();`));
     const savedClaim = ctx2.claimStatic;
-    const savedHydrate = ctx2.hydrate;
-    if (hydKeyed)
-      ctx2.hydrate = false;
     for (const n of node.alternateNodes) {
       ctx2.claimStatic = true;
-      const v = emitNode2(ctx2, n, tracked2, effectsVar, hyd ? void 0 : frag, "__components", 0, budget || void 0);
+      const v = emitNode2(ctx2, n, tracked2, effectsVar, emptyClaims ? void 0 : frag, "__components", 0, budget || void 0);
       if (v) {
-        if (hyd)
+        if (emptyClaims)
           ctx2.push(indent3(`if (__cl) __cl.push(${v}); else __p.insertBefore(${v}, ${endAnchor});`));
         else
           ctx2.push(indent3(`${frag}.appendChild(${v});`));
       }
     }
     ctx2.claimStatic = savedClaim;
-    ctx2.hydrate = savedHydrate;
-    if (!hyd)
+    if (!emptyClaims)
       ctx2.push(indent3(`if (${frag}.childNodes.length > 0) __p.insertBefore(${frag}, ${endAnchor});`));
     ctx2.push(`};`);
   }
@@ -57964,8 +58413,13 @@ function emitMap2(ctx2, node, tracked2, effTarget, parentVar, skipK = 0, regionB
     }
     if (emptyRenderName) {
       const isEmptyVar = ctx2.n();
+      const collectVar = hydKeyed ? ctx2.n() : null;
       ctx2.push(`let ${isEmptyVar} = !${hasItems}();`);
-      ctx2.push(`if (!${isEmptyVar}) { ${initList}(); } else { ${aw}${emptyRenderName}(); }`);
+      if (collectVar)
+        ctx2.push(`const ${collectVar} = [];`);
+      ctx2.push(`if (!${isEmptyVar}) { ${initList}(); } else { ${aw}${emptyRenderName}(${collectVar || ""}); }`);
+      if (collectVar)
+        ctx2.push(`__place(${anchor}, ${endAnchor}, ${collectVar}, ${parent});`);
       if (!reactiveSource)
         return null;
       pushEffect(`let __first = true;`, `effect(${effOpen}
@@ -58044,7 +58498,7 @@ ${renderAllItems("        ", null)}
     __cleanup(${anchor}, ${endAnchor});
     if (__new) {
 ${renderAllItems("      ", null)}
-    } else { ${aw}${emptyRenderName}(${collectVar ? collectVar : ""}); }
+    } else { ${aw}${emptyRenderName}(); }
   }, true)`);
     } else {
       const collectVar = hyd ? ctx2.n() : null;
@@ -58137,6 +58591,8 @@ function generateComponent2(comp, importedNames = /* @__PURE__ */ new Set(), hyd
       }
     }
   }
+  if (ctx2.hydrate && ctx2.markerless)
+    ctx2.descriptorClaim = true;
   for (const node of comp.body) {
     if (node instanceof TrackDecl) {
       if (deferredTrackDecls.has(node))
@@ -58227,6 +58683,33 @@ function buildComponentMap3(irRoot, hydrate = false, alloc, markerless = true) {
     const code = generateComponent2(comp, directNames, hydrate, asyncComps, linkNames, selfClaimNames, alloc, markerless);
     mapLines.push(`${registry}[${JSON.stringify(comp.name)}] = ${code};`);
   }
+  if (hydrate && !markerless) {
+    mapLines.push(`function __reconcileRegion(parent, id, branch, walker) {`);
+    mapLines.push(`	if (!parent) return;`);
+    mapLines.push(`	let start = null;`);
+    mapLines.push(`	let end = null;`);
+    mapLines.push(`	for (let n = parent.firstChild; n; n = n.nextSibling) {`);
+    mapLines.push(`		if (n.nodeType !== 8) continue;`);
+    mapLines.push(`		const text = n.textContent || '';`);
+    mapLines.push(`		if (text === 'vesk-r:' + id + ':0' || text === 'vesk-r:' + id + ':1') start = n;`);
+    mapLines.push(`		else if (text === 'vesk-r-end:' + id) end = n;`);
+    mapLines.push(`		if (start && end) break;`);
+    mapLines.push(`	}`);
+    mapLines.push(`	if (!start || !end) return;`);
+    mapLines.push(`	const ssrBranch = (start.textContent || '').slice(-2) === ':1' ? 1 : 0;`);
+    mapLines.push(`	if (ssrBranch !== branch) {`);
+    mapLines.push(`		let n = start.nextSibling;`);
+    mapLines.push(`		while (n && n !== end) {`);
+    mapLines.push(`			const next = n.nextSibling;`);
+    mapLines.push(`			n.remove();`);
+    mapLines.push(`			n = next;`);
+    mapLines.push(`		}`);
+    mapLines.push(`		if (walker && walker.retireDetached) walker.retireDetached();`);
+    mapLines.push(`	}`);
+    mapLines.push(`	start.remove();`);
+    mapLines.push(`	end.remove();`);
+    mapLines.push(`}`);
+  }
   mapLines.push(`function __cleanup(start, end) {`);
   mapLines.push(`	let n = start.nextSibling;`);
   mapLines.push(`	while (n && n !== end) {`);
@@ -58291,6 +58774,50 @@ function ssrResidueEstimate2(node) {
   }
   return 0;
 }
+function firstBranchRoot2(nodes) {
+  for (const n of nodes) {
+    if (n instanceof StaticNode)
+      return { tag: n.tag, descriptor: staticClassDescriptor2(n) };
+    if (n instanceof ComponentCall || n instanceof ComponentRef)
+      return null;
+    if (n instanceof OpaqueDynamicRegion)
+      return null;
+    if (n instanceof MapRegion || n instanceof ForLoop || n instanceof WhileLoop) {
+      const child = firstBranchRoot2(n.bodyTemplate);
+      if (child)
+        return child;
+    }
+    if (n instanceof SwitchBlock) {
+      for (const c of n.cases) {
+        const child = firstBranchRoot2(c.body);
+        if (child)
+          return child;
+      }
+    }
+    if (n instanceof TryCatch) {
+      const child = firstBranchRoot2(n.bodyTemplate) || firstBranchRoot2(n.catchBody);
+      if (child)
+        return child;
+    }
+  }
+  return null;
+}
+function structuralRegionMetadata2(branches) {
+  const parts = branches.map((nodes) => {
+    const first = firstBranchRoot2(nodes);
+    const tag = first ? JSON.stringify(first.tag) : "undefined";
+    const descriptor = first && first.descriptor ? first.descriptor : "null";
+    return `{ tag: ${tag}, descriptor: ${descriptor}, count: ${ssrResidueEstimate2(nodes)} }`;
+  });
+  return `[${parts.join(", ")}]`;
+}
+function emitStructuralRegionDiscard2(ctx2, branches, selectedExpr, budget) {
+  if (!ctx2.hydrate || !ctx2.markerless)
+    return;
+  const offset2 = budget ? `, ${budget}` : "";
+  const consume = budget ? ` ${budget} = 0;` : "";
+  ctx2.push(`if (${ctx2.walker} && typeof ${ctx2.walker}.discardStructuralRegion === 'function' && ${ctx2.walker}.discardStructuralRegion(${structuralRegionMetadata2(branches)}, ${selectedExpr}${offset2})) {${consume}}`);
+}
 function isStaticIR2(body) {
   for (const node of body) {
     if (node instanceof StaticNode) {
@@ -59903,12 +60430,24 @@ function fileUnchanged2(filePath, cached) {
     return false;
   }
 }
-function buildRouterOpts2(options) {
+function hasServerMiddleware2(nodes) {
+  for (const node of nodes) {
+    if (node.hasMiddleware)
+      return true;
+    if (node.children?.length && hasServerMiddleware2(node.children))
+      return true;
+  }
+  return false;
+}
+function buildRouterOpts2(options, serverMiddleware) {
   const ttl = options?.routeDataCache;
+  const opts = [];
+  if (serverMiddleware)
+    opts.push("serverMiddleware: true");
   if (typeof ttl === "number" && ttl > 0) {
-    return `, { routeDataCache: ${ttl} }`;
+    opts.push(`routeDataCache: ${ttl}`);
   }
-  return "";
+  return opts.length ? `, { ${opts.join(", ")} }` : "";
 }
 function findRuntimeSrc3(appDir) {
   const monorepoRoot = resolve24(__dirname7, "..", "..", "..");
@@ -59964,7 +60503,7 @@ function isAnyImport2(node) {
   return node.type === "ImportDeclaration";
 }
 function isRuntimePreamble2(node) {
-  if (node.type === "FunctionDeclaration" && (node.id?.name === "__cleanup" || node.id?.name === "__place")) {
+  if (node.type === "FunctionDeclaration" && (node.id?.name === "__cleanup" || node.id?.name === "__place" || node.id?.name === "__reconcileRegion")) {
     return true;
   }
   if (node.type === "VariableDeclaration") {
@@ -61198,12 +61737,13 @@ async function buildMainBundle2(routeTree, runtimeDir, codeSplit, mono, hmr, imp
 ` : runtimeCode + "\n";
   const cleanupFn = "function __cleanup(start, end) {\n	let n = start.nextSibling;\n	while (n && n !== end) {\n		const next = n.nextSibling;\n		n.remove();\n		n = next;\n	}\n}\n";
   const placeFn = "function __place(start, end, nodes, fallback) {\n	if (start.parentNode !== null) {\n		const p = start.parentNode;\n		for (let i = 0; i < nodes.length; i++) p.insertBefore(nodes[i], end);\n		return;\n	}\n	if (nodes.length > 0 && nodes[0].parentNode) {\n		const p = nodes[0].parentNode;\n		p.insertBefore(start, nodes[0]);\n		p.insertBefore(end, nodes[nodes.length - 1].nextSibling);\n		// Client-surplus nodes (SSR rendered fewer items than the client data)\n		// are freshly claimed and still detached \u2014 move them into the region in\n		// client order before `end`, instead of stranding them off-parent.\n		for (let i = 0; i < nodes.length; i++) {\n			if (nodes[i].parentNode === null) p.insertBefore(nodes[i], end);\n		}\n		return;\n	}\n	fallback.appendChild(start);\n	fallback.appendChild(end);\n	for (let i = 0; i < nodes.length; i++) fallback.insertBefore(nodes[i], end);\n}\n";
+  const reconcileRegionFn = "function __reconcileRegion(parent, id, branch, walker) {\n	if (!parent) return;\n	let start = null;\n	let end = null;\n	for (let n = parent.firstChild; n; n = n.nextSibling) {\n		if (n.nodeType !== 8) continue;\n		const text = n.textContent || '';\n		if (text === 'vesk-r:' + id + ':0' || text === 'vesk-r:' + id + ':1') start = n;\n		else if (text === 'vesk-r-end:' + id) end = n;\n		if (start && end) break;\n	}\n	if (!start || !end) return;\n	const ssrBranch = (start.textContent || '').slice(-2) === ':1' ? 1 : 0;\n	if (ssrBranch !== branch) {\n		let n = start.nextSibling;\n		while (n && n !== end) {\n			const next = n.nextSibling;\n			n.remove();\n			n = next;\n		}\n		if (walker && walker.retireDetached) walker.retireDetached();\n	}\n	start.remove();\n	end.remove();\n}\n";
   const updateComponentsFn = "function __updateComponents(nodes) {\n  for (const n of nodes) {\n    if (n._pageName && __components[n._pageName]) n.page = __components[n._pageName];\n    if (n._layoutName && __components[n._layoutName]) n.layout = __components[n._layoutName];\n    if (n._errorName && __components[n._errorName]) n.error = __components[n._errorName];\n    if (n._notFoundName && __components[n._notFoundName]) n.notFound = __components[n._notFoundName];\n    if (n._offlineName && __components[n._offlineName]) n.offline = __components[n._offlineName];\n    if (n._networkName && __components[n._networkName]) n.network = __components[n._networkName];\n    if (n.children) __updateComponents(n.children);\n  }\n}\n";
   const routeTreeJson = JSON.stringify(routeTree);
   if (codeSplit) {
     const resolveNamesFn = "function __resolveNames(nodes) {\n  for (const n of nodes) {\n    if (n.chunk) n._chunk = n.chunk;\n    if (n.chunkError) n._chunkError = n.chunkError;\n    if (typeof n.page === 'string') n._pageName = n.page;\n    if (typeof n.layout === 'string') n._layoutName = n.layout;\n    if (typeof n.error === 'string') n._errorName = n.error;\n    if (typeof n.notFound === 'string') n._notFoundName = n.notFound;\n    if (typeof n.offline === 'string') n._offlineName = n.offline;\n    if (typeof n.network === 'string') n._networkName = n.network;\n    if (n.children) __resolveNames(n.children);\n  }\n}\n";
     const pendCode = "const __pendChunks = [];\nconst __currentPath = typeof window !== 'undefined' ? window.location.pathname : '/';\nif (typeof matchRoute === 'function') {\n  const __currentMatch = matchRoute(__routeTree, __currentPath);\n  if (__currentMatch) {\n    for (const n of __currentMatch.matchChain) {\n      if (n._chunk && !__pendChunks.includes(n._chunk)) __pendChunks.push(n._chunk);\n    }\n  }\n}\n";
-    const routerOpts2 = buildRouterOpts2({ routeDataCache });
+    const routerOpts2 = buildRouterOpts2({ routeDataCache }, hasServerMiddleware2(routeTree));
     const startRouterCode = `const __startRouter = function() {
   __updateComponents(__routeTree);
   const __router = createFileRouter(__routeTree${routerOpts2});
@@ -61242,14 +61782,14 @@ if (__pendChunks.length > 0 && typeof ensureChunk === 'function') {
     ];
     const importedSet = new Set(allRuntimeImports);
     const runtimeGlobals2 = globalNames.filter((n) => importedSet.has(n)).map((n) => `globalThis.${n} = ${n};
-`).join("") + "globalThis.__runtime_comps = __runtime_comps;\nglobalThis.__cleanup = __cleanup;\nglobalThis.__place = __place;\n\n";
+`).join("") + "globalThis.__runtime_comps = __runtime_comps;\nglobalThis.__cleanup = __cleanup;\nglobalThis.__place = __place;\nglobalThis.__reconcileRegion = __reconcileRegion;\n\n";
     const extraGlobals = [...runtimeImportNames || []].filter((n) => n && n !== "default").map((n) => `globalThis.${n} = ${n};
 `).join("");
     const code2 = preamble + "const __components = globalThis.__components || (globalThis.__components = {});\nconst __hydrators = globalThis.__hydrators || (globalThis.__hydrators = {});\nconst __runtime_comps = __components;\n\n" + runtimeGlobals2 + extraGlobals + // Shared app modules run HERE: after the runtime bindings are published,
     // before anything can request a route chunk. Earlier (at the top of the
     // bundle) `globalThis.track` was still undefined, so every module-scope
     // cell in a store was created against a missing runtime.
-    (sharedModuleBundle ? sharedModuleBundle + "\n" : "") + cleanupFn + placeFn + "globalThis.__components = __components;\n" + resolveNamesFn + updateComponentsFn + "const __routeTree = " + routeTreeJson + ";\n__resolveNames(__routeTree);\n" + pendCode + startRouterCode;
+    (sharedModuleBundle ? sharedModuleBundle + "\n" : "") + cleanupFn + placeFn + reconcileRegionFn + "globalThis.__components = __components;\n" + resolveNamesFn + updateComponentsFn + "const __routeTree = " + routeTreeJson + ";\n__resolveNames(__routeTree);\n" + pendCode + startRouterCode;
     return hmr ? appendHmrGlobals2(code2) : code2;
   }
   const componentLines = mono?.componentLines || [];
@@ -61258,8 +61798,8 @@ if (__pendChunks.length > 0 && typeof ensureChunk === 'function') {
   const hydratorAliasLines = mono?.hydratorAliasLines || [];
   const aliasCode = aliasLines.length > 0 ? aliasLines.join("\n") + "\n" : "";
   const hydratorAliasCode = hydratorAliasLines.length > 0 ? hydratorAliasLines.join("\n") + "\n" : "";
-  const routerOpts = buildRouterOpts2({ routeDataCache });
-  const code = preamble + "const __components = {};\nconst __hydrators = {};\nconst __runtime_comps = __components;\n\n" + componentLines.join("\n\n") + "\n" + aliasCode + hydratorLines.join("\n\n") + "\n" + hydratorAliasCode + cleanupFn + placeFn + "globalThis.__components = __components;\nglobalThis.__runtime_comps = __runtime_comps;\nglobalThis.__cleanup = __cleanup;\nglobalThis.__place = __place;\n" + allRuntimeImports.map((n) => `globalThis.${n} = ${n};
+  const routerOpts = buildRouterOpts2({ routeDataCache }, hasServerMiddleware2(routeTree));
+  const code = preamble + "const __components = {};\nconst __hydrators = {};\nconst __runtime_comps = __components;\n\n" + componentLines.join("\n\n") + "\n" + aliasCode + hydratorLines.join("\n\n") + "\n" + hydratorAliasCode + cleanupFn + placeFn + reconcileRegionFn + "globalThis.__components = __components;\nglobalThis.__runtime_comps = __runtime_comps;\nglobalThis.__cleanup = __cleanup;\nglobalThis.__place = __place;\nglobalThis.__reconcileRegion = __reconcileRegion;\n" + allRuntimeImports.map((n) => `globalThis.${n} = ${n};
 `).join("") + "function __resolveNames(nodes) {\n  for (const n of nodes) {\n    if (typeof n.page === 'string') {\n      n._pageName = n.page;\n      n.page = __components[n.page];\n    }\n    if (typeof n.layout === 'string') {\n      n._layoutName = n.layout;\n      n.layout = __components[n.layout];\n    }\n    if (typeof n.error === 'string') n.error = __components[n.error];\n    if (typeof n.notFound === 'string') n.notFound = __components[n.notFound];\n    if (typeof n.offline === 'string') n.offline = __components[n.offline];\n    if (typeof n.network === 'string') n.network = __components[n.network];\n    if (n.children) __resolveNames(n.children);\n  }\n}\n" + updateComponentsFn + "const __routeTree = " + routeTreeJson + `;
 __resolveNames(__routeTree);
 const __router = createFileRouter(__routeTree${routerOpts});
@@ -68827,6 +69367,28 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
     if (await handleActionRequest(req, res, { url, appDirPath, routeTree, security, maxBodyBytes, plugins: getActiveDevPlugins() })) {
       return;
     }
+    if (url.pathname === "/_vesk/middleware") {
+      const targetPath = url.searchParams.get("path") || "/";
+      const targetUrl = new URL(targetPath, "http://localhost");
+      const targetChain = collectMiddlewareChain(routeTree, targetUrl.pathname, appDirPath);
+      const rawHeaders = {};
+      for (const [k, v] of Object.entries(req.headers)) {
+        rawHeaders[k] = Array.isArray(v) ? v.join(", ") : v || "";
+      }
+      const mwReq = new Request(targetUrl.href, { headers: rawHeaders, method: "GET" });
+      const mwResult = await executeMiddlewareChain(targetChain, mwReq, {}, {
+        plugins: getActiveDevPlugins(),
+        onLast: async () => null
+      });
+      res.writeHead(200, { "Content-Type": "application/json; charset=utf-8", "Cache-Control": "no-store" });
+      if (mwResult.response) {
+        const location = mwResult.response.headers.get("location") || mwResult.response.headers.get("Location");
+        res.end(JSON.stringify(location ? { redirect: location } : { allow: true }));
+        return;
+      }
+      res.end(JSON.stringify(mwResult.rewriteUrl ? { rewrite: mwResult.rewriteUrl } : { allow: true }));
+      return;
+    }
     const mwChain = collectMiddlewareChain(routeTree, url.pathname, appDirPath);
     const apiDirPath = join28(appDirPath, "api");
     if (url.pathname.startsWith("/api") && existsSync44(apiDirPath)) {