@vesk/vesk-cli 0.2.16 → 0.2.18

package/dist/cli.js

@@ -2102,6 +2102,20 @@ var init_portal = __esm({
 });
 
 // ../runtime/src/hydrate.ts
+function runInHydrateBlock(fn) {
+  const previous = scope();
+  const block2 = root(() => {
+  });
+  set_active_block(block2);
+  try {
+    const result2 = fn();
+    set_active_block(previous);
+    return result2;
+  } catch (error) {
+    set_active_block(previous);
+    throw error;
+  }
+}
 function collectVskMarkers(container) {
   const markers = [];
   const walker = document.createTreeWalker(container, _SHOW_COMMENT, {
@@ -2177,7 +2191,7 @@ function hydrateViewport(container, componentFn, props, rootMargin = 500) {
     marker.textContent = "vsk-hold";
   }
   const viewportWalker = createHydrateWalker(container, viewportMarkers);
-  componentFn(props || {}, /* @__PURE__ */ new Map(), viewportWalker);
+  runInHydrateBlock(() => componentFn(props || {}, /* @__PURE__ */ new Map(), viewportWalker));
   if (deferredMarkers.length > 0) {
     return new Promise((resolve39) => {
       const observer = new IntersectionObserver((entries) => {
@@ -2198,7 +2212,7 @@ function hydrateViewport(container, componentFn, props, rootMargin = 500) {
         }
         if (toHydrate.length > 0) {
           const w = createHydrateWalker(container, toHydrate);
-          componentFn(props || {}, /* @__PURE__ */ new Map(), w);
+          runInHydrateBlock(() => componentFn(props || {}, /* @__PURE__ */ new Map(), w));
         }
         if (observer._observed === 0) {
           observer.disconnect();
@@ -2230,7 +2244,7 @@ function hydrateIdle(container, componentFn, props, options2 = {}) {
     idx = end;
     if (chunk.length > 0) {
       const walker = createHydrateWalker(container, chunk);
-      componentFn(props || {}, /* @__PURE__ */ new Map(), walker);
+      runInHydrateBlock(() => componentFn(props || {}, /* @__PURE__ */ new Map(), walker));
     }
     if (idx < allMarkers.length && (!deadline || deadline.timeRemaining() > 0 || deadline.didTimeout)) {
       rafId2 = rIC(processChunk, { timeout });
@@ -2259,7 +2273,7 @@ function hydrateOnInteraction(container, componentFn, props, options2 = {}) {
     const markers = collectVskMarkers(container);
     if (markers.length > 0) {
       const walker = createHydrateWalker(container, markers);
-      componentFn(props || {}, /* @__PURE__ */ new Map(), walker);
+      runInHydrateBlock(() => componentFn(props || {}, /* @__PURE__ */ new Map(), walker));
     }
   }
   const handler = (e) => trigger(e.type);
@@ -2281,6 +2295,7 @@ var init_hydrate = __esm({
   "../runtime/src/hydrate.ts"() {
     "use strict";
     init_ripple_runtime();
+    init_ripple_blocks();
     _SHOW_COMMENT = 128;
     _FILTER_ACCEPT = 1;
     _FILTER_SKIP = 2;
@@ -2651,6 +2666,17 @@ function permanentRedirect(url) {
 function notFound() {
   throw new NotFoundError();
 }
+function routerMode() {
+  const r = RouterCtx.get() || _currentRouter;
+  return !!(r && r._hashMode);
+}
+function routeHrefOf(href) {
+  return routerMode() && href.startsWith("#") ? href.slice(1) : href;
+}
+function isRouteHref(href) {
+  if (!routerMode()) return !href.startsWith("#");
+  return !href.startsWith("#") || href.startsWith("#/");
+}
 function setIsHydrating(v) {
   __isHydrating = v;
 }
@@ -2660,33 +2686,44 @@ function setIsPopStateNavigation(v) {
 function setCurrentRouter(r) {
   _currentRouter = r;
 }
+function getCurrentRouter() {
+  return _currentRouter;
+}
+function isFn(v) {
+  return typeof v === "function";
+}
 function findLoadingComponent(chain) {
   for (let i = chain.length - 1; i >= 0; i--) {
-    if (chain[i].loading) return chain[i].loading;
+    const v = chain[i].loading;
+    if (isFn(v)) return v;
   }
   return null;
 }
 function findErrorComponent(chain) {
   for (let i = chain.length - 1; i >= 0; i--) {
-    if (chain[i].error) return chain[i].error;
+    const v = chain[i].error;
+    if (isFn(v)) return v;
   }
   return null;
 }
 function findNotFoundComponent(chain) {
   for (let i = chain.length - 1; i >= 0; i--) {
-    if (chain[i].notFound) return chain[i].notFound;
+    const v = chain[i].notFound;
+    if (isFn(v)) return v;
   }
   return null;
 }
 function findOfflineComponent(chain) {
   for (let i = chain.length - 1; i >= 0; i--) {
-    if (chain[i].offline) return chain[i].offline;
+    const v = chain[i].offline;
+    if (v !== void 0 && v !== null) return v;
   }
   return null;
 }
 function findNetworkComponent(chain) {
   for (let i = chain.length - 1; i >= 0; i--) {
-    if (chain[i].network) return chain[i].network;
+    const v = chain[i].network;
+    if (v !== void 0 && v !== null) return v;
   }
   return null;
 }
@@ -2759,6 +2796,16 @@ function Outlet(props) {
   }
   return div;
 }
+function mountLinkChildren(target, children) {
+  if (children.nodeType) {
+    target.appendChild(children);
+  } else if (Array.isArray(children)) {
+    for (const c of children) {
+      if (c && c.nodeType) target.appendChild(c);
+      else if (c != null) target.appendChild(document.createTextNode(String(c)));
+    }
+  }
+}
 function Link(props, registry, hydrate) {
   const href = props.href || "#";
   if (hydrate && hydrate.nextElement) {
@@ -2767,22 +2814,27 @@ function Link(props, registry, hydrate) {
       const existing = hydrate.root.querySelector("a");
       if (existing) a2 = existing;
     }
+    const claimed = a2 ? a2.parentNode !== null : false;
+    if (!a2) a2 = document.createElement("a");
+    applyLinkDom(a2, props, href);
     if (props.children != null) {
       if (typeof props.children === "string" || typeof props.children === "number") {
         a2.textContent = String(props.children);
-      } else if (props.children.textContent) {
-        a2.textContent = props.children.textContent;
+      } else {
+        a2.replaceChildren();
+        mountLinkChildren(a2, props.children);
       }
     }
     a2.addEventListener("click", (e) => {
       if (e.metaKey || e.ctrlKey || e.shiftKey || e.altKey || e.button !== 0) return;
       if (props.target === "_blank") return;
+      if (!isRouteHref(href)) return;
       e.preventDefault();
       e.stopPropagation();
       const nav = useNavigate();
       nav(href);
     });
-    return document.createDocumentFragment();
+    return claimed ? document.createDocumentFragment() : a2;
   }
   const attrs = [
     `href="${href.replace(/"/g, "&quot;")}"`,
@@ -2799,26 +2851,16 @@ function Link(props, registry, hydrate) {
     return `<a ${attrs}>${childStr}</a>`;
   }
   const a = document.createElement("a");
-  a.href = href;
-  if (props.class) a.className = props.class;
-  if (props.style) a.setAttribute("style", props.style);
-  if (props.target) a.target = props.target;
-  if (props.rel) a.rel = props.rel;
+  applyLinkDom(a, props, href);
   if (childStr) {
     a.textContent = childStr;
   } else if (props.children != null) {
-    if (props.children.nodeType) {
-      a.appendChild(props.children);
-    } else if (Array.isArray(props.children)) {
-      for (const c of props.children) {
-        if (c && c.nodeType) a.appendChild(c);
-        else if (c != null) a.appendChild(document.createTextNode(String(c)));
-      }
-    }
+    mountLinkChildren(a, props.children);
   }
   a.addEventListener("click", (e) => {
     if (e.metaKey || e.ctrlKey || e.shiftKey || e.altKey || e.button !== 0) return;
     if (props.target === "_blank") return;
+    if (!isRouteHref(href)) return;
     e.preventDefault();
     e.stopPropagation();
     const nav = useNavigate();
@@ -2826,6 +2868,14 @@ function Link(props, registry, hydrate) {
   });
   return a;
 }
+function applyLinkDom(a, props, href) {
+  const displayHref = routerMode() && !href.startsWith("#") ? "#" + href : href;
+  a.href = displayHref;
+  if (props.class) a.className = props.class;
+  if (props.style) a.setAttribute("style", props.style);
+  if (props.target) a.target = props.target;
+  if (props.rel) a.rel = props.rel;
+}
 function NavLink(props, registry, hydrate) {
   if (typeof document === "undefined") {
     return Link(props, registry, hydrate);
@@ -2833,23 +2883,27 @@ function NavLink(props, registry, hydrate) {
   if (__isHydrating) {
     const a2 = document.querySelector(`a[href="${props.href}"]`);
     if (a2) {
+      applyLinkDom(a2, props, props.href);
       if (props.children != null) {
         if (typeof props.children === "string" || typeof props.children === "number") {
           a2.textContent = String(props.children);
-        } else if (props.children.textContent) {
-          a2.textContent = props.children.textContent;
+        } else {
+          a2.replaceChildren();
+          mountLinkChildren(a2, props.children);
         }
       }
       a2.addEventListener("click", (e) => {
         if (e.metaKey || e.ctrlKey || e.shiftKey || e.altKey || e.button !== 0) return;
         if (props.target === "_blank") return;
+        if (!isRouteHref(props.href)) return;
         e.preventDefault();
         e.stopPropagation();
         const nav = useNavigate();
         nav(props.href);
       });
       const path2 = usePathname();
-      const isActive2 = props.href === path2 || props.href !== "/" && path2.startsWith(props.href) && (path2.length === props.href.length || path2[props.href.length] === "/" || path2[props.href.length] === "?");
+      const routeHref2 = routeHrefOf(props.href);
+      const isActive2 = routeHref2 === path2 || routeHref2 !== "/" && path2.startsWith(routeHref2) && (path2.length === routeHref2.length || path2[routeHref2.length] === "/" || path2[routeHref2.length] === "?");
       if (isActive2) {
         a2.classList.add(props.activeClass || "active");
         if (props.ariaCurrent !== false) a2.setAttribute("aria-current", "page");
@@ -2859,7 +2913,8 @@ function NavLink(props, registry, hydrate) {
   }
   const a = Link(props, registry, hydrate);
   const path = usePathname();
-  const isActive = props.href === path || props.href !== "/" && path.startsWith(props.href) && (path.length === props.href.length || path[props.href.length] === "/" || path[props.href.length] === "?");
+  const routeHref = routeHrefOf(props.href);
+  const isActive = routeHref === path || routeHref !== "/" && path.startsWith(routeHref) && (path.length === routeHref.length || path[routeHref.length] === "/" || path[routeHref.length] === "?");
   if (isActive) {
     a.classList.add(props.activeClass || "active");
     if (props.ariaCurrent !== false) a.setAttribute("aria-current", "page");
@@ -2904,7 +2959,11 @@ function useRouter() {
     back: () => window.history.back(),
     forward: () => window.history.forward(),
     go: (n) => window.history.go(n),
-    refresh: () => router?.navigate?.(window.location.pathname, { replace: true }),
+    refresh: () => {
+      const mode = routerMode();
+      const p = mode && typeof window !== "undefined" && window.location.hash && window.location.hash.length > 1 ? window.location.hash.slice(1) : typeof window !== "undefined" ? window.location.pathname : "";
+      router?.navigate?.(p, { replace: true });
+    },
     prefetch: (href) => router?.prefetch?.(href),
     beforeEach: (fn) => {
       const r = router;
@@ -3297,7 +3356,7 @@ function registerOnlineRecovery(router) {
   r._onlineHandler = () => {
     if (!r._showingOffline) return;
     r._showingOffline = false;
-    router.navigate(window.location.pathname + window.location.search, { replace: true });
+    router.navigate(routeFromLocation(hashModeOf(r)), { replace: true });
   };
   window.addEventListener("online", r._onlineHandler);
 }
@@ -3586,10 +3645,10 @@ function renderMatch(router, match, container, navToken) {
     if (!errorFn) throw error;
     const retry = () => {
       if (router && router.navigate) {
-        router.navigate(window.location.pathname, { replace: true });
+        router.navigate(routeFromLocation(hashModeOf(router)), { replace: true });
       }
     };
-    const errorProps = { error, retry, params: paramValues, statusCode: error?.statusCode ?? 500, stack: error instanceof Error ? error.stack : String(error), url: typeof window !== "undefined" ? window.location.pathname : "", offline: error?.offline === true, networkState: getNetworkState() };
+    const errorProps = { error, retry, params: paramValues, statusCode: error?.statusCode ?? 500, stack: error instanceof Error ? error.stack : String(error), url: typeof window !== "undefined" ? routeFromLocation(hashModeOf(router)) : "", offline: error?.offline === true, networkState: getNetworkState() };
     return runInBlockWindow(() => renderLayoutWith(0, () => {
       const result2 = errorFn(errorProps, /* @__PURE__ */ new Map(), clientWalker);
       if (result2 && typeof result2.then === "function") {
@@ -3603,10 +3662,10 @@ function renderMatch(router, match, container, navToken) {
     if (!errorFn) throw error;
     const retry = () => {
       if (router && router.navigate) {
-        router.navigate(window.location.pathname, { replace: true });
+        router.navigate(routeFromLocation(hashModeOf(router)), { replace: true });
       }
     };
-    const errorProps = { error, retry, params: paramValues, statusCode: error?.statusCode ?? 500, stack: error instanceof Error ? error.stack : String(error), url: typeof window !== "undefined" ? window.location.pathname : "", offline: error?.offline === true, networkState: getNetworkState() };
+    const errorProps = { error, retry, params: paramValues, statusCode: error?.statusCode ?? 500, stack: error instanceof Error ? error.stack : String(error), url: typeof window !== "undefined" ? routeFromLocation(hashModeOf(router)) : "", offline: error?.offline === true, networkState: getNetworkState() };
     const errDom = runInBlockWindow(() => errorFn(errorProps, /* @__PURE__ */ new Map(), clientWalker));
     if (errDom && typeof errDom.then === "function") {
       errDom.then(mountDom);
@@ -3696,10 +3755,10 @@ async function renderErrorPage(router, match, container, error) {
   const walker = createHydrateWalker(tempRoot, []);
   const retry = () => {
     if (router && router.navigate) {
-      router.navigate(window.location.pathname, { replace: true });
+      router.navigate(routeFromLocation(hashModeOf(router)), { replace: true });
     }
   };
-  const errorProps = { error, retry, params: paramValues, statusCode: error?.statusCode ?? 500, stack: error instanceof Error ? error.stack : String(error), url: typeof window !== "undefined" ? window.location.pathname : "", offline: error?.offline === true, networkState: getNetworkState() };
+  const errorProps = { error, retry, params: paramValues, statusCode: error?.statusCode ?? 500, stack: error instanceof Error ? error.stack : String(error), url: typeof window !== "undefined" ? routeFromLocation(hashModeOf(router)) : "", offline: error?.offline === true, networkState: getNetworkState() };
   const renderErrorChain = (index) => {
     if (index >= layoutNodes.length) {
       const result3 = errorFn(errorProps, /* @__PURE__ */ new Map(), walker);
@@ -3811,9 +3870,9 @@ async function hydrateInitial(router, match, container, strategy) {
         return (subWalker) => {
           if (!strategy || strategy === "full") {
             const pageProps = { params: paramValues, ...pageNode.props };
-            const result3 = hydPage(pageProps, /* @__PURE__ */ new Map(), subWalker);
-            storePageInstance(router, pageNode, pageProps, result3);
-            return result3;
+            const result2 = hydPage(pageProps, /* @__PURE__ */ new Map(), subWalker);
+            storePageInstance(router, pageNode, pageProps, result2);
+            return result2;
           } else if (strategy === "viewport") {
             hydrateViewport(subWalker.root, hydPage, { params: paramValues, ...pageNode.props });
           } else if (strategy === "idle") {
@@ -3827,10 +3886,12 @@ async function hydrateInitial(router, match, container, strategy) {
       const node = layoutNodes[index];
       const hydLayout = hydLayouts[index];
       const childHydrator = renderLayoutChain2(index + 1);
-      const layoutProps = { children: childHydrator, params: paramValues };
-      const result2 = hydLayout(layoutProps, /* @__PURE__ */ new Map(), walker);
-      storeLayoutInstance(router, node, layoutProps, result2);
-      return result2;
+      return (walker2) => {
+        const layoutProps = { children: childHydrator, params: paramValues };
+        const result2 = hydLayout(layoutProps, /* @__PURE__ */ new Map(), walker2);
+        storeLayoutInstance(router, node, layoutProps, result2);
+        return result2;
+      };
     };
     var renderLayoutChain = renderLayoutChain2;
     if (layoutNodes.length === 0) {
@@ -3860,7 +3921,7 @@ async function hydrateInitial(router, match, container, strategy) {
     }
     setIsHydrating(true);
     const walker = createHydrateWalker(container);
-    await runInBlockWindow(() => renderLayoutChain2(0));
+    await runInBlockWindow(() => renderLayoutChain2(0)(walker));
     setIsHydrating(false);
   } catch (error) {
     setIsHydrating(false);
@@ -3876,7 +3937,23 @@ async function hydrateInitial(router, match, container, strategy) {
     }
   }
 }
+function hashModeOf(r) {
+  return !!r && r._hashMode === true;
+}
+function routeFromLocation(mode) {
+  if (mode) {
+    const h = typeof window !== "undefined" ? window.location.hash : "";
+    if (h.length > 1 && h[1] === "/") return h.slice(1);
+    return "/";
+  }
+  return window.location.pathname + window.location.search;
+}
+function routeKey(mode) {
+  return get(_state.path) || routeFromLocation(mode);
+}
 function scrollToHash() {
+  const r = getCurrentRouter();
+  if (hashModeOf(r)) return;
   const h = typeof window !== "undefined" ? window.location.hash : "";
   if (!h || h === "#") return;
   const id = h.slice(1);
@@ -3893,6 +3970,7 @@ function createRouter(routes, options2 = {}) {
   const prefetch = options2.prefetch !== false;
   const hydrateStrategy = options2.hydrate || "full";
   const routeTree = Array.isArray(routes) ? routes : buildTreeFromMap(routes, options2);
+  const hashMode = options2.hash === true;
   const router = {
     routeTree,
     container,
@@ -3904,6 +3982,7 @@ function createRouter(routes, options2 = {}) {
     _offlineUI: options2.offline ?? null,
     _beforeGuards: [],
     _viewTransitions: options2.viewTransitions === true,
+    _hashMode: hashMode,
     beforeEach(fn) {
       this._beforeGuards.push(fn);
       let active = true;
@@ -3916,7 +3995,7 @@ function createRouter(routes, options2 = {}) {
       };
     },
     _runGuards(to) {
-      const from = window.location.pathname;
+      const from = get(_state.path) || window.location.pathname;
       for (const g2 of this._beforeGuards ?? []) {
         const d = g2(to, from);
         if (d instanceof Promise) {
@@ -3952,16 +4031,26 @@ function createRouter(routes, options2 = {}) {
           if (_scrollTimer) return;
           _scrollTimer = setTimeout(() => {
             if (window.scrollY !== void 0) {
-              _scrollPositions.set(window.location.pathname, window.scrollY);
+              _scrollPositions.set(routeKey(hashMode), window.scrollY);
             }
             _scrollTimer = null;
           }, 100);
         }, { passive: true });
       }
       window.addEventListener("popstate", () => {
+        const p = routeFromLocation(hashMode);
+        if (get(_state.path) === p) return;
         setIsPopStateNavigation(true);
-        this.navigate(window.location.href, { replace: true });
+        this.navigate(p, { replace: true });
       });
+      if (hashMode) {
+        window.addEventListener("hashchange", () => {
+          const p = routeFromLocation(true);
+          if (get(_state.path) === p) return;
+          setIsPopStateNavigation(true);
+          this.navigate(p, { replace: true });
+        });
+      }
       document.addEventListener("click", (e) => {
         const target = e.target;
         if (!target || target.nodeType !== 1) return;
@@ -3975,7 +4064,8 @@ function createRouter(routes, options2 = {}) {
         if (anchor.hasAttribute("download")) return;
         if (anchor.getAttribute("rel") === "external") return;
         const href = anchor.getAttribute("href");
-        if (!href || href.startsWith("#") || href.startsWith("mailto:") || href.startsWith("tel:") || href.startsWith("javascript:")) return;
+        if (!href || href.startsWith("mailto:") || href.startsWith("tel:") || href.startsWith("javascript:")) return;
+        if (href.startsWith("#") && (!hashMode || !href.startsWith("#/"))) return;
         try {
           const url = new URL(href, window.location.origin);
           if (url.origin !== window.location.origin) return;
@@ -3992,8 +4082,8 @@ function createRouter(routes, options2 = {}) {
           if (link) this.prefetch(link.getAttribute("href"));
         }, { passive: true });
       }
-      const path = window.location.pathname + window.location.search;
-      if (container.children.length > 0) {
+      const path = routeFromLocation(hashMode);
+      if (container.children.length > 0 && !hashMode) {
         const url = new URL(path, window.location.origin);
         const match = matchRoute(this.routeTree, url.pathname);
         if (match) {
@@ -4009,7 +4099,9 @@ function createRouter(routes, options2 = {}) {
       return this;
     },
     navigate(path, opts = {}) {
-      const url = new URL(path, window.location.origin);
+      const mode = hashModeOf(this);
+      const raw2 = mode && typeof path === "string" && path.startsWith("#/") ? path.slice(1) : path;
+      const url = new URL(raw2, window.location.origin);
       const match = matchRoute(this.routeTree, url.pathname);
       if (!match) {
         window.location.href = path;
@@ -4020,7 +4112,7 @@ function createRouter(routes, options2 = {}) {
       const guardResult = self._runGuards(url.pathname);
       const proceedNav = () => {
         if (!_isPopStateNavigation) {
-          _scrollPositions.set(window.location.pathname, window.scrollY);
+          _scrollPositions.set(routeKey(mode), window.scrollY);
         }
         const loadingFn = findLoadingComponent(match.matchChain);
         this._navToken = (this._navToken || 0) + 1;
@@ -4028,10 +4120,12 @@ function createRouter(routes, options2 = {}) {
         loadingStart();
         let firstRenderFailed = false;
         const updateUrl = () => {
+          const fullPath = url.pathname + url.search;
+          const target = mode ? fullPath.startsWith("/") ? "#" + fullPath : "#" + fullPath : fullPath;
           if (!opts.replace) {
-            window.history.pushState({ path: url.pathname }, "", url.pathname + url.search);
+            window.history.pushState({ path: url.pathname }, "", target);
           } else {
-            window.history.replaceState({ path: url.pathname }, "", url.pathname + url.search);
+            window.history.replaceState({ path: url.pathname }, "", target);
           }
           set(_state.path, url.pathname);
           set(_state.search, url.search.startsWith("?") ? url.search.slice(1) : url.search);
@@ -4130,7 +4224,9 @@ function createRouter(routes, options2 = {}) {
       proceedNav();
     },
     prefetch(path) {
-      const url = new URL(path, window.location.origin);
+      const mode = hashModeOf(this);
+      const raw2 = mode && typeof path === "string" && path.startsWith("#/") ? path.slice(1) : path;
+      const url = new URL(raw2, window.location.origin);
       const match = matchRoute(this.routeTree, url.pathname);
       if (!match) return;
       match.pathname = url.pathname;
@@ -4182,11 +4278,11 @@ function createRouter(routes, options2 = {}) {
           }
         }
         if (!didUpdate) {
-          const path = window.location.pathname + window.location.search;
+          const path = routeFromLocation(hashMode);
           this.navigate(path, { replace: true });
         }
       } else {
-        const path = window.location.pathname + window.location.search;
+        const path = routeFromLocation(hashMode);
         this.navigate(path, { replace: true });
       }
     }
@@ -4198,6 +4294,7 @@ function createFileRouter(routeTree, options2 = {}) {
   const middleware = options2.middleware || null;
   const renderFn = options2.render || renderMatch;
   const hydrateStrategy = options2.hydrate || "full";
+  const hashMode = options2.hash === true;
   const router = {
     _hydrateStrategy: hydrateStrategy,
     routeTree,
@@ -4210,6 +4307,7 @@ function createFileRouter(routeTree, options2 = {}) {
     _offlineUI: options2.offline ?? null,
     _beforeGuards: [],
     _viewTransitions: options2.viewTransitions === true,
+    _hashMode: hashMode,
     beforeEach(fn) {
       this._beforeGuards.push(fn);
       let active = true;
@@ -4222,7 +4320,7 @@ function createFileRouter(routeTree, options2 = {}) {
       };
     },
     _runGuards(to) {
-      const from = window.location.pathname;
+      const from = get(_state.path) || window.location.pathname;
       for (const g2 of this._beforeGuards ?? []) {
         const d = g2(to, from);
         if (d instanceof Promise) {
@@ -4258,7 +4356,7 @@ function createFileRouter(routeTree, options2 = {}) {
           if (_scrollTimer) return;
           _scrollTimer = setTimeout(() => {
             if (window.scrollY !== void 0) {
-              _scrollPositions.set(window.location.pathname, window.scrollY);
+              _scrollPositions.set(routeKey(hashMode), window.scrollY);
             }
             _scrollTimer = null;
           }, 100);
@@ -4266,9 +4364,19 @@ function createFileRouter(routeTree, options2 = {}) {
         window.addEventListener("scroll", _onScroll, { passive: true });
       }
       window.addEventListener("popstate", () => {
+        const p = routeFromLocation(hashMode);
+        if (get(_state.path) === p) return;
         setIsPopStateNavigation(true);
-        router.navigate(window.location.pathname + window.location.search, { replace: true });
+        router.navigate(p, { replace: true });
       });
+      if (hashMode) {
+        window.addEventListener("hashchange", () => {
+          const p = routeFromLocation(true);
+          if (get(_state.path) === p) return;
+          setIsPopStateNavigation(true);
+          router.navigate(p, { replace: true });
+        });
+      }
       document.addEventListener("click", (e) => {
         const target = e.target;
         if (!target || target.nodeType !== 1) return;
@@ -4282,7 +4390,8 @@ function createFileRouter(routeTree, options2 = {}) {
         if (anchor.hasAttribute("download")) return;
         if (anchor.getAttribute("rel") === "external") return;
         const href = anchor.getAttribute("href");
-        if (!href || href.startsWith("#") || href.startsWith("mailto:") || href.startsWith("tel:") || href.startsWith("javascript:")) return;
+        if (!href || href.startsWith("mailto:") || href.startsWith("tel:") || href.startsWith("javascript:")) return;
+        if (href.startsWith("#") && (!hashMode || !href.startsWith("#/"))) return;
         try {
           const url = new URL(href, window.location.origin);
           if (url.origin !== window.location.origin) return;
@@ -4299,8 +4408,8 @@ function createFileRouter(routeTree, options2 = {}) {
           if (link) router.prefetch(link.getAttribute("href"));
         }, { passive: true });
       }
-      const path = window.location.pathname;
-      if (container.children.length > 0) {
+      const path = routeFromLocation(hashMode).split("?")[0];
+      if (container.children.length > 0 && !hashMode) {
         const match = matchRoute(routeTree, path);
         if (match) {
           match.pathname = path;
@@ -4315,7 +4424,9 @@ function createFileRouter(routeTree, options2 = {}) {
       return router;
     },
     navigate(pathname, opts = {}) {
-      const url = pathname instanceof URL ? pathname : new URL(pathname, window.location.origin);
+      const mode = hashModeOf(router);
+      const raw2 = mode && typeof pathname === "string" && pathname.startsWith("#/") ? pathname.slice(1) : pathname;
+      const url = raw2 instanceof URL ? raw2 : new URL(raw2, window.location.origin);
       const match = matchRoute(routeTree, url.pathname);
       if (!match) {
         const chain = flattenLayoutChain(routeTree, url.pathname.split("/").filter(Boolean));
@@ -4344,7 +4455,7 @@ function createFileRouter(routeTree, options2 = {}) {
       match.pathname = url.pathname;
       const afterGuards = () => {
         if (!_isPopStateNavigation) {
-          _scrollPositions.set(window.location.pathname, window.scrollY);
+          _scrollPositions.set(routeKey(mode), window.scrollY);
         }
         const swapView = (fn) => {
           const d = document;
@@ -4360,10 +4471,11 @@ function createFileRouter(routeTree, options2 = {}) {
         let firstRenderFailed = false;
         const updateUrl = () => {
           const fullUrl = url.pathname + url.search;
+          const target = mode ? fullUrl.startsWith("/") ? "#" + fullUrl : "#" + fullUrl : fullUrl;
           if (!opts.replace) {
-            window.history.pushState({ path: fullUrl }, "", fullUrl);
+            window.history.pushState({ path: fullUrl }, "", target);
           } else {
-            window.history.replaceState({ path: fullUrl }, "", fullUrl);
+            window.history.replaceState({ path: fullUrl }, "", target);
           }
           set(_state.path, url.pathname);
           set(_state.search, url.search.startsWith("?") ? url.search.slice(1) : url.search);
@@ -4541,7 +4653,9 @@ function createFileRouter(routeTree, options2 = {}) {
       afterGuards();
     },
     prefetch(path) {
-      const url = new URL(path, window.location.origin);
+      const mode = hashModeOf(router);
+      const raw2 = mode && typeof path === "string" && path.startsWith("#/") ? path.slice(1) : path;
+      const url = new URL(raw2, window.location.origin);
       const match = matchRoute(routeTree, url.pathname);
       if (!match) return;
       match.pathname = url.pathname;
@@ -4568,7 +4682,7 @@ function createFileRouter(routeTree, options2 = {}) {
       if (typeof router.__updateComponents === "function") {
         router.__updateComponents(router.routeTree);
       }
-      const path = window.location.pathname + window.location.search;
+      const path = routeFromLocation(hashModeOf(router)).split("?")[0];
       const match = matchRoute(router.routeTree, path);
       if (match) {
         match.pathname = path;
@@ -15737,16 +15851,23 @@ function VeskParserPlugin(config = {}) {
         }
         if (this.#componentDepth > 0 && code === 60 && this.#isBlockContext()) {
           const next = this.input.charCodeAt(this.pos + 1);
-          if (next === 47 || next >= 65 && next <= 90 || next >= 97 && next <= 122) {
-            const startsNewStatement = this.hasPrecedingLineBreak();
-            const inType = this.inType;
-            const forceJsx = () => {
-              const savedExprAllowed = this.exprAllowed;
-              this.exprAllowed = true;
-              const result2 = super.readToken(code);
-              this.exprAllowed = savedExprAllowed;
-              return result2;
-            };
+          const startsNewStatement = this.hasPrecedingLineBreak();
+          const inType = this.inType;
+          const forceJsx = () => {
+            const savedExprAllowed = this.exprAllowed;
+            this.exprAllowed = true;
+            const result2 = super.readToken(code);
+            this.exprAllowed = savedExprAllowed;
+            return result2;
+          };
+          const prev = this.type;
+          const canEndExpr = prev === tt.name || prev === tt.num || prev === tt.string || prev === tt.regexp || prev === tt.bracketR || prev === tt.backQuote || prev === tt.template || prev === tt._this || prev === tt._super || prev === tt._true || prev === tt._false || prev === tt._null || prev === tt.jsxTagEnd;
+          const fragmentStart = !inType && next === 62 && startsNewStatement;
+          if (next === 47 || fragmentStart || next >= 65 && next <= 90 || next >= 97 && next <= 122) {
+            if (fragmentStart) {
+              this.#jsxStartsStatement = true;
+              return forceJsx();
+            }
             if (inType) {
               if (startsNewStatement) {
                 if (looksLikeGenericArrowAt(this.input, this.pos) || looksLikeTypeAssertionAt(this.input, this.pos)) {
@@ -15758,8 +15879,6 @@ function VeskParserPlugin(config = {}) {
                 return this.finishToken(tstt.jsxTagStart);
               }
             } else {
-              const prev = this.type;
-              const canEndExpr = prev === tt.name || prev === tt.num || prev === tt.string || prev === tt.regexp || prev === tt.bracketR || prev === tt.backQuote || prev === tt.template || prev === tt._this || prev === tt._super || prev === tt._true || prev === tt._false || prev === tt._null || prev === tt.jsxTagEnd;
               if (!canEndExpr || startsNewStatement) {
                 if (looksLikeGenericArrowAt(this.input, this.pos) || looksLikeTypeAssertionAt(this.input, this.pos)) {
                   this.#jsxStartsStatement = false;
@@ -16474,28 +16593,6 @@ function skipTrackGeneric(text, open) {
   }
   return text.length;
 }
-function cssBlockEnd(css, start) {
-  let depth = 0;
-  let i = start;
-  while (i < css.length) {
-    const c = css[i];
-    if (c === '"' || c === "'") {
-      i = skipString(css, i);
-      continue;
-    }
-    if (c === "/" && css[i + 1] === "*") {
-      i = skipComment(css, i);
-      continue;
-    }
-    if (c === "{") depth++;
-    else if (c === "}") {
-      depth--;
-      if (depth === 0) return i + 1;
-    }
-    i++;
-  }
-  return css.length;
-}
 function htmlTagEnd(html, lt) {
   let i = lt + 1;
   while (i < html.length) {
@@ -16536,6 +16633,19 @@ function isIdentChar2(code) {
 function isWhitespaceChar2(ch) {
   return ch === " " || ch === "	" || ch === "\n" || ch === "\r" || ch === "\f" || ch === "\v" || ch === "\xA0" || ch === "\uFEFF";
 }
+function offsetToLineCol(source, offset2) {
+  let line = 1;
+  let column = 1;
+  for (let i = 0; i < offset2 && i < source.length; i++) {
+    if (source.charCodeAt(i) === 10) {
+      line++;
+      column = 1;
+    } else {
+      column++;
+    }
+  }
+  return { line, column };
+}
 function preprocessForClauses(source) {
   const annotations = [];
   const chars = source.split("");
@@ -16678,6 +16788,21 @@ function preprocessForClauses(source) {
               while (k < end && isWhitespaceChar2(source[k])) k++;
               const expr = source.slice(k, end).trim();
               if (expr) {
+                if (expr[0] === ":") {
+                  const { line, column } = offsetToLineCol(source, start);
+                  throw new VeskError(
+                    `Invalid \`; key\` clause \u2014 write the key expression after \`key\` without a colon: \`key ${expr.slice(1).trim()}\`.`,
+                    {
+                      line,
+                      column,
+                      code: codeFrame(source, line, column),
+                      nextSteps: [
+                        "Use `; key <expr>` (no colon), e.g. `for (const item of items; key item.id)`.",
+                        "For the iteration index use `; index <name>`, e.g. `for (const item of items; key item.id; index i)`."
+                      ]
+                    }
+                  );
+                }
                 keyRange = [k, start + clause.length];
                 clauseCode = " ".repeat(clause.length);
               }
@@ -17432,10 +17557,16 @@ function loadSsrModule(absPath) {
         exportsObj = null;
       }
     } else {
-      exportsObj = {};
-      EVALUATING.set(absPath, exportsObj);
-      const ran = evaluateModuleFile(absPath, exportsObj);
-      if (!ran) exportsObj = null;
+      const src2 = readSsrSource(absPath);
+      const body = src2?.ast?.body || [];
+      if (src2 && isPureReexportBarrel(body)) {
+        exportsObj = createLazyBarrelExports(buildBarrelSpec(body), dirname2(absPath));
+      } else {
+        exportsObj = {};
+        EVALUATING.set(absPath, exportsObj);
+        const ran = evaluateModuleFile(absPath, exportsObj, src2);
+        if (!ran) exportsObj = null;
+      }
     }
     if (exportsObj === null) {
       exportsObj = nativeRequireFallback(absPath);
@@ -17469,13 +17600,13 @@ function depsFresh(cachedVal) {
   }
   return true;
 }
-function evaluateModuleFile(absPath, exportsObj) {
+function readSsrSource(absPath) {
   let raw2;
   try {
     raw2 = readFileSync(absPath, "utf-8");
   } catch (err) {
     console.warn(`[vesk] SSR: failed to read ${absPath}: ${err?.message ?? String(err)}`);
-    return false;
+    return null;
   }
   let ast = null;
   try {
@@ -17483,6 +17614,164 @@ function evaluateModuleFile(absPath, exportsObj) {
   } catch {
     ast = null;
   }
+  return { raw: raw2, ast };
+}
+function isPureReexportBarrel(body) {
+  for (const stmt of body) {
+    if (stmt.type === "EmptyStatement") continue;
+    if (stmt.type === "ExpressionStatement") {
+      const expr = stmt.expression;
+      if (expr && expr.type === "Literal" && typeof expr.value === "string" && expr.value.length > 0) continue;
+      return false;
+    }
+    if (stmt.type === "ExportAllDeclaration") {
+      if (stmt.exportKind === "type") continue;
+      continue;
+    }
+    if (stmt.type === "ExportNamedDeclaration") {
+      if (stmt.exportKind === "type") continue;
+      if (stmt.source) continue;
+      return false;
+    }
+    if (stmt.type === "ImportDeclaration" && stmt.importKind === "type") continue;
+    return false;
+  }
+  return true;
+}
+function buildBarrelSpec(body) {
+  const spec = { direct: /* @__PURE__ */ new Map(), namespaces: /* @__PURE__ */ new Map(), stars: [] };
+  for (const stmt of body) {
+    if (stmt.type === "ExportNamedDeclaration") {
+      if (stmt.exportKind === "type" || !stmt.source) continue;
+      const source = quotedSourceValue(stmt.source);
+      const specifiers = stmt.specifiers || [];
+      for (const ex of specifiers) {
+        if (ex.exportKind === "type") continue;
+        const imported = exportKeyName(ex.local);
+        const exported = exportKeyName(ex.exported);
+        if (!exported || !imported) continue;
+        if (source !== null) spec.direct.set(exported, { source, imported });
+      }
+    } else if (stmt.type === "ExportAllDeclaration") {
+      if (stmt.exportKind === "type") continue;
+      const source = quotedSourceValue(stmt.source);
+      if (stmt.exported) {
+        const nsName = exportKeyName(stmt.exported);
+        if (source !== null && nsName) spec.namespaces.set(nsName, source);
+      } else if (source !== null) {
+        spec.stars.push(source);
+      }
+    }
+  }
+  return spec;
+}
+function quotedSourceValue(node) {
+  const n = node;
+  if (n && (n.type === "Literal" || n.type === "StringLiteral") && typeof n.value === "string") {
+    return n.value;
+  }
+  const printed = printNode(node);
+  return printed ? stripOuterQuotes(printed) : null;
+}
+function createLazyBarrelExports(spec, dir) {
+  const targets = /* @__PURE__ */ new Map();
+  const starKeys = /* @__PURE__ */ new Set();
+  let starsEnumerated = false;
+  const loadSource = (source) => {
+    let target = targets.get(source);
+    if (!target) {
+      target = resolveSsrModule(source, dir) ?? "";
+      if (!target) return null;
+      targets.set(source, target);
+    }
+    const mod = loadSsrModule(target);
+    return mod && typeof mod === "object" ? mod : null;
+  };
+  const hasPresent = (prop) => {
+    if (spec.direct.has(prop) || spec.namespaces.has(prop)) return true;
+    if (starsEnumerated && starKeys.has(prop)) return true;
+    if (prop === "default") return false;
+    for (const source of spec.stars) {
+      const mod = loadSource(source);
+      if (mod && Object.prototype.hasOwnProperty.call(mod, prop)) return true;
+    }
+    return false;
+  };
+  const getNamed = (prop) => {
+    const direct = spec.direct.get(prop);
+    if (direct) {
+      const mod = loadSource(direct.source);
+      if (!mod) return void 0;
+      return mod[direct.imported];
+    }
+    const nsSource = spec.namespaces.get(prop);
+    if (nsSource) {
+      return loadSource(nsSource) ?? void 0;
+    }
+    if (prop === "default") return void 0;
+    for (const source of spec.stars) {
+      const mod = loadSource(source);
+      if (mod && Object.prototype.hasOwnProperty.call(mod, prop)) {
+        return mod[prop];
+      }
+    }
+    return void 0;
+  };
+  return new Proxy(/* @__PURE__ */ Object.create(null), {
+    get(_target, prop) {
+      if (typeof prop === "symbol") return void 0;
+      return getNamed(prop);
+    },
+    has(_target, prop) {
+      if (typeof prop === "symbol") return false;
+      return hasPresent(prop);
+    },
+    ownKeys() {
+      if (!starsEnumerated) {
+        for (const source of spec.stars) {
+          const mod = loadSource(source);
+          if (!mod) continue;
+          for (const k of Reflect.ownKeys(mod)) {
+            if (typeof k === "string" && k !== "default") starKeys.add(k);
+          }
+        }
+        starsEnumerated = true;
+      }
+      return [.../* @__PURE__ */ new Set([...spec.direct.keys(), ...spec.namespaces.keys(), ...starKeys])];
+    },
+    getOwnPropertyDescriptor(_target, prop) {
+      if (typeof prop === "symbol") return void 0;
+      if (!hasPresent(prop)) return void 0;
+      return {
+        enumerable: true,
+        configurable: true,
+        get: () => getNamed(prop)
+      };
+    }
+  });
+}
+function evaluateModuleFile(absPath, exportsObj, src2) {
+  let raw2;
+  if (src2) {
+    raw2 = src2.raw;
+  } else {
+    try {
+      raw2 = readFileSync(absPath, "utf-8");
+    } catch (err) {
+      console.warn(`[vesk] SSR: failed to read ${absPath}: ${err?.message ?? String(err)}`);
+      return false;
+    }
+  }
+  let ast;
+  if (src2) {
+    ast = src2.ast;
+  } else {
+    try {
+      ast = parse4(raw2, { filename: absPath });
+    } catch {
+      ast = null;
+    }
+  }
   if (!ast) {
     try {
       const fn = new Function("require", "module", "exports", "__dirname", "__filename", raw2);
@@ -17561,7 +17850,9 @@ function createModuleRequire(fromDir) {
 }
 function resolveSsrModule(specifier, fromDir) {
   let resolved = null;
-  if (specifier === "." || specifier === ".." || isAbsolute(specifier)) {
+  if (specifier === "." || specifier === "..") {
+    resolved = probeFile(resolve2(fromDir, specifier));
+  } else if (isAbsolute(specifier)) {
     resolved = probeFile(resolve2(specifier));
   } else if (specifier.startsWith("./") || specifier.startsWith("../")) {
     resolved = probeFile(resolve2(fromDir, specifier));
@@ -17864,7 +18155,7 @@ function collectComponentCalls(nodes, out) {
     }
   }
 }
-function offsetToLineCol(source, offset2) {
+function offsetToLineCol2(source, offset2) {
   let line = 1;
   let column = 1;
   for (let i = 0; i < offset2 && i < source.length; i++) {
@@ -18573,7 +18864,7 @@ function processStatementModeBody(source, bodyStmts, filename) {
         if (raw2) nodes.push(new RuntimeStatement(raw2, stmt, source));
       }
     } else if (stmt.type === "ClassDeclaration") {
-      const { line, column } = offsetToLineCol(source, stmt.start ?? 0);
+      const { line, column } = offsetToLineCol2(source, stmt.start ?? 0);
       throw VeskError.classDecl({ file: filename || "", line, column, code: codeFrame(source, line, column) });
     } else {
       const raw2 = getSource(source, stmt);
@@ -18605,7 +18896,7 @@ function validateBlocks(compName, isClient, body, file, source) {
         const opts = file ? { file } : {};
         if (source && node.start !== void 0) {
           const pos = node.start;
-          const { line, column } = offsetToLineCol(source, pos);
+          const { line, column } = offsetToLineCol2(source, pos);
           opts.line = line;
           opts.column = column;
           opts.code = codeFrame(source, line, column);
@@ -18617,7 +18908,7 @@ function validateBlocks(compName, isClient, body, file, source) {
         const opts = file ? { file } : {};
         if (source && node.start !== void 0) {
           const pos = node.start;
-          const { line, column } = offsetToLineCol(source, pos);
+          const { line, column } = offsetToLineCol2(source, pos);
           opts.line = line;
           opts.column = column;
           opts.code = codeFrame(source, line, column);
@@ -18723,7 +19014,7 @@ function generateIR(ast, source, filename) {
     }
     if (inner.type === "ComponentDeclaration") {
     } else if (inner.type === "ClassDeclaration") {
-      const { line, column } = offsetToLineCol(source, inner.start ?? 0);
+      const { line, column } = offsetToLineCol2(source, inner.start ?? 0);
       throw VeskError.classDecl({ file, line, column, code: codeFrame(source, line, column) });
     } else if (inner.type === "TSEnumDeclaration") {
       const code = processEnum(inner, source, exported);
@@ -18770,7 +19061,7 @@ function generateIR(ast, source, filename) {
         } else if (stmt.type === "IfStatement" && !mainReturn && stmt.consequent.type !== "ThrowStatement") {
           guardClauses.push(stmt);
         } else if (stmt.type === "ClassDeclaration") {
-          const { line, column } = offsetToLineCol(source, stmt.start ?? 0);
+          const { line, column } = offsetToLineCol2(source, stmt.start ?? 0);
           throw VeskError.classDecl({ file, line, column, code: codeFrame(source, line, column) });
         } else {
           const raw2 = getSource(source, stmt);
@@ -18792,7 +19083,7 @@ function generateIR(ast, source, filename) {
     collectComponentCalls(comp.body, called);
     for (const [childName, start] of called) {
       if (!asyncNames.has(childName)) continue;
-      const { line, column } = offsetToLineCol(source, start >= 0 ? start : 0);
+      const { line, column } = offsetToLineCol2(source, start >= 0 ? start : 0);
       throw VeskError.asyncChildInSyncParent(comp.name, childName, { file, line, column, code: codeFrame(source, line, column) });
     }
   }
@@ -18845,7 +19136,11 @@ function generateIR(ast, source, filename) {
     "getAction",
     "validateActionInput",
     "issuesToFieldMap",
-    "isFormAction"
+    "isFormAction",
+    "Show",
+    "For",
+    "Switch",
+    "Match"
   ];
   const usedFunctions = /* @__PURE__ */ new Set();
   const addUsedFrom = (code) => {
@@ -18863,6 +19158,30 @@ function generateIR(ast, source, filename) {
       if (node instanceof RuntimeStatement && node.raw) {
         addUsedFrom(node.raw);
       }
+      if (node instanceof TrackDecl && node.init) {
+        addUsedFrom(node.init);
+      }
+      if (node instanceof ForLoop) {
+        if (node.init) addUsedFrom(node.init);
+        if (node.update) addUsedFrom(node.update);
+        if (node.condition && node.condition.raw) addUsedFrom(node.condition.raw);
+        scanForAutoImport(node.bodyTemplate);
+      }
+      if (node instanceof WhileLoop) {
+        if (node.condition && node.condition.raw) addUsedFrom(node.condition.raw);
+        scanForAutoImport(node.bodyTemplate);
+      }
+      if (node instanceof SwitchBlock) {
+        if (node.discriminant && node.discriminant.raw) addUsedFrom(node.discriminant.raw);
+        for (const c of node.cases) {
+          if (c.test && c.test.raw) addUsedFrom(c.test.raw);
+          scanForAutoImport(c.body);
+        }
+      }
+      if (node instanceof TryCatch) {
+        scanForAutoImport(node.bodyTemplate);
+        scanForAutoImport(node.catchBody);
+      }
       if (node instanceof ComponentCall) {
         if (autoImportable.includes(node.componentName)) {
           usedFunctions.add(node.componentName);
@@ -26716,6 +27035,17 @@ function collectTrackedNames(body) {
   }
   return names;
 }
+function transformTrackedInit(init, tracked2) {
+  if (!init) return init;
+  let expr = null;
+  try {
+    const prog = parse4(`(${init})`);
+    expr = prog.body?.[0]?.type === "ExpressionStatement" ? prog.body[0].expression ?? null : null;
+  } catch {
+  }
+  if (!expr) return init;
+  return transformTracked({ raw: init, ast: expr }, tracked2);
+}
 function indent2(code, level = 1) {
   const pad = "	".repeat(level);
   return code.split("\n").map((l) => l ? pad + l : "").join("\n");
@@ -26731,7 +27061,7 @@ function emitNode(ctx2, node, tracked2, effectsVar, parentVar, compPrefix = "__c
   if (node instanceof DynamicBinding) return emitDynamicBinding(ctx2, node, tracked2, effectsVar);
   if (node instanceof TrackDecl) {
     const cellName = node.rawName || node.name;
-    const init = stripTrackGeneric(node.init);
+    const init = transformTrackedInit(stripTrackGeneric(node.init), tracked2);
     ctx2.push(`const ${cellName} = ${init};`);
     return null;
   }
@@ -26992,6 +27322,9 @@ function emitComponentCall(ctx2, node, tracked2, effectsVar, parentVar, compPref
       ctx2.push(`const ${frag} = (() => { const $f = document.createDocumentFragment();`);
       const savedWalker = ctx2.walker;
       const savedEffects = ctx2.effects;
+      const wipeMount = ctx2.linkNames.has(node.componentName);
+      const savedHydrate = ctx2.hydrate;
+      if (wipeMount) ctx2.hydrate = false;
       ctx2.walker = walkerVar;
       ctx2.effects = [];
       for (const child of node.children) {
@@ -27001,6 +27334,7 @@ function emitComponentCall(ctx2, node, tracked2, effectsVar, parentVar, compPref
       for (const eff of ctx2.effects) ctx2.push(effectsVar ? `${effectsVar}.push(${effectBlockToHandlerExpr(eff)});` : eff);
       ctx2.effects = savedEffects;
       ctx2.walker = savedWalker;
+      ctx2.hydrate = savedHydrate;
       ctx2.push(`return $f; })();`);
       propsEntries.push(`children: ${frag}`);
       ctx2.push(`const ${v} = ${awaitKw}${access}({ ${propsEntries.join(", ")} }, __registry, ${walkerVar});`);
@@ -27060,7 +27394,7 @@ function emitTryCatch(ctx2, node, tracked2, effectsVar, parentVar) {
       ctx2.push(indent2(`const __cl = [];`));
     }
     for (const child of body) {
-      const childVar = emitNode(ctx2, child, tracked2, isCatch ? null : effArr, void 0, compPrefix);
+      const childVar = emitNode(ctx2, child, tracked2, isCatch ? null : effArr, hydMode ? void 0 : "__p", compPrefix);
       if (childVar) {
         if (hydMode) ctx2.push(indent2(`__cl.push(${childVar});`));
         else ctx2.push(indent2(`__p.insertBefore(${childVar}, ${endAnchor});`));
@@ -27159,7 +27493,7 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar) {
   ctx2.push(`if (${condExpr}) { ${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; return; }
+      if (__first) { __first = false; __iv = ${condExpr}; return; }
       const __nv = ${condExpr};
       if (__nv !== __iv) {
         for (const e of ${effectsVar}) destroy_block(e);
@@ -27169,6 +27503,7 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar) {
         __iv = __nv;
       }
     });`;
+  if (!isReactiveExpression(node.condition, tracked2)) return null;
   if (effTarget) {
     ctx2.push(`${effTarget}.push((() => {
     let __iv = ${condExpr};
@@ -27198,28 +27533,30 @@ function emitWhileLoop(ctx2, node, tracked2, parentVar) {
   const renderLoop = ctx2.n();
   ctx2.push(`const ${renderLoop} = ${ctx2.isAsyncScope ? "async () => {" : "() => {"}`);
   if (!hyd) ctx2.push(indent2(`const __p = ${anchor}.parentNode;`));
+  if (!hyd) ctx2.push(indent2(`const __b = document.createDocumentFragment();`));
   if (hyd) ctx2.push(indent2(`const __cl = [];`));
   if (node.isDoWhile) {
     ctx2.push(indent2(`do {`));
     for (const n of node.bodyTemplate) {
-      const v = emitNode(ctx2, n, tracked2, effectsVar, hyd ? parentVar : void 0);
+      const v = emitNode(ctx2, n, tracked2, effectsVar, hyd ? parentVar : "__b");
       if (v) {
         if (hyd) ctx2.push(indent2(`__cl.push(${v});`));
-        else ctx2.push(indent2(`__p.insertBefore(${v}, ${endAnchor});`));
+        else ctx2.push(indent2(`__b.appendChild(${v});`));
       }
     }
     ctx2.push(indent2(`} while (${condExpr});`));
   } else {
     ctx2.push(indent2(`while (${condExpr}) {`));
     for (const n of node.bodyTemplate) {
-      const v = emitNode(ctx2, n, tracked2, effectsVar, hyd ? parentVar : void 0);
+      const v = emitNode(ctx2, n, tracked2, effectsVar, hyd ? parentVar : "__b");
       if (v) {
         if (hyd) ctx2.push(indent2(`__cl.push(${v});`));
-        else ctx2.push(indent2(`__p.insertBefore(${v}, ${endAnchor});`));
+        else ctx2.push(indent2(`__b.appendChild(${v});`));
       }
     }
     ctx2.push(indent2(`}`));
   }
+  if (!hyd) ctx2.push(indent2(`__p.insertBefore(__b, ${endAnchor});`));
   if (hyd) ctx2.push(indent2(`__place(${anchor}, ${endAnchor}, __cl, ${parent});`));
   ctx2.push(`};`);
   if (!hyd) ctx2.push(`${parent}.appendChild(${endAnchor});`);
@@ -27229,7 +27566,7 @@ function emitWhileLoop(ctx2, node, tracked2, parentVar) {
   let __iv = (${condExpr});
   let __first = true;
   effect(${ctx2.isAsyncScope ? "async () => {" : "() => {"}
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __iv = (${condExpr}); return; }
     if (__busy) return;
     const __nv = (${condExpr});
     if (__nv !== __iv) {
@@ -27258,44 +27595,52 @@ function emitForLoop(ctx2, node, tracked2, parentVar) {
   const renderLoop = ctx2.n();
   ctx2.push(`const ${renderLoop} = ${ctx2.isAsyncScope ? "async () => {" : "() => {"}`);
   if (!hyd) ctx2.push(indent2(`const __p = ${anchor}.parentNode;`));
+  if (!hyd) ctx2.push(indent2(`const __b = document.createDocumentFragment();`));
   if (hyd) ctx2.push(indent2(`const __cl = [];`));
   if (node.kind === "for-in") {
     const srcExpr = transformTracked(node.condition, tracked2);
     ctx2.push(indent2(`for (${node.init} of (Array.isArray(${srcExpr}) ? ${srcExpr} : (${srcExpr} == null ? [] : Object.keys(${srcExpr})))) {`));
     for (const n of node.bodyTemplate) {
-      const v = emitNode(ctx2, n, tracked2, effectsVar, hyd ? parentVar : void 0);
+      const v = emitNode(ctx2, n, tracked2, effectsVar, hyd ? parentVar : "__b");
       if (v) {
         if (hyd) ctx2.push(indent2(`__cl.push(${v});`));
-        else ctx2.push(indent2(`__p.insertBefore(${v}, ${endAnchor});`));
+        else ctx2.push(indent2(`__b.appendChild(${v});`));
       }
     }
     ctx2.push(indent2(`}`));
   } else {
     const condExpr = transformTracked(node.condition, tracked2);
-    if (node.init) ctx2.push(indent2(`${node.init}`));
-    ctx2.push(indent2(`while (${condExpr}) {`));
+    let initPart = (node.init || "").trim();
+    let updatePart = (node.update || "").trim();
+    if (initPart.endsWith(";")) initPart = initPart.slice(0, -1).trim();
+    if (updatePart.endsWith(";")) updatePart = updatePart.slice(0, -1).trim();
+    const head = initPart ? `${initPart}; ${condExpr}` : `; ${condExpr}`;
+    ctx2.push(indent2(`for (${head}; ${updatePart}) {`));
     for (const n of node.bodyTemplate) {
-      const v = emitNode(ctx2, n, tracked2, effectsVar, hyd ? parentVar : void 0);
+      const v = emitNode(ctx2, n, tracked2, effectsVar, hyd ? parentVar : "__b");
       if (v) {
         if (hyd) ctx2.push(indent2(`__cl.push(${v});`));
-        else ctx2.push(indent2(`__p.insertBefore(${v}, ${endAnchor});`));
+        else ctx2.push(indent2(`__b.appendChild(${v});`));
       }
     }
-    if (node.update) ctx2.push(indent2(`${node.update}`));
     ctx2.push(indent2(`}`));
   }
+  if (!hyd) ctx2.push(indent2(`__p.insertBefore(__b, ${endAnchor});`));
   if (hyd) ctx2.push(indent2(`__place(${anchor}, ${endAnchor}, __cl, ${parent});`));
   ctx2.push(`};`);
   if (!hyd) ctx2.push(`${parent}.appendChild(${endAnchor});`);
   ctx2.push(`${ctx2.isAsyncScope ? "await " : ""}${renderLoop}();`);
   if (node.kind === "for-in") {
     const srcExpr = transformTracked(node.condition, tracked2);
+    if (!isReactiveExpression(node.condition, tracked2)) {
+      return null;
+    }
     ctx2.effects.push(`{
   let __busy = false;
   let __iv = undefined;
   let __first = true;
   effect(${ctx2.isAsyncScope ? "async () => {" : "() => {"}
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __iv = (${srcExpr}); return; }
     if (__busy) return;
     const __nv = (${srcExpr});
     if (__nv !== __iv) {
@@ -27326,8 +27671,12 @@ function emitSwitchBlock(ctx2, node, tracked2, parentVar) {
   ctx2.push(`const ${endAnchor} = document.createComment('switch-end');`);
   const renderSwitch = ctx2.n();
   ctx2.push(`const ${renderSwitch} = ${ctx2.isAsyncScope ? "async () => {" : "() => {"}`);
-  if (!hyd) ctx2.push(indent2(`const __p = ${anchor}.parentNode;`));
-  if (hyd) ctx2.push(indent2(`const __cl = [];`));
+  if (hyd) {
+    ctx2.push(indent2(`const __cl = [];`));
+  } else {
+    ctx2.push(indent2(`const __p = ${anchor}.parentNode;`));
+    ctx2.push(indent2(`const __c = document.createDocumentFragment();`));
+  }
   ctx2.push(indent2(`switch (${discExpr}) {`));
   for (const c of node.cases) {
     if (c.test) {
@@ -27336,15 +27685,16 @@ function emitSwitchBlock(ctx2, node, tracked2, parentVar) {
       ctx2.push(indent2(`default:`));
     }
     for (const n of c.body) {
-      const v = emitNode(ctx2, n, tracked2, effectsVar, hyd ? parentVar : void 0);
+      const v = emitNode(ctx2, n, tracked2, effectsVar, hyd ? parentVar : "__c");
       if (v) {
         if (hyd) ctx2.push(indent2(`__cl.push(${v});`));
-        else ctx2.push(indent2(`__p.insertBefore(${v}, ${endAnchor});`));
+        else ctx2.push(indent2(`__c.appendChild(${v});`));
       }
     }
     ctx2.push(indent2(`break;`));
   }
   ctx2.push(indent2(`}`));
+  if (!hyd) ctx2.push(indent2(`__p.insertBefore(__c, ${endAnchor});`));
   if (hyd) ctx2.push(indent2(`__place(${anchor}, ${endAnchor}, __cl, ${parent});`));
   ctx2.push(`};`);
   if (!hyd) ctx2.push(`${parent}.appendChild(${endAnchor});`);
@@ -27354,7 +27704,7 @@ function emitSwitchBlock(ctx2, node, tracked2, parentVar) {
   let __iv = (${discExpr});
   let __first = true;
   effect(${ctx2.isAsyncScope ? "async () => {" : "() => {"}
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __iv = (${discExpr}); return; }
     if (__busy) return;
     const __nv = (${discExpr});
     if (__nv !== __iv) {
@@ -27381,6 +27731,7 @@ function emitMap(ctx2, node, tracked2, parentVar) {
   const keyed = !!node.keyExpr;
   const hyd = ctx2.hydrate && !keyed;
   const parent = parentVar || "$root";
+  const reactiveSource = isReactiveExpression(node.expression, tracked2);
   ctx2.push(`const ${anchor} = document.createComment('map');`);
   if (!hyd) ctx2.push(`${parent}.appendChild(${anchor});`);
   ctx2.push(`let ${effectsVar} = [];`);
@@ -27390,14 +27741,20 @@ function emitMap(ctx2, node, tracked2, parentVar) {
   ctx2.push(`const ${renderItem} = ${ctx2.isAsyncScope ? "async " : ""}(${itemVar}${indexParam}, __e, __r${hyd ? ", __cl" : ""}) => {`);
   ctx2.push(indent2(`__r = __r || ${endAnchor};`));
   if (node.indexVariable) ctx2.push(indent2(`const ${node.indexVariable} = __i;`));
-  ctx2.push(indent2(`const __p = ${anchor}.parentNode;`));
+  if (hyd) {
+    ctx2.push(indent2(`const __p = ${anchor}.parentNode;`));
+  } else {
+    ctx2.push(indent2(`const __p = ${anchor}.parentNode;`));
+    ctx2.push(indent2(`const __it = document.createDocumentFragment();`));
+  }
   for (const n of node.bodyTemplate) {
-    const v = emitNode(ctx2, n, tracked2, "__e");
+    const v = emitNode(ctx2, n, tracked2, "__e", hyd ? void 0 : "__it");
     if (v) {
       if (hyd) ctx2.push(indent2(`if (__cl) __cl.push(${v}); else __p.insertBefore(${v}, __r);`));
-      else ctx2.push(indent2(`__p.insertBefore(${v}, __r);`));
+      else ctx2.push(indent2(`__it.appendChild(${v});`));
     }
   }
+  if (!hyd) ctx2.push(indent2(`__p.insertBefore(__it, __r);`));
   ctx2.push(`};`);
   let emptyRenderName = null;
   if (node.alternateNodes.length > 0) {
@@ -27433,11 +27790,12 @@ function emitMap(ctx2, node, tracked2, parentVar) {
       const isEmptyVar = ctx2.n();
       ctx2.push(`let ${isEmptyVar} = !${hasItems}();`);
       ctx2.push(`if (!${isEmptyVar}) { ${initList}(); } else { ${aw}${emptyRenderName}(); }`);
+      if (!reactiveSource) return null;
       ctx2.effects.push(`{
   let __first = true;
   effect(${effOpen}
     const __new = ${hasItems}();
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __new; return; }
     if (__new !== ${isEmptyVar}) {
       if (__new) ${reconciler}(${arrExpr});
       return;
@@ -27451,11 +27809,12 @@ function emitMap(ctx2, node, tracked2, parentVar) {
 }`);
     } else {
       ctx2.push(`${initList}();`);
+      if (!reactiveSource) return null;
       ctx2.effects.push(`{
   let __first = true;
   effect(() => {
     const __nv = ${arrExpr};
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __nv; ${reconciler}(${arrExpr}); return; }
     ${reconciler}(${arrExpr});
   });
 }`);
@@ -27485,11 +27844,12 @@ function emitMap(ctx2, node, tracked2, parentVar) {
       ctx2.push(indent2(renderAllItems("", collectVar)));
       ctx2.push(indent2(`} else { ${aw}${emptyRenderName}(${collectVar ? collectVar : ""}); }`));
       if (collectVar) ctx2.push(`__place(${anchor}, ${endAnchor}, ${collectVar}, ${parent});`);
+      if (!reactiveSource) return null;
       ctx2.effects.push(`{
   let __first = true;
   effect(${effOpen}
     const __new = ${hasItems}();
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __new; return; }
     if (__new !== ${isEmptyVar}) {
       if (__new) {
         for (const e of ${effectsVar}) destroy_block(e);
@@ -27513,11 +27873,12 @@ ${renderAllItems("      ", null)}
       if (collectVar) ctx2.push(`const ${collectVar} = [];`);
       ctx2.push(renderAllItems("", collectVar));
       if (collectVar) ctx2.push(`__place(${anchor}, ${endAnchor}, ${collectVar}, ${parent});`);
+      if (!reactiveSource) return null;
       ctx2.effects.push(`{
   let __first = true;
   effect(${effOpen}
     const __nv = ${arrExpr};
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __nv; return; }
     for (const e of ${effectsVar}) destroy_block(e);
     ${effectsVar}.length = 0;
     __cleanup(${anchor}, ${endAnchor});
@@ -27531,10 +27892,11 @@ ${renderAllItems("    ", null)}
 function computeAsyncComponents(comps) {
   return new Set(comps.filter((c) => c.isAsync).map((c) => c.name));
 }
-function generateComponent(comp, importedNames = /* @__PURE__ */ new Set(), hydrate = false, asyncComps = /* @__PURE__ */ new Set()) {
+function generateComponent(comp, importedNames = /* @__PURE__ */ new Set(), hydrate = false, asyncComps = /* @__PURE__ */ new Set(), linkNames = /* @__PURE__ */ new Set()) {
   const tracked2 = collectTrackedNames(comp.body);
   const ctx2 = new Ctx();
   ctx2.importedNames = importedNames;
+  ctx2.linkNames = linkNames;
   ctx2.hydrate = hydrate;
   ctx2.asyncComps = asyncComps;
   ctx2.isAsyncScope = comp.isAsync || asyncComps.has(comp.name);
@@ -27561,7 +27923,7 @@ function generateComponent(comp, importedNames = /* @__PURE__ */ new Set(), hydr
     const v = emitNode(ctx2, node, tracked2, null);
     if (v) {
       if (ctx2.hydrate) {
-        ctx2.push(indent2(`if (${v}.parentNode !== $root) $root.appendChild(${v});`));
+        ctx2.push(indent2(`if (${v}.parentNode !== $root) { if (!$root || ${v}.parentNode == null || !$root.contains(${v})) $root.appendChild(${v}); }`));
       } else {
         ctx2.push(indent2(`$root.appendChild(${v});`));
       }
@@ -27587,6 +27949,12 @@ function buildComponentMap(irRoot, hydrate = false) {
   const mapLines = [];
   mapLines.push(`const __components = {};`);
   const asyncComps = computeAsyncComponents(irRoot.components);
+  const linkNames = /* @__PURE__ */ new Set();
+  for (const imp of irRoot.imports) {
+    for (const pair of importBindingPairs(imp)) {
+      if (pair.imported === "Link" || pair.imported === "NavLink") linkNames.add(pair.local);
+    }
+  }
   const componentNames = new Set(irRoot.components.map((c) => c.name));
   const topValueNames = extractTopLevelNames(irRoot.topLevelCode).filter((n) => !componentNames.has(n));
   const directNames = /* @__PURE__ */ new Set([...extractRuntimeNames(irRoot.imports), ...localValueImportNames(irRoot.imports), ...topValueNames]);
@@ -27596,7 +27964,7 @@ function buildComponentMap(irRoot, hydrate = false) {
       mapLines.push(`__components[${JSON.stringify(comp.name)}] = ${stub};`);
       continue;
     }
-    const code = generateComponent(comp, directNames, hydrate, asyncComps);
+    const code = generateComponent(comp, directNames, hydrate, asyncComps, linkNames);
     mapLines.push(`__components[${JSON.stringify(comp.name)}] = ${code};`);
   }
   mapLines.push(`function __cleanup(start, end) {`);
@@ -27893,6 +28261,7 @@ var init_client_codegen = __esm({
       effects = [];
       c = 0;
       importedNames = /* @__PURE__ */ new Set();
+      linkNames = /* @__PURE__ */ new Set();
       delegatedEvents = /* @__PURE__ */ new Set();
       directEvents = /* @__PURE__ */ new Set();
       hydrate = false;
@@ -27970,8 +28339,9 @@ function irNodeToJS(node, importedNames, isAsync = false, tracked2) {
   if (node instanceof ForLoop) return forLoopToJS(node, isAsync, tracked2);
   if (node instanceof TrackDecl) {
     const cellName = node.rawName || node.name;
-    const unwrapped = unwrapTrackCall(node.init);
-    const inner = hasTopLevelComma(unwrapped) ? stripTrackGeneric(node.init) : unwrapped;
+    const init = transformTrackedInit(node.init, tracked2 || /* @__PURE__ */ new Map());
+    const unwrapped = unwrapTrackCall(init);
+    const inner = hasTopLevelComma(unwrapped) ? stripTrackGeneric(init) : unwrapped;
     const key = JSON.stringify(`${compKey(node)}:${node.name}`);
     return [
       `const ${cellName} = (() => {`,
@@ -28210,13 +28580,17 @@ function forLoopToJS(node, isAsync = false, tracked2) {
     }
     lines.push(`}`);
   } else {
-    if (node.init) lines.push(`${node.init}`);
-    lines.push(`while (${exprJSX(node.condition, tracked2)}) {`);
+    let initPart = (node.init || "").trim();
+    let updatePart = (node.update || "").trim();
+    if (initPart.endsWith(";")) initPart = initPart.slice(0, -1).trim();
+    if (updatePart.endsWith(";")) updatePart = updatePart.slice(0, -1).trim();
+    const cond = exprJSX(node.condition, tracked2);
+    const head = initPart ? `${initPart}; ${cond}` : `; ${cond}`;
+    lines.push(`for (${head}; ${updatePart}) {`);
     for (const n of node.bodyTemplate) {
       const code = irNodeToJS(n, null, isAsync, tracked2);
       if (code) lines.push(indent(code));
     }
-    if (node.update) lines.push(indent(`${node.update}`));
     lines.push(`}`);
   }
   return lines.join("\n");
@@ -35048,7 +35422,7 @@ __export(typecheck_exports, {
   typecheckProject: () => typecheckProject
 });
 import { readFileSync as readFileSync34, readdirSync as readdirSync14, statSync as statSync22 } from "node:fs";
-import { join as join22, dirname as dirname22, normalize, relative as relative7, resolve as resolve37, sep as sep7 } from "node:path";
+import { join as join21, dirname as dirname22, normalize, relative as relative7, resolve as resolve37, sep as sep7 } from "node:path";
 import * as ts8 from "typescript";
 function walkProjectFiles(projectRoot) {
   const code = [];
@@ -35061,7 +35435,7 @@ function walkProjectFiles(projectRoot) {
       return;
     }
     for (const e of entries) {
-      const p = join22(dir, e);
+      const p = join21(dir, e);
       let st;
       try {
         st = statSync22(p);
@@ -35116,8 +35490,8 @@ function checkStructureFile(appDir, file) {
   return null;
 }
 function createTypecheckHost(projectRoot, appDir, vskFiles) {
-  const ambientPath = join22(appDir, "__vesk_ambient.d.ts");
-  const overridePath = join22(appDir, "__vesk_runtime_override.d.ts");
+  const ambientPath = join21(appDir, "__vesk_ambient.d.ts");
+  const overridePath = join21(appDir, "__vesk_runtime_override.d.ts");
   const cached = /* @__PURE__ */ new Map();
   const scriptKindFor = (file) => file.endsWith(".vsk") ? ts8.ScriptKind.TSX : ts8.ScriptKind.TS;
   const host2 = {
@@ -35187,7 +35561,7 @@ function createTypecheckHost(projectRoot, appDir, vskFiles) {
     directoryExists: (dir) => ts8.sys.directoryExists(dir),
     getDirectories: (dir) => {
       try {
-        return readdirSync14(dir, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => join22(dir, d.name));
+        return readdirSync14(dir, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => join21(dir, d.name));
       } catch {
         return [];
       }
@@ -35198,7 +35572,7 @@ function createTypecheckHost(projectRoot, appDir, vskFiles) {
     resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, options2) {
       return moduleLiterals.map(({ text }) => {
         if (text.endsWith(".vsk")) {
-          const abs = normalize(join22(dirname22(containingFile), text));
+          const abs = normalize(join21(dirname22(containingFile), text));
           return {
             resolvedModule: {
               resolvedFileName: abs + ".d.ts",
@@ -35209,7 +35583,7 @@ function createTypecheckHost(projectRoot, appDir, vskFiles) {
           };
         }
         if (text.endsWith(".css")) {
-          const abs = normalize(join22(dirname22(containingFile), text));
+          const abs = normalize(join21(dirname22(containingFile), text));
           return {
             resolvedModule: {
               resolvedFileName: abs + ".d.ts",
@@ -35227,7 +35601,7 @@ function createTypecheckHost(projectRoot, appDir, vskFiles) {
   return host2;
 }
 function typecheckProject(projectRoot, opts = {}) {
-  const appDir = opts.appDir ?? join22(projectRoot, "app");
+  const appDir = opts.appDir ?? join21(projectRoot, "app");
   const vskFiles = /* @__PURE__ */ new Map();
   const parseErrors = [];
   const warnings = [];
@@ -35266,8 +35640,8 @@ function typecheckProject(projectRoot, opts = {}) {
     }
     rootNames.push(f);
   }
-  const ambientPath = join22(appDir, "__vesk_ambient.d.ts");
-  const overridePath = join22(appDir, "__vesk_runtime_override.d.ts");
+  const ambientPath = join21(appDir, "__vesk_ambient.d.ts");
+  const overridePath = join21(appDir, "__vesk_runtime_override.d.ts");
   rootNames.push(ambientPath);
   rootNames.push(overridePath);
   const options2 = {
@@ -35832,7 +36206,7 @@ declare module '@vesk/runtime' {
 
 // src/index.ts
 import { readFileSync as readFileSync35, writeFileSync as writeFileSync19, mkdirSync as mkdirSync16, existsSync as existsSync38 } from "fs";
-import { resolve as resolve38, join as join23, dirname as dirname23 } from "path";
+import { resolve as resolve38, join as join22, dirname as dirname23 } from "path";
 import { fileURLToPath as fileURLToPath9 } from "url";
 
 // ../compiler/dist/config.js
@@ -36498,10 +36872,8 @@ init_server_jsgen();
 init_server_render();
 
 // ../adapter/src/css.ts
-init_scan();
 import { readFileSync as readFileSync4, existsSync as existsSync5 } from "node:fs";
 import { resolve as resolve6 } from "node:path";
-var TAILWIND_CSS_URL = "/_vesk/static/_tailwind.css";
 var GLOBAL_CSS_URL = "/_vesk/static/global.css";
 function resolveUserCssPath(appDir) {
   const cssSrc = resolve6(appDir, "..", "src", "global.css");
@@ -36510,40 +36882,16 @@ function resolveUserCssPath(appDir) {
   if (existsSync5(altCssSrc)) return altCssSrc;
   return null;
 }
-function hasUserCss(appDir) {
-  return resolveUserCssPath(appDir) !== null;
-}
-function hasBuiltTailwindCss(outDir2) {
-  const p = resolve6(outDir2, "static", "_tailwind.css");
+function hasBuiltGlobalCss(outDir2) {
+  const p = resolve6(outDir2, "static", "global.css");
   return existsSync5(p) && readFileSync4(p, "utf-8").trim().length > 0;
 }
 function isTailwindPlugin(plugins) {
   return (plugins || []).some((p) => String(p && p.name).toLowerCase().includes("tailwind"));
 }
 function resolveCssUrls(opts) {
-  const urls = [];
-  if (opts.tailwind) urls.push(TAILWIND_CSS_URL);
-  if (opts.userCss) urls.push(GLOBAL_CSS_URL);
-  return urls;
-}
-function stripTailwindDirectives(css) {
-  const blockStart = /^\s*@(theme\s*\{|layer\s+(components|utilities)\s*\{|utility\s+[\w-]+\s*\{)/;
-  let result2 = css.replace(/^\s*@import\s+['"]tailwindcss['"]\s*;?\s*$/gm, "");
-  result2 = result2.replace(/^\s*@source\s+['"][^'"]+['"]\s*;?\s*$/gm, "");
-  const output = [];
-  let pos = 0;
-  while (pos < result2.length) {
-    const lineEnd = result2.indexOf("\n", pos) === -1 ? result2.length : result2.indexOf("\n", pos) + 1;
-    const line = result2.slice(pos, lineEnd);
-    if (blockStart.test(line.trim())) {
-      const end = cssBlockEnd(result2, pos);
-      pos = end;
-      continue;
-    }
-    output.push(line);
-    pos = lineEnd;
-  }
-  return output.join("").trim();
+  if (opts.enabled) return [GLOBAL_CSS_URL];
+  return [];
 }
 
 // ../adapter/src/ssr-function.ts
@@ -36608,20 +36956,33 @@ function generateSsrFunction(routeNode, appDir, outDir2, componentMap, options2)
   const middlewareCode = options2?.middlewareCode || null;
   const headExtra = options2?.headExtra || null;
   const pagePath = resolve7(appDir, routeNode.sourceDir, "page.vsk");
-  const layoutPath = resolve7(appDir, routeNode.sourceDir, "layout.vsk");
   const parts = routeNode.fullPath.split("/").filter(Boolean);
   const name = routeName(parts);
   const funcDir = resolve7(outDir2, "server", "functions");
   const funcPath = resolve7(funcDir, `${name}.js`);
   const cssUrls = resolveCssUrls({
-    tailwind: hasBuiltTailwindCss(outDir2),
-    userCss: hasUserCss(appDir)
+    enabled: hasBuiltGlobalCss(outDir2)
   });
   const cssOption = cssUrls.length > 0 ? `, cssUrls: ${JSON.stringify(cssUrls)}` : "";
   const headExtraOption = headExtra ? `, headExtra: ${JSON.stringify(headExtra)}` : "";
   const bakedOptions = cssOption + headExtraOption;
-  const hasLayout = !!routeNode.layout;
-  const hasAncestorLayout = ancestorLayouts.length > 0;
+  const layoutStack = [
+    ...ancestorLayouts.map((a) => ({ sourceDir: a.sourceDir, layoutCompName: a.layoutCompName })),
+    ...routeNode.layout ? [{ sourceDir: routeNode.sourceDir, layoutCompName: routeNode.layout }] : []
+  ];
+  const layoutDecls = [];
+  for (const entry of layoutStack) {
+    const entryPath = resolve7(appDir, entry.sourceDir, "layout.vsk");
+    const entrySrc = readFileSync5(entryPath, "utf-8");
+    const entryComp = extractCompName(entrySrc) || "Layout";
+    const escaped = escapeSource(entrySrc);
+    layoutDecls.push({
+      src: `\`${escaped}\``,
+      comp: JSON.stringify(entryComp),
+      path: JSON.stringify(entryPath),
+      compiled: `(() => { try { setVskHydrate(true); return compileFile(\`${escaped}\`, { sourcePath: ${JSON.stringify(entryPath)} }); } catch { return null; } finally { setVskHydrate(false); } })()`
+    });
+  }
   const pageSrc = readFileSync5(pagePath, "utf-8");
   const pageComp = extractCompName(pageSrc) || "Page";
   const errorPath = resolveErrorFile(routeNode.sourceDir, appDir);
@@ -36633,42 +36994,26 @@ const _errorPath = ${JSON.stringify(errorPath)};
 const _errorCompiled = (() => { try { setVskHydrate(true); return compileFile(_errorSrc, { sourcePath: _errorPath }); } catch { return null; } finally { setVskHydrate(false); } })();
 ` : "const _errorSrc = null;\nconst _errorComp = null;\nconst _errorPath = null;\nconst _errorCompiled = null;\n";
   let src2 = "";
-  if (hasLayout) {
-    const layoutSrc = readFileSync5(layoutPath, "utf-8");
-    const layoutComp = extractCompName(layoutSrc) || "Layout";
-    src2 = `const _layoutSrc = \`${escapeSource(layoutSrc)}\`;
-const _pageSrc = \`${escapeSource(pageSrc)}\`;
-`;
-    src2 += `const _layoutComp = ${JSON.stringify(layoutComp)};
-const _pageComp = ${JSON.stringify(pageComp)};
-`;
-    src2 += `const _layoutPath = ${JSON.stringify(layoutPath)};
-const _pagePath = ${JSON.stringify(pagePath)};
-`;
-    src2 += `const _layoutCompiled = (() => { try { setVskHydrate(true); return compileFile(_layoutSrc, { sourcePath: _layoutPath }); } catch { return null; } finally { setVskHydrate(false); } })();
-`;
-    src2 += `const _pageCompiled = (() => { try { setVskHydrate(true); return compileFile(_pageSrc, { sourcePath: _pagePath }); } catch { return null; } finally { setVskHydrate(false); } })();
-`;
-    src2 += errorVars;
-  } else if (hasAncestorLayout) {
-    const outerLayout = ancestorLayouts[0];
-    const outerLayoutPath = resolve7(appDir, outerLayout.sourceDir, "layout.vsk");
-    const outerLayoutSrc = readFileSync5(outerLayoutPath, "utf-8");
-    const outerLayoutComp = extractCompName(outerLayoutSrc) || "Layout";
+  if (layoutDecls.length > 0) {
     src2 = `const _pageSrc = \`${escapeSource(pageSrc)}\`;
 `;
     src2 += `const _pageComp = ${JSON.stringify(pageComp)};
 `;
-    src2 += `const _layoutSrc = \`${escapeSource(outerLayoutSrc)}\`;
+    src2 += `const _pagePath = ${JSON.stringify(pagePath)};
+`;
+    src2 += `const _pageCompiled = (() => { try { setVskHydrate(true); return compileFile(_pageSrc, { sourcePath: _pagePath }); } catch { return null; } finally { setVskHydrate(false); } })();
 `;
-    src2 += `const _layoutComp = ${JSON.stringify(outerLayoutComp)};
+    src2 += `const _layoutSrcList = [
+${layoutDecls.map((d) => "  " + d.src + ",").join("\n")}
+];
 `;
-    src2 += `const _layoutPath = ${JSON.stringify(outerLayoutPath)};
-const _pagePath = ${JSON.stringify(pagePath)};
+    src2 += `const _layoutCompList = [${layoutDecls.map((d) => d.comp).join(", ")}];
 `;
-    src2 += `const _layoutCompiled = (() => { try { setVskHydrate(true); return compileFile(_layoutSrc, { sourcePath: _layoutPath }); } catch { return null; } finally { setVskHydrate(false); } })();
+    src2 += `const _layoutPathList = [${layoutDecls.map((d) => d.path).join(", ")}];
 `;
-    src2 += `const _pageCompiled = (() => { try { setVskHydrate(true); return compileFile(_pageSrc, { sourcePath: _pagePath }); } catch { return null; } finally { setVskHydrate(false); } })();
+    src2 += `const _layoutCompiledList = [
+${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
+];
 `;
     src2 += errorVars;
   } else {
@@ -36714,7 +37059,7 @@ ${compRegEntries.join("\n")}
     registryCode = "const __componentRegistry = new Map();\n";
   }
   let htmlFnCode;
-  if (hasLayout || hasAncestorLayout) {
+  if (layoutDecls.length > 0) {
     htmlFnCode = [
       "async function __renderErrorBody(props) {",
       '  if (!_errorSrc) throw props.error || new Error("Internal Server Error");',
@@ -36740,7 +37085,14 @@ ${compRegEntries.join("\n")}
       "    const stack = err && typeof err === 'object' && 'stack' in err ? String(err.stack) : '';",
       "    page = { body: await __renderErrorBody({ params, statusCode: 500, error: __expose ? message : 'Internal Server Error', stack: __expose ? stack : '', url: requestUrl || '' }), head: '' };",
       "  }",
-      "  const html = await renderFullPage(_layoutSrc, _layoutComp, { params, children: (caughtError ? '<!--vesk-ssr-error:' + (caughtError && typeof caughtError === 'object' && 'message' in caughtError ? encodeURIComponent(__expose ? String(caughtError.message) : 'Internal Server Error') : '') + '-->' : '') + page.body }, __componentRegistry, { hydrate: true, cached: _layoutCompiled" + bakedOptions + clientScriptOption + dataScriptOption + ", pageHead: page.head, sourcePath: _layoutPath });",
+      "  let _body = (caughtError ? '<!--vesk-ssr-error:' + (caughtError && typeof caughtError === 'object' && 'message' in caughtError ? encodeURIComponent(__expose ? String(caughtError.message) : 'Internal Server Error') : '') + '-->' : '') + page.body;",
+      "  let _head = page.head || '';",
+      "  for (let _i = _layoutSrcList.length - 1; _i > 0; _i--) {",
+      "    const _inner = await renderPage(_layoutSrcList[_i], _layoutCompList[_i], { params, children: _body }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[_i], sourcePath: _layoutPathList[_i] });",
+      "    _body = _inner.body;",
+      "    if (_inner.head) _head = _inner.head + _head;",
+      "  }",
+      "  const html = await renderFullPage(_layoutSrcList[0], _layoutCompList[0], { params, children: _body }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[0]" + bakedOptions + clientScriptOption + dataScriptOption + ", pageHead: _head, sourcePath: _layoutPathList[0] });",
       "  return new Response(html, { headers: { 'Content-Type': 'text/html' }, status: caughtError ? 500 : 200 });",
       "  });",
       "}",
@@ -36791,7 +37143,7 @@ ${compRegEntries.join("\n")}
   }
   let dataCode;
   const exposeErr = "process.env.NODE_ENV !== 'production'";
-  if (hasLayout || hasAncestorLayout) {
+  if (layoutDecls.length > 0) {
     dataCode = [
       "  if (request.headers.get('x-vesk-data') === '1') {",
       "    let dataPage;",
@@ -36802,8 +37154,12 @@ ${compRegEntries.join("\n")}
       "      const message = err && typeof err === 'object' && 'message' in err ? String(err.message) : String(err);",
       `      return new Response(JSON.stringify({ error: ${exposeErr} ? message : 'Internal Server Error' }), { status: 500, headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' } });`,
       "    }",
-      "    const dataLayout = await renderPage(_layoutSrc, _layoutComp, { params, children: '' }, __componentRegistry, { hydrate: true, cached: _layoutCompiled, sourcePath: _layoutPath });",
-      "    return new Response(JSON.stringify({ path: url.pathname, params, props: dataPage.props || { params }, head: (dataLayout.head || '') + (dataPage.head || '') }), {",
+      "    let _dataHead = dataPage.head || '';",
+      "    for (let _i = _layoutSrcList.length - 1; _i >= 0; _i--) {",
+      "      const _dl = await renderPage(_layoutSrcList[_i], _layoutCompList[_i], { params, children: '' }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[_i], sourcePath: _layoutPathList[_i] });",
+      "      _dataHead = (_dl.head || '') + _dataHead;",
+      "    }",
+      "    return new Response(JSON.stringify({ path: url.pathname, params, props: dataPage.props || { params }, head: _dataHead }), {",
       "      headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' },",
       "    });",
       "  }",
@@ -36869,12 +37225,12 @@ ${compRegEntries.join("\n")}
     ].join("\n");
   }
   let registerActionsCode;
-  if (hasLayout || hasAncestorLayout) {
+  if (layoutDecls.length > 0) {
     registerActionsCode = [
       "async function __registerActions() {",
       "  if (__actionsRegistered) return;",
       "  __actionsRegistered = true;",
-      "  compileFile(_layoutSrc, { sourcePath: _layoutPath });",
+      "  for (let _i = 0; _i < _layoutSrcList.length; _i++) compileFile(_layoutSrcList[_i], { sourcePath: _layoutPathList[_i] });",
       "  compileFile(_pageSrc, { sourcePath: _pagePath });",
       "}",
       ""
@@ -37487,7 +37843,7 @@ init_esbuild_fallback();
 init_strip_ts();
 init_parser();
 init_client_codegen();
-import { readFileSync as readFileSync9, existsSync as existsSync9, writeFileSync as writeFileSync3, unlinkSync as unlinkSync3, statSync as statSync3, rmSync } from "node:fs";
+import { readFileSync as readFileSync9, existsSync as existsSync9, writeFileSync as writeFileSync3, unlinkSync as unlinkSync3, statSync as statSync3, rmSync, mkdtempSync } from "node:fs";
 import { resolve as resolve10, join as join6, dirname as dirname6, relative as relative2, sep } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 init_vsk_imports();
@@ -37622,8 +37978,113 @@ function demoteExports(code) {
   for (const e of edits) code = code.slice(0, e.start) + e.text + code.slice(e.end);
   return code;
 }
-function stripChunkImports(code) {
-  return demoteExports(removeCompiledNodes(code, isAnyImport));
+function hasChunkImports(code) {
+  try {
+    const ast = parse4(code);
+    return (ast.body ?? []).some((n) => n.type === "ImportDeclaration");
+  } catch {
+    return false;
+  }
+}
+function resolveImportSource(src2, filePath) {
+  if (src2.startsWith("./") || src2.startsWith("../")) {
+    return resolve10(dirname6(filePath), src2) + ".ts";
+  }
+  return src2;
+}
+var ChunkImports = class {
+  bySource = /* @__PURE__ */ new Map();
+  aborted = false;
+  abortReason = null;
+  fail(reason, code) {
+    if (!this.aborted) {
+      this.aborted = true;
+      this.abortReason = reason;
+    }
+    return code;
+  }
+  /** Folds one file's imports into the merged set and returns the code with its imports stripped. */
+  add(code, filePath) {
+    if (!code || this.aborted) return code;
+    let ast;
+    try {
+      ast = parse4(code);
+    } catch {
+      return this.fail(`unparseable contribution from ${filePath}`, code);
+    }
+    const body = ast.body ?? [];
+    const ranges = [];
+    for (const raw2 of body) {
+      const node = raw2;
+      if (node.type !== "ImportDeclaration" || typeof node.start !== "number" || typeof node.end !== "number") continue;
+      const src2 = node.source?.value;
+      if (typeof src2 !== "string") continue;
+      const resolved = resolveImportSource(src2, filePath);
+      let group = this.bySource.get(resolved);
+      if (!group) {
+        group = { named: /* @__PURE__ */ new Map() };
+        this.bySource.set(resolved, group);
+      }
+      for (const spec of node.specifiers ?? []) {
+        const s = spec;
+        const local = s.local?.name;
+        if (typeof local !== "string") return this.fail(`nameless specifier from '${resolved}' in ${filePath}`, code);
+        if (s.type === "ImportDefaultSpecifier") {
+          if (group.default && group.default.local !== local) return this.fail(`conflicting default imports from '${resolved}' in ${filePath}`, code);
+          group.default = { kind: "default", local };
+        } else if (s.type === "ImportNamespaceSpecifier") {
+          if (group.namespace && group.namespace.local !== local) return this.fail(`conflicting namespace imports from '${resolved}' in ${filePath}`, code);
+          group.namespace = { kind: "namespace", local };
+        } else if (s.type === "ImportSpecifier") {
+          const imported = s.imported?.name;
+          if (typeof imported !== "string") return this.fail(`nameless named-import from '${resolved}' in ${filePath}`, code);
+          const existing = group.named.get(imported);
+          if (existing && existing.local !== local) return this.fail(`'${imported}' from '${resolved}' bound to both '${existing.local}' and '${local}' in ${filePath}`, code);
+          group.named.set(imported, { kind: "named", local, imported });
+        }
+      }
+      let cut = node.end;
+      if (code[cut] === ";") cut++;
+      ranges.push([node.start, cut]);
+    }
+    if (ranges.length === 0) return code;
+    return removeRanges(code, ranges);
+  }
+  /** True when every file parsed and merged cleanly (no conflict, no parse abort). */
+  get ok() {
+    return !this.aborted;
+  }
+  /** Why the merge aborted (null when `ok`). Surfaced by the assembler. */
+  get reason() {
+    return this.abortReason;
+  }
+  /** Renders the deduped import block (empty string when there are no imports). */
+  render() {
+    if (this.aborted || this.bySource.size === 0) return "";
+    const lines = [];
+    const sources = [...this.bySource.keys()].sort();
+    for (const src2 of sources) {
+      const g2 = this.bySource.get(src2);
+      const parts = [];
+      if (g2.default) parts.push(`import ${g2.default.local} from ${JSON.stringify(src2)}`);
+      if (g2.namespace) parts.push(`import * as ${g2.namespace.local} from ${JSON.stringify(src2)}`);
+      const named = [...g2.named.values()].sort((a, b) => a.imported < b.imported ? -1 : 1);
+      if (named.length > 0) {
+        const specs = named.map((sp) => sp.imported === sp.local ? sp.local : `${sp.imported} as ${sp.local}`).join(", ");
+        parts.push(`import { ${specs} } from ${JSON.stringify(src2)}`);
+      }
+      lines.push(parts.join("\n"));
+    }
+    return lines.join("\n");
+  }
+};
+function removeRanges(code, ranges) {
+  const sorted = [...ranges].sort((a, b) => b[0] - a[0]);
+  let out = code;
+  for (const [start, end] of sorted) {
+    out = out.slice(0, start) + out.slice(end);
+  }
+  return out.trim();
 }
 function scopeFileContribution(code) {
   const head = extractCompiledNodes(code, isModuleLevel);
@@ -37721,7 +38182,7 @@ async function generateClientBundle(routeTree, appDir, componentMap, options2) {
   function stripExports(code) {
     return removeCompiledNodes(code, isComponentExport);
   }
-  function compileFile2(filePath, resolvedName, output) {
+  function compileFile2(filePath, resolvedName, output, imports) {
     if (seen.has(filePath)) return;
     seen.add(filePath);
     const cachedEntry = cache2?.files.get(filePath);
@@ -37738,8 +38199,10 @@ async function generateClientBundle(routeTree, appDir, componentMap, options2) {
     const cached = cacheUsable ? cachedEntry : void 0;
     if (cached && cacheUsable) {
       cachedFileHits++;
-      for (const dep of cached.imports) compileFile2(dep, cache2?.files.get(dep)?.actualName ?? "", output);
-      const cachedFileCode = [cached.compCode, cached.hydCode].filter(Boolean).join("\n");
+      for (const dep of cached.imports) compileFile2(dep, cache2?.files.get(dep)?.actualName ?? "", output, imports);
+      const cachedComp = cached.compCode ? imports.add(cached.compCode, filePath).replace(/^\n+/, "").replace(/\n+$/, "") : "";
+      const cachedHyd = cached.hydCode ? imports.add(cached.hydCode, filePath).replace(/__components/g, "__hydrators").replace(/^\n+/, "").replace(/\n+$/, "") : "";
+      const cachedFileCode = [cachedComp, cachedHyd].filter(Boolean).join("\n");
       if (cachedFileCode.trim()) output.push(scopeFileContribution(cachedFileCode));
       for (const n of cached.runtimeNames) runtimeImportNames.add(n);
       if (cached.actualName && resolvedName !== null && cached.actualName !== resolvedName) {
@@ -37754,10 +38217,12 @@ async function generateClientBundle(routeTree, appDir, componentMap, options2) {
       src2 = inlineMdContentAttrs(src2, dirname6(filePath), guessProjectRoots(appDir));
     }
     const namesBefore = cache2 ? new Set(runtimeImportNames) : null;
-    const importedPaths = resolveVskImports(filePath, (p, n) => compileFile2(p, n || "", output));
+    const importedPaths = resolveVskImports(filePath, (p, n) => compileFile2(p, n, output, imports));
     const { comp: rawComp, hyd: rawHyd, name: actualName } = compileClientBoth(src2, null, filePath);
-    const compCode = rawComp ? stripChunkImports(stripExports(stripVskImports(stripRuntimeImport(rawComp)))).replace(/^\n+/, "").replace(/\n+$/, "") : "";
-    const hydCode = rawHyd ? stripChunkImports(stripExports(stripVskImports(stripRuntimeImport(rawHyd)))).replace(/__components/g, "__hydrators").replace(/^\n+/, "").replace(/\n+$/, "") : "";
+    const compWithImports = rawComp ? stripExports(stripVskImports(stripRuntimeImport(rawComp))) : "";
+    const hydWithImports = rawHyd ? stripExports(stripVskImports(stripRuntimeImport(rawHyd))) : "";
+    const compCode = compWithImports ? imports.add(compWithImports, filePath).replace(/^\n+/, "").replace(/\n+$/, "") : "";
+    const hydCode = hydWithImports ? imports.add(hydWithImports, filePath).replace(/__components/g, "__hydrators").replace(/^\n+/, "").replace(/\n+$/, "") : "";
     if (rawComp) collectRuntimeImports(rawComp);
     if (rawHyd) collectRuntimeImports(rawHyd);
     if (returnEdited && only.has(filePath)) {
@@ -37775,8 +38240,8 @@ async function generateClientBundle(routeTree, appDir, componentMap, options2) {
       cache2.files.set(filePath, {
         mtimeMs: st.mtimeMs,
         size: st.size,
-        compCode,
-        hydCode,
+        compCode: compWithImports,
+        hydCode: hydWithImports,
         actualName,
         runtimeNames: [...runtimeImportNames].filter((n) => !namesBefore.has(n)),
         imports: importedPaths
@@ -37806,37 +38271,41 @@ async function generateClientBundle(routeTree, appDir, componentMap, options2) {
     let walkSplit2 = function(nodes, _chain) {
       for (const node of nodes) {
         const chunkCode = [];
+        const chunkImports = new ChunkImports();
         const pagePath = resolve10(appDir, node.sourceDir, "page.vsk");
         if (node.page && existsSync9(pagePath)) {
-          compileFile2(pagePath, node.page, chunkCode);
+          compileFile2(pagePath, node.page, chunkCode, chunkImports);
         }
         const layoutPath = resolve10(appDir, node.sourceDir, "layout.vsk");
         if (node.layout && existsSync9(layoutPath)) {
-          compileFile2(layoutPath, node.layout, chunkCode);
+          compileFile2(layoutPath, node.layout, chunkCode, chunkImports);
         }
         const errorPath = resolve10(appDir, node.sourceDir, "error.vsk");
         if (node.error && existsSync9(errorPath)) {
-          compileFile2(errorPath, node.error, chunkCode);
+          compileFile2(errorPath, node.error, chunkCode, chunkImports);
         }
         const notFoundPath = resolve10(appDir, node.sourceDir, "not-found.vsk");
         if (node.notFound && existsSync9(notFoundPath)) {
-          compileFile2(notFoundPath, node.notFound, chunkCode);
+          compileFile2(notFoundPath, node.notFound, chunkCode, chunkImports);
         }
         const offlinePath = resolve10(appDir, node.sourceDir, "offline.vsk");
         if (node.offline && existsSync9(offlinePath)) {
-          compileFile2(offlinePath, node.offline, chunkCode);
+          compileFile2(offlinePath, node.offline, chunkCode, chunkImports);
         }
         const networkPath = resolve10(appDir, node.sourceDir, "network.vsk");
         if (node.network && existsSync9(networkPath)) {
-          compileFile2(networkPath, node.network, chunkCode);
+          compileFile2(networkPath, node.network, chunkCode, chunkImports);
         }
         const loadingPath = resolve10(appDir, node.sourceDir, "loading.vsk");
         if (node.loading && existsSync9(loadingPath)) {
-          compileFile2(loadingPath, node.loading, chunkCode);
+          compileFile2(loadingPath, node.loading, chunkCode, chunkImports);
         }
         if (chunkCode.length > 0) {
           const chunkName = `page-${buildChunkName(node)}.js`;
-          chunkEntries.push({ name: chunkName, code: chunkCode.join("\n\n"), node });
+          if (!chunkImports.ok) console.error("[vesk] chunk import merge aborted for", chunkName + ":", chunkImports.reason);
+          const head = chunkImports.render();
+          const code = (head ? head + "\n\n" : "") + chunkCode.join("\n\n");
+          chunkEntries.push({ name: chunkName, code, node });
         }
         walkSplit2(node.children || [], [..._chain, node]);
       }
@@ -37852,25 +38321,60 @@ async function generateClientBundle(routeTree, appDir, componentMap, options2) {
     const chunkEntries = [];
     walkSplit2(routeTree, []);
     const sharedCode = [];
+    const sharedImports = new ChunkImports();
     const compMap = componentMap || /* @__PURE__ */ new Map();
     for (const [compName, compPath] of compMap) {
-      compileFile2(compPath, compName, sharedCode);
+      compileFile2(compPath, compName, sharedCode, sharedImports);
     }
     if (sharedCode.length > 0) {
-      chunkEntries.push({ name: "shared.js", code: sharedCode.join("\n\n"), node: null });
+      if (!sharedImports.ok) console.error("[vesk] chunk import merge aborted for shared.js:", sharedImports.reason);
+      const head = sharedImports.render();
+      const code = (head ? head + "\n\n" : "") + sharedCode.join("\n\n");
+      chunkEntries.push({ name: "shared.js", code, node: null });
     }
-    for (const entry of chunkEntries) {
-      if (entry.code.trim()) {
-        chunks.push({
-          name: entry.name,
-          code: `(()=>{
+    const chunkIIFE = (body) => `(()=>{
 const __components = globalThis.__components || (globalThis.__components = {});
 const __hydrators = globalThis.__hydrators || (globalThis.__hydrators = {});
-${entry.code}
+${body}
 })();
-`
-        });
+`;
+    for (const entry of chunkEntries) {
+      if (!entry.code.trim()) continue;
+      let finalCode;
+      if (hasChunkImports(entry.code)) {
+        const tmpBase = mkdtempSync(join6(resolve10(appDir, ".."), "tmp-vesk-chunk-"));
+        const tmpFile = join6(tmpBase, "entry.js");
+        const toBundle = `const __components = globalThis.__components || (globalThis.__components = {});
+const __hydrators = globalThis.__hydrators || (globalThis.__hydrators = {});
+${entry.code}
+`;
+        writeFileSync3(tmpFile, toBundle);
+        try {
+          const result2 = await build({
+            entryPoints: [tmpFile],
+            bundle: true,
+            format: "iife",
+            platform: "browser",
+            write: false,
+            logLevel: "silent",
+            loader: { ".js": "tsx" }
+          });
+          finalCode = result2.outputFiles[0].text;
+        } catch (e) {
+          const err = e;
+          console.error("[vesk] chunk bundle failed", entry.name, err?.errors?.map((x) => x.text).join(" | ") || err?.message || String(e));
+          const stripped = demoteExports(removeCompiledNodes(entry.code, isAnyImport));
+          finalCode = chunkIIFE(stripped);
+        } finally {
+          try {
+            rmSync(tmpBase, { recursive: true, force: true });
+          } catch {
+          }
+        }
+      } else {
+        finalCode = chunkIIFE(entry.code);
       }
+      chunks.push({ name: entry.name, code: finalCode });
     }
     annotate2(routeTree);
     const mainKey = JSON.stringify(routeTree) + "|" + [...runtimeImportNames].sort().join(",") + `|${!!options2?.hmr}|${!!options2?.importRuntime}|${options2?.routeDataCache ?? ""}`;
@@ -38623,8 +39127,7 @@ async function startProdServer(outDir, options) {
     }
     const appDir = resolve13(projectDir, "app");
     const pageCssUrls = resolveCssUrls({
-      tailwind: hasBuiltTailwindCss(outDir),
-      userCss: hasUserCss(appDir)
+      enabled: hasBuiltGlobalCss(outDir)
     });
     const nfPath = resolve13(appDir, "not-found.vsk");
     let notFoundHtml = null;
@@ -38952,40 +39455,24 @@ async function build2(appDir, options2) {
   const cssSourcePath = resolveUserCssPath(appDir);
   if (cssSourcePath !== null) {
     const cssContent = readFileSync18(cssSourcePath, "utf-8");
-    const userCss = stripTailwindDirectives(cssContent);
-    const userCssTarget = resolve21(outDir2, "static", "global.css");
-    writeFileSync10(userCssTarget, userCss, "utf-8");
-    console.error(`vesk build: css  \u2192 static/global.css  (${userCss.length} bytes)`);
-    const twCssTarget = resolve21(outDir2, "static", "_tailwind.css");
+    const cssTarget = resolve21(outDir2, "static", "global.css");
     const tailwindActive = isTailwindPlugin(pluginsPipelines);
-    if (!tailwindActive) {
-      writeFileSync10(twCssTarget, "", "utf-8");
-      console.error("vesk build: css  \u2192 static/_tailwind.css  (empty, tailwind plugin inactive)");
-    } else {
-      let twCss = cssContent;
+    let finalCss = cssContent;
+    if (tailwindActive) {
       for (const plugin of pluginsPipelines) {
         if (typeof plugin.onCSS === "function") {
-          const result2 = await plugin.onCSS(twCss, cssSourcePath);
+          const result2 = await plugin.onCSS(finalCss, cssSourcePath);
           if (result2 !== null && typeof result2 === "string") {
-            twCss = result2;
+            finalCss = result2;
           }
         }
       }
-      const hasUnresolvedTailwindImport = /@import\s+['"]tailwindcss['"]/.test(twCss);
-      if (hasUnresolvedTailwindImport) {
-        const lines = twCss.split("\n").filter((l) => !/^\s*@import\s+['"]tailwindcss['"]/.test(l));
-        twCss = lines.join("\n").trim();
-        if (twCss.length === 0) {
-          writeFileSync10(twCssTarget, "", "utf-8");
-          console.error("vesk build: css  \u2192 static/_tailwind.css  (empty, tailwind unresolved)");
-        } else {
-          writeFileSync10(twCssTarget, twCss, "utf-8");
-          console.error(`vesk build: css  \u2192 static/_tailwind.css  (${twCss.length} bytes, tailwind partially unresolved)`);
-        }
-      } else {
-        writeFileSync10(twCssTarget, twCss, "utf-8");
-        console.error(`vesk build: css  \u2192 static/_tailwind.css  (${twCss.length} bytes)`);
-      }
+    }
+    writeFileSync10(cssTarget, finalCss, "utf-8");
+    if (tailwindActive) {
+      console.error(`vesk build: css  \u2192 static/global.css  (${finalCss.length} bytes)`);
+    } else {
+      console.error(`vesk build: css  \u2192 static/global.css  (${finalCss.length} bytes, tailwind plugin inactive)`);
     }
   }
   const { scanRoutes: scanRoutes2, scanComponents } = await resolveCompilerApi("router.js");
@@ -39105,8 +39592,7 @@ async function build2(appDir, options2) {
   if (options2?.ssg) {
     const { generateSsgRoutes: generateSsgRoutes2 } = await Promise.resolve().then(() => (init_static(), static_exports));
     const cssUrls = resolveCssUrls({
-      tailwind: hasBuiltTailwindCss(outDir2),
-      userCss: hasUserCss(appDir)
+      enabled: hasBuiltGlobalCss(outDir2)
     });
     prerenderedRoutes = await generateSsgRoutes2(routeTree, appDir, outDir2, pluginsPipelines, pluginHeadExtra, cssUrls);
     console.error(`vesk build: ssg   \u2192 prerendered/  (${prerenderedRoutes.length} pages)`);
@@ -39185,7 +39671,7 @@ init_seo_audit();
 
 // src/dev-server.ts
 import { readFileSync as readFileSync33, watch, statSync as statSync21, existsSync as existsSync37, readdirSync as readdirSync13 } from "node:fs";
-import { resolve as resolve36, extname as extname8, join as join21 } from "node:path";
+import { resolve as resolve36, extname as extname8, join as join20 } from "node:path";
 import { createServer as createServer2 } from "node:http";
 import { WebSocketServer as WebSocketServer2 } from "ws";
 
@@ -39550,6 +40036,19 @@ function collectTrackedNames2(body) {
   }
   return names;
 }
+function transformTrackedInit2(init, tracked2) {
+  if (!init)
+    return init;
+  let expr = null;
+  try {
+    const prog = parse4(`(${init})`);
+    expr = prog.body?.[0]?.type === "ExpressionStatement" ? prog.body[0].expression ?? null : null;
+  } catch {
+  }
+  if (!expr)
+    return init;
+  return transformTracked2({ raw: init, ast: expr }, tracked2);
+}
 var NON_BUBBLING_EVENTS2 = /* @__PURE__ */ new Set([
   "focus",
   "blur",
@@ -39592,6 +40091,7 @@ var Ctx2 = class {
   effects = [];
   c = 0;
   importedNames = /* @__PURE__ */ new Set();
+  linkNames = /* @__PURE__ */ new Set();
   delegatedEvents = /* @__PURE__ */ new Set();
   directEvents = /* @__PURE__ */ new Set();
   hydrate = false;
@@ -39648,7 +40148,7 @@ function emitNode2(ctx2, node, tracked2, effectsVar, parentVar, compPrefix = "__
     return emitDynamicBinding2(ctx2, node, tracked2, effectsVar);
   if (node instanceof TrackDecl) {
     const cellName = node.rawName || node.name;
-    const init = stripTrackGeneric(node.init);
+    const init = transformTrackedInit2(stripTrackGeneric(node.init), tracked2);
     ctx2.push(`const ${cellName} = ${init};`);
     return null;
   }
@@ -39949,6 +40449,10 @@ function emitComponentCall2(ctx2, node, tracked2, effectsVar, parentVar, compPre
       ctx2.push(`const ${frag} = (() => { const $f = document.createDocumentFragment();`);
       const savedWalker = ctx2.walker;
       const savedEffects = ctx2.effects;
+      const wipeMount = ctx2.linkNames.has(node.componentName);
+      const savedHydrate = ctx2.hydrate;
+      if (wipeMount)
+        ctx2.hydrate = false;
       ctx2.walker = walkerVar;
       ctx2.effects = [];
       for (const child of node.children) {
@@ -39960,6 +40464,7 @@ function emitComponentCall2(ctx2, node, tracked2, effectsVar, parentVar, compPre
         ctx2.push(effectsVar ? `${effectsVar}.push(${effectBlockToHandlerExpr2(eff)});` : eff);
       ctx2.effects = savedEffects;
       ctx2.walker = savedWalker;
+      ctx2.hydrate = savedHydrate;
       ctx2.push(`return $f; })();`);
       propsEntries.push(`children: ${frag}`);
       ctx2.push(`const ${v} = ${awaitKw}${access}({ ${propsEntries.join(", ")} }, __registry, ${walkerVar});`);
@@ -40022,7 +40527,7 @@ function emitTryCatch2(ctx2, node, tracked2, effectsVar, parentVar) {
       ctx2.push(indent3(`const __cl = [];`));
     }
     for (const child of body) {
-      const childVar = emitNode2(ctx2, child, tracked2, isCatch ? null : effArr, void 0, compPrefix);
+      const childVar = emitNode2(ctx2, child, tracked2, isCatch ? null : effArr, hydMode ? void 0 : "__p", compPrefix);
       if (childVar) {
         if (hydMode)
           ctx2.push(indent3(`__cl.push(${childVar});`));
@@ -40141,7 +40646,7 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar) {
   ctx2.push(`if (${condExpr}) { ${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; return; }
+      if (__first) { __first = false; __iv = ${condExpr}; return; }
       const __nv = ${condExpr};
       if (__nv !== __iv) {
         for (const e of ${effectsVar}) destroy_block(e);
@@ -40151,6 +40656,8 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar) {
         __iv = __nv;
       }
     });`;
+  if (!isReactiveExpression2(node.condition, tracked2))
+    return null;
   if (effTarget) {
     ctx2.push(`${effTarget}.push((() => {
     let __iv = ${condExpr};
@@ -40182,33 +40689,37 @@ function emitWhileLoop2(ctx2, node, tracked2, parentVar) {
   ctx2.push(`const ${renderLoop} = ${ctx2.isAsyncScope ? "async () => {" : "() => {"}`);
   if (!hyd)
     ctx2.push(indent3(`const __p = ${anchor}.parentNode;`));
+  if (!hyd)
+    ctx2.push(indent3(`const __b = document.createDocumentFragment();`));
   if (hyd)
     ctx2.push(indent3(`const __cl = [];`));
   if (node.isDoWhile) {
     ctx2.push(indent3(`do {`));
     for (const n of node.bodyTemplate) {
-      const v = emitNode2(ctx2, n, tracked2, effectsVar, hyd ? parentVar : void 0);
+      const v = emitNode2(ctx2, n, tracked2, effectsVar, hyd ? parentVar : "__b");
       if (v) {
         if (hyd)
           ctx2.push(indent3(`__cl.push(${v});`));
         else
-          ctx2.push(indent3(`__p.insertBefore(${v}, ${endAnchor});`));
+          ctx2.push(indent3(`__b.appendChild(${v});`));
       }
     }
     ctx2.push(indent3(`} while (${condExpr});`));
   } else {
     ctx2.push(indent3(`while (${condExpr}) {`));
     for (const n of node.bodyTemplate) {
-      const v = emitNode2(ctx2, n, tracked2, effectsVar, hyd ? parentVar : void 0);
+      const v = emitNode2(ctx2, n, tracked2, effectsVar, hyd ? parentVar : "__b");
       if (v) {
         if (hyd)
           ctx2.push(indent3(`__cl.push(${v});`));
         else
-          ctx2.push(indent3(`__p.insertBefore(${v}, ${endAnchor});`));
+          ctx2.push(indent3(`__b.appendChild(${v});`));
       }
     }
     ctx2.push(indent3(`}`));
   }
+  if (!hyd)
+    ctx2.push(indent3(`__p.insertBefore(__b, ${endAnchor});`));
   if (hyd)
     ctx2.push(indent3(`__place(${anchor}, ${endAnchor}, __cl, ${parent});`));
   ctx2.push(`};`);
@@ -40220,7 +40731,7 @@ function emitWhileLoop2(ctx2, node, tracked2, parentVar) {
   let __iv = (${condExpr});
   let __first = true;
   effect(${ctx2.isAsyncScope ? "async () => {" : "() => {"}
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __iv = (${condExpr}); return; }
     if (__busy) return;
     const __nv = (${condExpr});
     if (__nv !== __iv) {
@@ -40251,39 +40762,46 @@ function emitForLoop2(ctx2, node, tracked2, parentVar) {
   ctx2.push(`const ${renderLoop} = ${ctx2.isAsyncScope ? "async () => {" : "() => {"}`);
   if (!hyd)
     ctx2.push(indent3(`const __p = ${anchor}.parentNode;`));
+  if (!hyd)
+    ctx2.push(indent3(`const __b = document.createDocumentFragment();`));
   if (hyd)
     ctx2.push(indent3(`const __cl = [];`));
   if (node.kind === "for-in") {
     const srcExpr = transformTracked2(node.condition, tracked2);
     ctx2.push(indent3(`for (${node.init} of (Array.isArray(${srcExpr}) ? ${srcExpr} : (${srcExpr} == null ? [] : Object.keys(${srcExpr})))) {`));
     for (const n of node.bodyTemplate) {
-      const v = emitNode2(ctx2, n, tracked2, effectsVar, hyd ? parentVar : void 0);
+      const v = emitNode2(ctx2, n, tracked2, effectsVar, hyd ? parentVar : "__b");
       if (v) {
         if (hyd)
           ctx2.push(indent3(`__cl.push(${v});`));
         else
-          ctx2.push(indent3(`__p.insertBefore(${v}, ${endAnchor});`));
+          ctx2.push(indent3(`__b.appendChild(${v});`));
       }
     }
     ctx2.push(indent3(`}`));
   } else {
     const condExpr = transformTracked2(node.condition, tracked2);
-    if (node.init)
-      ctx2.push(indent3(`${node.init}`));
-    ctx2.push(indent3(`while (${condExpr}) {`));
+    let initPart = (node.init || "").trim();
+    let updatePart = (node.update || "").trim();
+    if (initPart.endsWith(";"))
+      initPart = initPart.slice(0, -1).trim();
+    if (updatePart.endsWith(";"))
+      updatePart = updatePart.slice(0, -1).trim();
+    const head = initPart ? `${initPart}; ${condExpr}` : `; ${condExpr}`;
+    ctx2.push(indent3(`for (${head}; ${updatePart}) {`));
     for (const n of node.bodyTemplate) {
-      const v = emitNode2(ctx2, n, tracked2, effectsVar, hyd ? parentVar : void 0);
+      const v = emitNode2(ctx2, n, tracked2, effectsVar, hyd ? parentVar : "__b");
       if (v) {
         if (hyd)
           ctx2.push(indent3(`__cl.push(${v});`));
         else
-          ctx2.push(indent3(`__p.insertBefore(${v}, ${endAnchor});`));
+          ctx2.push(indent3(`__b.appendChild(${v});`));
       }
     }
-    if (node.update)
-      ctx2.push(indent3(`${node.update}`));
     ctx2.push(indent3(`}`));
   }
+  if (!hyd)
+    ctx2.push(indent3(`__p.insertBefore(__b, ${endAnchor});`));
   if (hyd)
     ctx2.push(indent3(`__place(${anchor}, ${endAnchor}, __cl, ${parent});`));
   ctx2.push(`};`);
@@ -40292,12 +40810,15 @@ function emitForLoop2(ctx2, node, tracked2, parentVar) {
   ctx2.push(`${ctx2.isAsyncScope ? "await " : ""}${renderLoop}();`);
   if (node.kind === "for-in") {
     const srcExpr = transformTracked2(node.condition, tracked2);
+    if (!isReactiveExpression2(node.condition, tracked2)) {
+      return null;
+    }
     ctx2.effects.push(`{
   let __busy = false;
   let __iv = undefined;
   let __first = true;
   effect(${ctx2.isAsyncScope ? "async () => {" : "() => {"}
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __iv = (${srcExpr}); return; }
     if (__busy) return;
     const __nv = (${srcExpr});
     if (__nv !== __iv) {
@@ -40329,10 +40850,12 @@ function emitSwitchBlock2(ctx2, node, tracked2, parentVar) {
   ctx2.push(`const ${endAnchor} = document.createComment('switch-end');`);
   const renderSwitch = ctx2.n();
   ctx2.push(`const ${renderSwitch} = ${ctx2.isAsyncScope ? "async () => {" : "() => {"}`);
-  if (!hyd)
-    ctx2.push(indent3(`const __p = ${anchor}.parentNode;`));
-  if (hyd)
+  if (hyd) {
     ctx2.push(indent3(`const __cl = [];`));
+  } else {
+    ctx2.push(indent3(`const __p = ${anchor}.parentNode;`));
+    ctx2.push(indent3(`const __c = document.createDocumentFragment();`));
+  }
   ctx2.push(indent3(`switch (${discExpr}) {`));
   for (const c of node.cases) {
     if (c.test) {
@@ -40341,17 +40864,19 @@ function emitSwitchBlock2(ctx2, node, tracked2, parentVar) {
       ctx2.push(indent3(`default:`));
     }
     for (const n of c.body) {
-      const v = emitNode2(ctx2, n, tracked2, effectsVar, hyd ? parentVar : void 0);
+      const v = emitNode2(ctx2, n, tracked2, effectsVar, hyd ? parentVar : "__c");
       if (v) {
         if (hyd)
           ctx2.push(indent3(`__cl.push(${v});`));
         else
-          ctx2.push(indent3(`__p.insertBefore(${v}, ${endAnchor});`));
+          ctx2.push(indent3(`__c.appendChild(${v});`));
       }
     }
     ctx2.push(indent3(`break;`));
   }
   ctx2.push(indent3(`}`));
+  if (!hyd)
+    ctx2.push(indent3(`__p.insertBefore(__c, ${endAnchor});`));
   if (hyd)
     ctx2.push(indent3(`__place(${anchor}, ${endAnchor}, __cl, ${parent});`));
   ctx2.push(`};`);
@@ -40363,7 +40888,7 @@ function emitSwitchBlock2(ctx2, node, tracked2, parentVar) {
   let __iv = (${discExpr});
   let __first = true;
   effect(${ctx2.isAsyncScope ? "async () => {" : "() => {"}
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __iv = (${discExpr}); return; }
     if (__busy) return;
     const __nv = (${discExpr});
     if (__nv !== __iv) {
@@ -40390,6 +40915,7 @@ function emitMap2(ctx2, node, tracked2, parentVar) {
   const keyed = !!node.keyExpr;
   const hyd = ctx2.hydrate && !keyed;
   const parent = parentVar || "$root";
+  const reactiveSource = isReactiveExpression2(node.expression, tracked2);
   ctx2.push(`const ${anchor} = document.createComment('map');`);
   if (!hyd)
     ctx2.push(`${parent}.appendChild(${anchor});`);
@@ -40401,16 +40927,23 @@ function emitMap2(ctx2, node, tracked2, parentVar) {
   ctx2.push(indent3(`__r = __r || ${endAnchor};`));
   if (node.indexVariable)
     ctx2.push(indent3(`const ${node.indexVariable} = __i;`));
-  ctx2.push(indent3(`const __p = ${anchor}.parentNode;`));
+  if (hyd) {
+    ctx2.push(indent3(`const __p = ${anchor}.parentNode;`));
+  } else {
+    ctx2.push(indent3(`const __p = ${anchor}.parentNode;`));
+    ctx2.push(indent3(`const __it = document.createDocumentFragment();`));
+  }
   for (const n of node.bodyTemplate) {
-    const v = emitNode2(ctx2, n, tracked2, "__e");
+    const v = emitNode2(ctx2, n, tracked2, "__e", hyd ? void 0 : "__it");
     if (v) {
       if (hyd)
         ctx2.push(indent3(`if (__cl) __cl.push(${v}); else __p.insertBefore(${v}, __r);`));
       else
-        ctx2.push(indent3(`__p.insertBefore(${v}, __r);`));
+        ctx2.push(indent3(`__it.appendChild(${v});`));
     }
   }
+  if (!hyd)
+    ctx2.push(indent3(`__p.insertBefore(__it, __r);`));
   ctx2.push(`};`);
   let emptyRenderName = null;
   if (node.alternateNodes.length > 0) {
@@ -40451,11 +40984,13 @@ function emitMap2(ctx2, node, tracked2, parentVar) {
       const isEmptyVar = ctx2.n();
       ctx2.push(`let ${isEmptyVar} = !${hasItems}();`);
       ctx2.push(`if (!${isEmptyVar}) { ${initList}(); } else { ${aw}${emptyRenderName}(); }`);
+      if (!reactiveSource)
+        return null;
       ctx2.effects.push(`{
   let __first = true;
   effect(${effOpen}
     const __new = ${hasItems}();
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __new; return; }
     if (__new !== ${isEmptyVar}) {
       if (__new) ${reconciler}(${arrExpr});
       return;
@@ -40469,11 +41004,13 @@ function emitMap2(ctx2, node, tracked2, parentVar) {
 }`);
     } else {
       ctx2.push(`${initList}();`);
+      if (!reactiveSource)
+        return null;
       ctx2.effects.push(`{
   let __first = true;
   effect(() => {
     const __nv = ${arrExpr};
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __nv; ${reconciler}(${arrExpr}); return; }
     ${reconciler}(${arrExpr});
   });
 }`);
@@ -40505,11 +41042,13 @@ function emitMap2(ctx2, node, tracked2, parentVar) {
       ctx2.push(indent3(`} else { ${aw}${emptyRenderName}(${collectVar ? collectVar : ""}); }`));
       if (collectVar)
         ctx2.push(`__place(${anchor}, ${endAnchor}, ${collectVar}, ${parent});`);
+      if (!reactiveSource)
+        return null;
       ctx2.effects.push(`{
   let __first = true;
   effect(${effOpen}
     const __new = ${hasItems}();
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __new; return; }
     if (__new !== ${isEmptyVar}) {
       if (__new) {
         for (const e of ${effectsVar}) destroy_block(e);
@@ -40535,11 +41074,13 @@ ${renderAllItems("      ", null)}
       ctx2.push(renderAllItems("", collectVar));
       if (collectVar)
         ctx2.push(`__place(${anchor}, ${endAnchor}, ${collectVar}, ${parent});`);
+      if (!reactiveSource)
+        return null;
       ctx2.effects.push(`{
   let __first = true;
   effect(${effOpen}
     const __nv = ${arrExpr};
-    if (__first) { __first = false; return; }
+    if (__first) { __first = false; __nv; return; }
     for (const e of ${effectsVar}) destroy_block(e);
     ${effectsVar}.length = 0;
     __cleanup(${anchor}, ${endAnchor});
@@ -40553,10 +41094,11 @@ ${renderAllItems("    ", null)}
 function computeAsyncComponents2(comps) {
   return new Set(comps.filter((c) => c.isAsync).map((c) => c.name));
 }
-function generateComponent2(comp, importedNames = /* @__PURE__ */ new Set(), hydrate = false, asyncComps = /* @__PURE__ */ new Set()) {
+function generateComponent2(comp, importedNames = /* @__PURE__ */ new Set(), hydrate = false, asyncComps = /* @__PURE__ */ new Set(), linkNames = /* @__PURE__ */ new Set()) {
   const tracked2 = collectTrackedNames2(comp.body);
   const ctx2 = new Ctx2();
   ctx2.importedNames = importedNames;
+  ctx2.linkNames = linkNames;
   ctx2.hydrate = hydrate;
   ctx2.asyncComps = asyncComps;
   ctx2.isAsyncScope = comp.isAsync || asyncComps.has(comp.name);
@@ -40584,7 +41126,7 @@ function generateComponent2(comp, importedNames = /* @__PURE__ */ new Set(), hyd
     const v = emitNode2(ctx2, node, tracked2, null);
     if (v) {
       if (ctx2.hydrate) {
-        ctx2.push(indent3(`if (${v}.parentNode !== $root) $root.appendChild(${v});`));
+        ctx2.push(indent3(`if (${v}.parentNode !== $root) { if (!$root || ${v}.parentNode == null || !$root.contains(${v})) $root.appendChild(${v}); }`));
       } else {
         ctx2.push(indent3(`$root.appendChild(${v});`));
       }
@@ -40614,6 +41156,13 @@ function buildComponentMap3(irRoot, hydrate = false) {
   const mapLines = [];
   mapLines.push(`const __components = {};`);
   const asyncComps = computeAsyncComponents2(irRoot.components);
+  const linkNames = /* @__PURE__ */ new Set();
+  for (const imp of irRoot.imports) {
+    for (const pair of importBindingPairs(imp)) {
+      if (pair.imported === "Link" || pair.imported === "NavLink")
+        linkNames.add(pair.local);
+    }
+  }
   const componentNames = new Set(irRoot.components.map((c) => c.name));
   const topValueNames = extractTopLevelNames(irRoot.topLevelCode).filter((n) => !componentNames.has(n));
   const directNames = /* @__PURE__ */ new Set([...extractRuntimeNames(irRoot.imports), ...localValueImportNames(irRoot.imports), ...topValueNames]);
@@ -40623,7 +41172,7 @@ function buildComponentMap3(irRoot, hydrate = false) {
       mapLines.push(`__components[${JSON.stringify(comp.name)}] = ${stub};`);
       continue;
     }
-    const code = generateComponent2(comp, directNames, hydrate, asyncComps);
+    const code = generateComponent2(comp, directNames, hydrate, asyncComps, linkNames);
     mapLines.push(`__components[${JSON.stringify(comp.name)}] = ${code};`);
   }
   mapLines.push(`function __cleanup(start, end) {`);
@@ -41810,7 +42359,7 @@ async function runEventHandlers(handlers, name, ctx2) {
 }
 
 // ../adapter/dist/client-bundle.js
-import { readFileSync as readFileSync20, existsSync as existsSync24, writeFileSync as writeFileSync11, unlinkSync as unlinkSync4, statSync as statSync14, rmSync as rmSync4 } from "node:fs";
+import { readFileSync as readFileSync20, existsSync as existsSync24, writeFileSync as writeFileSync11, unlinkSync as unlinkSync4, statSync as statSync14, rmSync as rmSync4, mkdtempSync as mkdtempSync2 } from "node:fs";
 import { resolve as resolve23, join as join14, dirname as dirname14, relative as relative6, sep as sep3 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 
@@ -42008,8 +42557,126 @@ function demoteExports2(code) {
     code = code.slice(0, e.start) + e.text + code.slice(e.end);
   return code;
 }
-function stripChunkImports2(code) {
-  return demoteExports2(removeCompiledNodes2(code, isAnyImport2));
+function hasChunkImports2(code) {
+  try {
+    const ast = parse4(code);
+    return (ast.body ?? []).some((n) => n.type === "ImportDeclaration");
+  } catch {
+    return false;
+  }
+}
+function resolveImportSource2(src2, filePath) {
+  if (src2.startsWith("./") || src2.startsWith("../")) {
+    return resolve23(dirname14(filePath), src2) + ".ts";
+  }
+  return src2;
+}
+var ChunkImports2 = class {
+  bySource = /* @__PURE__ */ new Map();
+  aborted = false;
+  abortReason = null;
+  fail(reason, code) {
+    if (!this.aborted) {
+      this.aborted = true;
+      this.abortReason = reason;
+    }
+    return code;
+  }
+  /** Folds one file's imports into the merged set and returns the code with its imports stripped. */
+  add(code, filePath) {
+    if (!code || this.aborted)
+      return code;
+    let ast;
+    try {
+      ast = parse4(code);
+    } catch {
+      return this.fail(`unparseable contribution from ${filePath}`, code);
+    }
+    const body = ast.body ?? [];
+    const ranges = [];
+    for (const raw2 of body) {
+      const node = raw2;
+      if (node.type !== "ImportDeclaration" || typeof node.start !== "number" || typeof node.end !== "number")
+        continue;
+      const src2 = node.source?.value;
+      if (typeof src2 !== "string")
+        continue;
+      const resolved = resolveImportSource2(src2, filePath);
+      let group = this.bySource.get(resolved);
+      if (!group) {
+        group = { named: /* @__PURE__ */ new Map() };
+        this.bySource.set(resolved, group);
+      }
+      for (const spec of node.specifiers ?? []) {
+        const s = spec;
+        const local = s.local?.name;
+        if (typeof local !== "string")
+          return this.fail(`nameless specifier from '${resolved}' in ${filePath}`, code);
+        if (s.type === "ImportDefaultSpecifier") {
+          if (group.default && group.default.local !== local)
+            return this.fail(`conflicting default imports from '${resolved}' in ${filePath}`, code);
+          group.default = { kind: "default", local };
+        } else if (s.type === "ImportNamespaceSpecifier") {
+          if (group.namespace && group.namespace.local !== local)
+            return this.fail(`conflicting namespace imports from '${resolved}' in ${filePath}`, code);
+          group.namespace = { kind: "namespace", local };
+        } else if (s.type === "ImportSpecifier") {
+          const imported = s.imported?.name;
+          if (typeof imported !== "string")
+            return this.fail(`nameless named-import from '${resolved}' in ${filePath}`, code);
+          const existing = group.named.get(imported);
+          if (existing && existing.local !== local)
+            return this.fail(`'${imported}' from '${resolved}' bound to both '${existing.local}' and '${local}' in ${filePath}`, code);
+          group.named.set(imported, { kind: "named", local, imported });
+        }
+      }
+      let cut = node.end;
+      if (code[cut] === ";")
+        cut++;
+      ranges.push([node.start, cut]);
+    }
+    if (ranges.length === 0)
+      return code;
+    return removeRanges2(code, ranges);
+  }
+  /** True when every file parsed and merged cleanly (no conflict, no parse abort). */
+  get ok() {
+    return !this.aborted;
+  }
+  /** Why the merge aborted (null when `ok`). Surfaced by the assembler. */
+  get reason() {
+    return this.abortReason;
+  }
+  /** Renders the deduped import block (empty string when there are no imports). */
+  render() {
+    if (this.aborted || this.bySource.size === 0)
+      return "";
+    const lines = [];
+    const sources = [...this.bySource.keys()].sort();
+    for (const src2 of sources) {
+      const g2 = this.bySource.get(src2);
+      const parts = [];
+      if (g2.default)
+        parts.push(`import ${g2.default.local} from ${JSON.stringify(src2)}`);
+      if (g2.namespace)
+        parts.push(`import * as ${g2.namespace.local} from ${JSON.stringify(src2)}`);
+      const named = [...g2.named.values()].sort((a, b) => a.imported < b.imported ? -1 : 1);
+      if (named.length > 0) {
+        const specs = named.map((sp) => sp.imported === sp.local ? sp.local : `${sp.imported} as ${sp.local}`).join(", ");
+        parts.push(`import { ${specs} } from ${JSON.stringify(src2)}`);
+      }
+      lines.push(parts.join("\n"));
+    }
+    return lines.join("\n");
+  }
+};
+function removeRanges2(code, ranges) {
+  const sorted = [...ranges].sort((a, b) => b[0] - a[0]);
+  let out = code;
+  for (const [start, end] of sorted) {
+    out = out.slice(0, start) + out.slice(end);
+  }
+  return out.trim();
 }
 function scopeFileContribution2(code) {
   const head = extractCompiledNodes2(code, isModuleLevel2);
@@ -42115,7 +42782,7 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options2)
   function stripExports(code) {
     return removeCompiledNodes2(code, isComponentExport2);
   }
-  function compileFile2(filePath, resolvedName, output) {
+  function compileFile2(filePath, resolvedName, output, imports) {
     if (seen.has(filePath))
       return;
     seen.add(filePath);
@@ -42134,8 +42801,10 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options2)
     if (cached && cacheUsable) {
       cachedFileHits++;
       for (const dep of cached.imports)
-        compileFile2(dep, cache2?.files.get(dep)?.actualName ?? "", output);
-      const cachedFileCode = [cached.compCode, cached.hydCode].filter(Boolean).join("\n");
+        compileFile2(dep, cache2?.files.get(dep)?.actualName ?? "", output, imports);
+      const cachedComp = cached.compCode ? imports.add(cached.compCode, filePath).replace(/^\n+/, "").replace(/\n+$/, "") : "";
+      const cachedHyd = cached.hydCode ? imports.add(cached.hydCode, filePath).replace(/__components/g, "__hydrators").replace(/^\n+/, "").replace(/\n+$/, "") : "";
+      const cachedFileCode = [cachedComp, cachedHyd].filter(Boolean).join("\n");
       if (cachedFileCode.trim())
         output.push(scopeFileContribution2(cachedFileCode));
       for (const n of cached.runtimeNames)
@@ -42152,10 +42821,12 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options2)
       src2 = inlineMdContentAttrs(src2, dirname14(filePath), guessProjectRoots(appDir));
     }
     const namesBefore = cache2 ? new Set(runtimeImportNames) : null;
-    const importedPaths = resolveVskImports(filePath, (p, n) => compileFile2(p, n || "", output));
+    const importedPaths = resolveVskImports(filePath, (p, n) => compileFile2(p, n, output, imports));
     const { comp: rawComp, hyd: rawHyd, name: actualName } = compileClientBoth(src2, null, filePath);
-    const compCode = rawComp ? stripChunkImports2(stripExports(stripVskImports(stripRuntimeImport(rawComp)))).replace(/^\n+/, "").replace(/\n+$/, "") : "";
-    const hydCode = rawHyd ? stripChunkImports2(stripExports(stripVskImports(stripRuntimeImport(rawHyd)))).replace(/__components/g, "__hydrators").replace(/^\n+/, "").replace(/\n+$/, "") : "";
+    const compWithImports = rawComp ? stripExports(stripVskImports(stripRuntimeImport(rawComp))) : "";
+    const hydWithImports = rawHyd ? stripExports(stripVskImports(stripRuntimeImport(rawHyd))) : "";
+    const compCode = compWithImports ? imports.add(compWithImports, filePath).replace(/^\n+/, "").replace(/\n+$/, "") : "";
+    const hydCode = hydWithImports ? imports.add(hydWithImports, filePath).replace(/__components/g, "__hydrators").replace(/^\n+/, "").replace(/\n+$/, "") : "";
     if (rawComp)
       collectRuntimeImports(rawComp);
     if (rawHyd)
@@ -42176,8 +42847,8 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options2)
       cache2.files.set(filePath, {
         mtimeMs: st.mtimeMs,
         size: st.size,
-        compCode,
-        hydCode,
+        compCode: compWithImports,
+        hydCode: hydWithImports,
         actualName,
         runtimeNames: [...runtimeImportNames].filter((n) => !namesBefore.has(n)),
         imports: importedPaths
@@ -42209,37 +42880,42 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options2)
     let walkSplit2 = function(nodes, _chain) {
       for (const node of nodes) {
         const chunkCode = [];
+        const chunkImports = new ChunkImports2();
         const pagePath = resolve23(appDir, node.sourceDir, "page.vsk");
         if (node.page && existsSync24(pagePath)) {
-          compileFile2(pagePath, node.page, chunkCode);
+          compileFile2(pagePath, node.page, chunkCode, chunkImports);
         }
         const layoutPath = resolve23(appDir, node.sourceDir, "layout.vsk");
         if (node.layout && existsSync24(layoutPath)) {
-          compileFile2(layoutPath, node.layout, chunkCode);
+          compileFile2(layoutPath, node.layout, chunkCode, chunkImports);
         }
         const errorPath = resolve23(appDir, node.sourceDir, "error.vsk");
         if (node.error && existsSync24(errorPath)) {
-          compileFile2(errorPath, node.error, chunkCode);
+          compileFile2(errorPath, node.error, chunkCode, chunkImports);
         }
         const notFoundPath = resolve23(appDir, node.sourceDir, "not-found.vsk");
         if (node.notFound && existsSync24(notFoundPath)) {
-          compileFile2(notFoundPath, node.notFound, chunkCode);
+          compileFile2(notFoundPath, node.notFound, chunkCode, chunkImports);
         }
         const offlinePath = resolve23(appDir, node.sourceDir, "offline.vsk");
         if (node.offline && existsSync24(offlinePath)) {
-          compileFile2(offlinePath, node.offline, chunkCode);
+          compileFile2(offlinePath, node.offline, chunkCode, chunkImports);
         }
         const networkPath = resolve23(appDir, node.sourceDir, "network.vsk");
         if (node.network && existsSync24(networkPath)) {
-          compileFile2(networkPath, node.network, chunkCode);
+          compileFile2(networkPath, node.network, chunkCode, chunkImports);
         }
         const loadingPath = resolve23(appDir, node.sourceDir, "loading.vsk");
         if (node.loading && existsSync24(loadingPath)) {
-          compileFile2(loadingPath, node.loading, chunkCode);
+          compileFile2(loadingPath, node.loading, chunkCode, chunkImports);
         }
         if (chunkCode.length > 0) {
           const chunkName = `page-${buildChunkName(node)}.js`;
-          chunkEntries.push({ name: chunkName, code: chunkCode.join("\n\n"), node });
+          if (!chunkImports.ok)
+            console.error("[vesk] chunk import merge aborted for", chunkName + ":", chunkImports.reason);
+          const head = chunkImports.render();
+          const code = (head ? head + "\n\n" : "") + chunkCode.join("\n\n");
+          chunkEntries.push({ name: chunkName, code, node });
         }
         walkSplit2(node.children || [], [..._chain, node]);
       }
@@ -42256,25 +42932,62 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options2)
     const chunkEntries = [];
     walkSplit2(routeTree, []);
     const sharedCode = [];
+    const sharedImports = new ChunkImports2();
     const compMap = componentMap || /* @__PURE__ */ new Map();
     for (const [compName, compPath] of compMap) {
-      compileFile2(compPath, compName, sharedCode);
+      compileFile2(compPath, compName, sharedCode, sharedImports);
     }
     if (sharedCode.length > 0) {
-      chunkEntries.push({ name: "shared.js", code: sharedCode.join("\n\n"), node: null });
+      if (!sharedImports.ok)
+        console.error("[vesk] chunk import merge aborted for shared.js:", sharedImports.reason);
+      const head = sharedImports.render();
+      const code = (head ? head + "\n\n" : "") + sharedCode.join("\n\n");
+      chunkEntries.push({ name: "shared.js", code, node: null });
     }
-    for (const entry of chunkEntries) {
-      if (entry.code.trim()) {
-        chunks.push({
-          name: entry.name,
-          code: `(()=>{
+    const chunkIIFE = (body) => `(()=>{
 const __components = globalThis.__components || (globalThis.__components = {});
 const __hydrators = globalThis.__hydrators || (globalThis.__hydrators = {});
-${entry.code}
+${body}
 })();
-`
-        });
+`;
+    for (const entry of chunkEntries) {
+      if (!entry.code.trim())
+        continue;
+      let finalCode;
+      if (hasChunkImports2(entry.code)) {
+        const tmpBase = mkdtempSync2(join14(resolve23(appDir, ".."), "tmp-vesk-chunk-"));
+        const tmpFile = join14(tmpBase, "entry.js");
+        const toBundle = `const __components = globalThis.__components || (globalThis.__components = {});
+const __hydrators = globalThis.__hydrators || (globalThis.__hydrators = {});
+${entry.code}
+`;
+        writeFileSync11(tmpFile, toBundle);
+        try {
+          const result2 = await build3({
+            entryPoints: [tmpFile],
+            bundle: true,
+            format: "iife",
+            platform: "browser",
+            write: false,
+            logLevel: "silent",
+            loader: { ".js": "tsx" }
+          });
+          finalCode = result2.outputFiles[0].text;
+        } catch (e) {
+          const err = e;
+          console.error("[vesk] chunk bundle failed", entry.name, err?.errors?.map((x) => x.text).join(" | ") || err?.message || String(e));
+          const stripped = demoteExports2(removeCompiledNodes2(entry.code, isAnyImport2));
+          finalCode = chunkIIFE(stripped);
+        } finally {
+          try {
+            rmSync4(tmpBase, { recursive: true, force: true });
+          } catch {
+          }
+        }
+      } else {
+        finalCode = chunkIIFE(entry.code);
       }
+      chunks.push({ name: entry.name, code: finalCode });
     }
     annotate2(routeTree);
     const mainKey = JSON.stringify(routeTree) + "|" + [...runtimeImportNames].sort().join(",") + `|${!!options2?.hmr}|${!!options2?.importRuntime}|${options2?.routeDataCache ?? ""}`;
@@ -43641,7 +44354,7 @@ var __internals2 = {
 };
 
 // ../adapter/dist/dev-config.js
-import { existsSync as existsSync27, readFileSync as readFileSync23, writeFileSync as writeFileSync13, mkdirSync as mkdirSync10, mkdtempSync, rmSync as rmSync5 } from "node:fs";
+import { existsSync as existsSync27, readFileSync as readFileSync23, writeFileSync as writeFileSync13, mkdirSync as mkdirSync10, mkdtempSync as mkdtempSync3, rmSync as rmSync5 } from "node:fs";
 import { tmpdir } from "node:os";
 import { resolve as resolve26, dirname as dirname16, join as join16 } from "node:path";
 init_parser();
@@ -43672,7 +44385,7 @@ async function parseConfigSource(source, isTs, projectDir2) {
 ` + js;
   }
   const base = projectDir2 ? (mkdirSync10(join16(projectDir2, ".vesk"), { recursive: true }), join16(projectDir2, ".vesk")) : void 0;
-  const dir = base ? mkdtempSync(join16(base, "cfg-")) : mkdtempSync(join16(tmpdir(), "vesk-cfg-"));
+  const dir = base ? mkdtempSync3(join16(base, "cfg-")) : mkdtempSync3(join16(tmpdir(), "vesk-cfg-"));
   const tmpFile = join16(dir, "config.mjs");
   try {
     writeFileSync13(tmpFile, js, "utf-8");
@@ -43828,10 +44541,54 @@ function tryParseJsObject(src2) {
   }
   return out;
 }
+function skipBalancedParens(src2, i) {
+  if (src2[i] !== "(")
+    return i;
+  let depth = 0;
+  let inStr = null;
+  let esc = false;
+  for (let j = i; j < src2.length; j++) {
+    const ch = src2[j];
+    if (inStr) {
+      if (esc) {
+        esc = false;
+        continue;
+      }
+      if (ch === "\\") {
+        esc = true;
+        continue;
+      }
+      if (ch === inStr)
+        inStr = null;
+      continue;
+    }
+    if (ch === '"' || ch === "'" || ch === "`") {
+      inStr = ch;
+      continue;
+    }
+    if (ch === "(")
+      depth++;
+    if (ch === ")") {
+      depth--;
+      if (depth === 0)
+        return j + 1;
+    }
+  }
+  return i;
+}
+function rawSpan(src2, from, to) {
+  return { value: { __veskRaw: src2.slice(from, to) }, next: to };
+}
 function parseLiteralValue(src2, i) {
   const c = src2[i];
   if (c === void 0)
     return null;
+  if (c === "." && src2.slice(i, i + 3) === "...") {
+    const expr = parseLiteralValue(src2, i + 3);
+    if (expr === null || expr.__invalid)
+      return rawSpan(src2, i, skipToEndOfRaw(src2, i + 3));
+    return { value: { __veskRaw: "..." + serializeValue(expr.value) }, next: expr.next };
+  }
   if (c === "{") {
     const end = findMatchingBrace(src2, i);
     if (end === -1)
@@ -43857,8 +44614,9 @@ function parseLiteralValue(src2, i) {
         continue;
       }
       const r = parseLiteralValue(src2, j2);
-      if (r === null || r.__invalid)
-        return { value: void 0, next: i, __invalid: true };
+      if (r === null || r.__invalid) {
+        return rawSpan(src2, i, skipToEndOfArray(src2, i));
+      }
       vals.push(r.value);
       j2 = r.next;
     }
@@ -43886,8 +44644,82 @@ function parseLiteralValue(src2, i) {
     return { value: null, next: j };
   if (/^-?\d+(\.\d+)?([eE][+-]?\d+)?$/.test(token))
     return { value: Number(token), next: j };
+  if (j < src2.length && src2[j] === "(") {
+    const end = skipBalancedParens(src2, j);
+    return rawSpan(src2, i, end);
+  }
+  if (token.length > 0)
+    return rawSpan(src2, i, j);
   return { value: void 0, next: i, __invalid: true };
 }
+function skipToEndOfRaw(src2, i) {
+  let depth = 0;
+  let inStr = null;
+  let esc = false;
+  for (let j = i; j < src2.length; j++) {
+    const ch = src2[j];
+    if (inStr) {
+      if (esc) {
+        esc = false;
+        continue;
+      }
+      if (ch === "\\") {
+        esc = true;
+        continue;
+      }
+      if (ch === inStr)
+        inStr = null;
+      continue;
+    }
+    if (ch === '"' || ch === "'" || ch === "`") {
+      inStr = ch;
+      continue;
+    }
+    if (ch === "(")
+      depth++;
+    if (ch === ")") {
+      if (depth === 0)
+        return j;
+      depth--;
+    }
+    if (depth === 0 && (ch === "," || ch === "}" || ch === "]"))
+      return j;
+  }
+  return src2.length;
+}
+function skipToEndOfArray(src2, i) {
+  let depth = 0;
+  let inStr = null;
+  let esc = false;
+  for (let j = i; j < src2.length; j++) {
+    const ch = src2[j];
+    if (inStr) {
+      if (esc) {
+        esc = false;
+        continue;
+      }
+      if (ch === "\\") {
+        esc = true;
+        continue;
+      }
+      if (ch === inStr)
+        inStr = null;
+      continue;
+    }
+    if (ch === '"' || ch === "'" || ch === "`") {
+      inStr = ch;
+      continue;
+    }
+    if (ch === "[")
+      depth++;
+    if (ch === "]") {
+      depth--;
+      if (depth === 0)
+        return j + 1;
+    }
+  }
+  return src2.length;
+}
 function serializeObject(obj) {
   return Object.keys(obj).map((k) => `${isBareKey(k) ? k : JSON.stringify(k)}: ${serializeValue(obj[k])}`).join(", ");
 }
@@ -43895,6 +44727,9 @@ function isBareKey(k) {
   return /^[a-zA-Z_$][\w$]*$/.test(k);
 }
 function serializeValue(v) {
+  if (v !== null && typeof v === "object" && "__veskRaw" in v) {
+    return String(v.__veskRaw);
+  }
   if (v === null)
     return "null";
   if (typeof v === "string")
@@ -45136,7 +45971,7 @@ import { readFileSync as readFileSync26, writeFileSync as writeFileSync15, exist
 import { resolve as resolve29, dirname as dirname18 } from "node:path";
 var DEFAULT_CONFIG = {
   provider: "openai",
-  model: "gpt-4o-mini",
+  model: "",
   mode: "explore",
   maxSteps: 25
 };
@@ -47338,10 +48173,8 @@ function createVeskTools(deps) {
 }
 
 // ../adapter/dist/css.js
-init_scan();
 import { readFileSync as readFileSync29, existsSync as existsSync33 } from "node:fs";
 import { resolve as resolve32 } from "node:path";
-var TAILWIND_CSS_URL2 = "/_vesk/static/_tailwind.css";
 var GLOBAL_CSS_URL2 = "/_vesk/static/global.css";
 function resolveUserCssPath2(appDir) {
   const cssSrc = resolve32(appDir, "..", "src", "global.css");
@@ -47352,38 +48185,13 @@ function resolveUserCssPath2(appDir) {
     return altCssSrc;
   return null;
 }
-function hasUserCss2(appDir) {
+function hasUserCss(appDir) {
   return resolveUserCssPath2(appDir) !== null;
 }
-function isTailwindPlugin2(plugins) {
-  return (plugins || []).some((p) => String(p && p.name).toLowerCase().includes("tailwind"));
-}
 function resolveCssUrls2(opts) {
-  const urls = [];
-  if (opts.tailwind)
-    urls.push(TAILWIND_CSS_URL2);
-  if (opts.userCss)
-    urls.push(GLOBAL_CSS_URL2);
-  return urls;
-}
-function stripTailwindDirectives2(css) {
-  const blockStart = /^\s*@(theme\s*\{|layer\s+(components|utilities)\s*\{|utility\s+[\w-]+\s*\{)/;
-  let result2 = css.replace(/^\s*@import\s+['"]tailwindcss['"]\s*;?\s*$/gm, "");
-  result2 = result2.replace(/^\s*@source\s+['"][^'"]+['"]\s*;?\s*$/gm, "");
-  const output = [];
-  let pos = 0;
-  while (pos < result2.length) {
-    const lineEnd = result2.indexOf("\n", pos) === -1 ? result2.length : result2.indexOf("\n", pos) + 1;
-    const line = result2.slice(pos, lineEnd);
-    if (blockStart.test(line.trim())) {
-      const end = cssBlockEnd(result2, pos);
-      pos = end;
-      continue;
-    }
-    output.push(line);
-    pos = lineEnd;
-  }
-  return output.join("").trim();
+  if (opts.enabled)
+    return [GLOBAL_CSS_URL2];
+  return [];
 }
 
 // ../adapter/dist/hmr.js
@@ -47789,7 +48597,7 @@ if (process.argv[1] && resolve34(process.argv[1]) === fileURLToPath8(import.meta
 
 // src/action-handler.ts
 import { existsSync as existsSync36, readFileSync as readFileSync32, readdirSync as readdirSync12 } from "node:fs";
-import { resolve as resolve35, join as join20 } from "node:path";
+import { resolve as resolve35 } from "node:path";
 
 // ../compiler/dist/server-cookies.js
 function parseCookies3(str3) {
@@ -47843,21 +48651,7 @@ function issuesToFieldMap2(issues) {
 
 // src/action-handler.ts
 function actionCssUrls(appDirPath) {
-  let tailwind = true;
-  try {
-    const veskDir = join20(resolve35(appDirPath, ".."), ".vesk");
-    const statePath = join20(veskDir, "plugins.json");
-    if (existsSync36(statePath)) {
-      const raw2 = readFileSync32(statePath, "utf-8");
-      const state = JSON.parse(raw2);
-      const entries = state?.plugins || [];
-      tailwind = !entries.some(
-        (p) => String(p.name).toLowerCase().includes("tailwind") && p.active === false
-      );
-    }
-  } catch {
-  }
-  return resolveCssUrls2({ tailwind, userCss: hasUserCss2(appDirPath) });
+  return resolveCssUrls2({ enabled: hasUserCss(appDirPath) });
 }
 function actionCssLinkTags(appDirPath) {
   return actionCssUrls(appDirPath).map((u) => `	<link rel="stylesheet" href="${u}" />`).join("\n") + "\n";
@@ -48198,9 +48992,9 @@ function resolveRuntimeDir(projectDir2) {
     resolve36(import.meta.dirname ?? ".", "..", "..", "runtime", "dist")
   ];
   for (const dir of candidates) {
-    if (existsSync37(join21(dir, "ripple-runtime.js"))) return dir;
-    const distDir = join21(dir, "dist");
-    if (existsSync37(join21(distDir, "ripple-runtime.js"))) return distDir;
+    if (existsSync37(join20(dir, "ripple-runtime.js"))) return dir;
+    const distDir = join20(dir, "dist");
+    if (existsSync37(join20(distDir, "ripple-runtime.js"))) return distDir;
   }
   return null;
 }
@@ -48264,14 +49058,17 @@ async function readBodyJson(req, maxBodyBytes2) {
 }
 var DevBodyTooLargeError = class extends Error {
 };
-function defaultAgenticModel(providerName) {
-  return providerName === "anthropic" ? "claude-sonnet-4-6" : providerName === "google" ? "gemini-2.0-flash" : providerName === "ollama" ? "llama3.1" : providerName === "opencode" ? "claude-sonnet-4-6" : providerName === "opencode-go" ? "opencode-go/kimi-k3" : providerName === "openrouter" ? "openrouter/auto" : "gpt-4o-mini";
+function defaultAgenticModel(_providerName) {
+  return "";
 }
 async function buildAgenticProvider(projectDir2, providerConfig) {
   const cfg = providerConfig || {};
   const providerName = String(cfg.provider || loadAgenticConfig(projectDir2).provider || "openai");
   const apiKey = cfg.apiKey || getApiKey(projectDir2, providerName) || "";
   const model = cfg.model || loadAgenticConfig(projectDir2).model || defaultAgenticModel(providerName);
+  if (!model) {
+    throw new Error("no model configured \u2014 open Settings \u2192 Agentic and pick a model");
+  }
   const baseUrl = cfg.baseUrl || loadAgenticConfig(projectDir2).baseUrl || void 0;
   const maxTokens = typeof cfg.maxTokens === "number" ? cfg.maxTokens : void 0;
   let provider;
@@ -48353,7 +49150,7 @@ function countFilesNamed(dir, name) {
   if (!existsSync37(dir)) return 0;
   let n = 0;
   for (const entry of readdirSync13(dir, { withFileTypes: true })) {
-    const p = join21(dir, entry.name);
+    const p = join20(dir, entry.name);
     if (entry.isDirectory()) n += countFilesNamed(p, name);
     else if (entry.name === name) n++;
   }
@@ -48364,8 +49161,8 @@ async function startDevServer(port2, projectDir2, config, host2) {
   if (!process.env.NODE_ENV) process.env.NODE_ENV = "development";
   const secCfg = config.security || {};
   const maxBodyBytes2 = (typeof secCfg.maxBodyBytes === "number" ? secCfg.maxBodyBytes : void 0) || DEFAULT_MAX_BODY_BYTES;
-  const appDirPath = join21(projectDir2, "app");
-  const publicDir = join21(projectDir2, "public");
+  const appDirPath = join20(projectDir2, "app");
+  const publicDir = join20(projectDir2, "public");
   installMdReadHook2([publicDir]);
   try {
     ensurePackagesBuilt();
@@ -48378,7 +49175,7 @@ async function startDevServer(port2, projectDir2, config, host2) {
     process.exit(1);
   }
   const runtimeDir = runtimeDirUnchecked;
-  const veskStateDir = join21(projectDir2, ".vesk");
+  const veskStateDir = join20(projectDir2, ".vesk");
   const configPluginsRaw = config.plugins || [];
   const configPluginNames = configPluginsRaw.map((p) => typeof p === "string" ? p : p?.name).filter((n) => !!n);
   const rawDevPlugins = config.plugins || [];
@@ -48467,25 +49264,19 @@ async function startDevServer(port2, projectDir2, config, host2) {
       }
     }
   }
-  function isTailwindActive() {
-    return isTailwindPlugin2(getActiveDevPlugins());
-  }
   function activeCssUrls() {
     return resolveCssUrls2({
-      tailwind: isTailwindActive(),
-      userCss: hasUserCss2(appDirPath)
+      enabled: hasUserCss(appDirPath)
     });
   }
   function cssLinkTags() {
     return activeCssUrls().map((u) => `	<link rel="stylesheet" href="${u}" />`).join("\n") + "\n";
   }
-  let devUserCssContent = "";
-  let devTailwindCssContent = "";
+  let devGlobalCssContent = "";
   let lastServedCssGlobal = "";
-  let lastServedCssTailwind = "";
-  const srcDir = join21(projectDir2, "src");
-  const cssPath = join21(srcDir, "global.css");
-  const altCssPath = join21(srcDir, "app.css");
+  const srcDir = join20(projectDir2, "src");
+  const cssPath = join20(srcDir, "global.css");
+  const altCssPath = join20(srcDir, "app.css");
   let rawCss = "";
   if (existsSync37(cssPath)) {
     rawCss = readFileSync33(cssPath, "utf-8");
@@ -48499,25 +49290,16 @@ async function startDevServer(port2, projectDir2, config, host2) {
         await plugin.onBuildStart();
       }
     }
-    devUserCssContent = stripTailwindDirectives2(rawCss);
-    if (!isTailwindActive()) {
-      devTailwindCssContent = "";
-    } else {
-      devTailwindCssContent = rawCss;
-      for (const plugin of activeAtStart) {
-        if (typeof plugin.onCSS === "function") {
-          const result2 = await plugin.onCSS(rawCss, cssPath);
-          if (result2 !== null && typeof result2 === "string") {
-            devTailwindCssContent = result2;
-          }
+    devGlobalCssContent = rawCss;
+    for (const plugin of activeAtStart) {
+      if (typeof plugin.onCSS === "function") {
+        const result2 = await plugin.onCSS(rawCss, cssPath);
+        if (result2 !== null && typeof result2 === "string") {
+          devGlobalCssContent = result2;
         }
       }
-      if (devUserCssContent === devTailwindCssContent || devUserCssContent === rawCss) {
-        devTailwindCssContent = devUserCssContent;
-      }
     }
-    lastServedCssGlobal = devUserCssContent;
-    lastServedCssTailwind = devTailwindCssContent;
+    lastServedCssGlobal = devGlobalCssContent;
   }
   let routeTree = scanRoutes(appDirPath);
   let clientBundle = "";
@@ -48710,30 +49492,19 @@ async function startDevServer(port2, projectDir2, config, host2) {
   async function rebuildTailwindCss() {
     if (!rawCss) return false;
     try {
-      const nextUser = stripTailwindDirectives2(rawCss);
-      let nextTailwind;
-      if (!isTailwindActive()) {
-        nextTailwind = "";
-      } else {
-        const active = getActiveDevPlugins();
-        nextTailwind = rawCss;
-        for (const plugin of active) {
-          if (typeof plugin.onCSS === "function") {
-            const result2 = await plugin.onCSS(rawCss, cssPath);
-            if (result2 !== null && typeof result2 === "string") {
-              nextTailwind = result2;
-            }
+      let nextGlobal = rawCss;
+      const active = getActiveDevPlugins();
+      for (const plugin of active) {
+        if (typeof plugin.onCSS === "function") {
+          const result2 = await plugin.onCSS(rawCss, cssPath);
+          if (result2 !== null && typeof result2 === "string") {
+            nextGlobal = result2;
           }
         }
-        if (nextUser === nextTailwind || nextUser === rawCss) {
-          nextTailwind = nextUser;
-        }
       }
-      const changed = nextUser !== lastServedCssGlobal || nextTailwind !== lastServedCssTailwind;
-      devUserCssContent = nextUser;
-      devTailwindCssContent = nextTailwind;
-      lastServedCssGlobal = nextUser;
-      lastServedCssTailwind = nextTailwind;
+      const changed = nextGlobal !== lastServedCssGlobal;
+      devGlobalCssContent = nextGlobal;
+      lastServedCssGlobal = nextGlobal;
       return changed;
     } catch (e) {
       LOG.err(`CSS rebuild error:`, e.message);
@@ -48744,181 +49515,181 @@ async function startDevServer(port2, projectDir2, config, host2) {
   try {
     let debounceTimer = null;
     let cssDebounceTimer = null;
-    const watchDirs = [appDirPath];
-    if (existsSync37(srcDir)) watchDirs.push(srcDir);
-    for (const watchDir of watchDirs) {
-      watch(watchDir, { recursive: true }, (eventType, filename) => {
-        if (!filename) return;
-        const isVsk = filename.endsWith(".vsk") || filename.endsWith(".md") || filename.endsWith(".markdown");
-        const isCss = filename.endsWith(".css");
-        const isApiRoute = filename.endsWith(".ts") || filename.endsWith(".js") || filename.endsWith(".tsx");
-        const isEvents = filename === "_events.ts" || filename === "_events.js";
-        if (!isVsk && !isCss && !isApiRoute && !isEvents) return;
-        const fullPath = filename.startsWith("/") ? filename : join21(watchDir, filename);
-        const fileExists = existsSync37(fullPath);
-        if (isEvents) {
-          if (debounceTimer) clearTimeout(debounceTimer);
-          debounceTimer = setTimeout(async () => {
-            try {
-              await runAppStop(false);
-              await reloadAppEvents();
-              await runAppStart(false);
-              const bcast = globalThis.__vesk_broadcastHmr;
-              if (typeof bcast === "function") bcast({ type: "reload" });
-              LOG.info(`events reloaded (${filename})`);
-            } catch (e) {
-              LOG.err(`events reload error: ${e.message}`);
+    const skipDirs = /* @__PURE__ */ new Set(["node_modules", ".vesk", "tarballs"]);
+    const watchDir = projectDir2;
+    watch(watchDir, { recursive: true }, (eventType, filename) => {
+      if (!filename) return;
+      if (skipDirs.has(filename.split("/")[0]) || filename.includes("node_modules/") || filename.includes(".vesk/") || filename.includes("tmp-vesk-chunk-")) return;
+      const isVsk = filename.endsWith(".vsk") || filename.endsWith(".md") || filename.endsWith(".markdown");
+      const isCss = filename.endsWith(".css");
+      const isApiRoute = filename.endsWith(".ts") || filename.endsWith(".js") || filename.endsWith(".tsx");
+      const isEvents = filename === "_events.ts" || filename === "_events.js";
+      if (!isVsk && !isCss && !isApiRoute && !isEvents) return;
+      const fullPath = filename.startsWith("/") ? filename : join20(watchDir, filename);
+      const fileExists = existsSync37(fullPath);
+      if (isEvents) {
+        if (debounceTimer) clearTimeout(debounceTimer);
+        debounceTimer = setTimeout(async () => {
+          try {
+            await runAppStop(false);
+            await reloadAppEvents();
+            await runAppStart(false);
+            const bcast = globalThis.__vesk_broadcastHmr;
+            if (typeof bcast === "function") bcast({ type: "reload" });
+            LOG.info(`events reloaded (${filename})`);
+          } catch (e) {
+            LOG.err(`events reload error: ${e.message}`);
+          }
+        }, HMR_DEBOUNCE_MS);
+      } else if (isVsk) {
+        if (debounceTimer) clearTimeout(debounceTimer);
+        debounceTimer = setTimeout(async () => {
+          const t0 = Date.now();
+          try {
+            if (typeof globalThis.__vesk_broadcastHmr === "function") {
+              globalThis.__vesk_broadcastHmr({ type: "compiling" });
             }
-          }, HMR_DEBOUNCE_MS);
-        } else if (isVsk) {
-          if (debounceTimer) clearTimeout(debounceTimer);
-          debounceTimer = setTimeout(async () => {
-            const t0 = Date.now();
+            const stripAnnots = (t) => JSON.stringify(t, (k, v) => k === "chunk" || k === "chunkError" ? void 0 : v);
+            const prevTree = stripAnnots(routeTree);
+            routeTree = scanRoutes(appDirPath);
+            updateSourceMapping();
+            const changedComponents = sourceToComponents.get(fullPath) || [];
+            const treeChanged = prevTree !== stripAnnots(routeTree);
+            const isOutsideApp = !fullPath.startsWith(appDirPath + "/") && fullPath !== appDirPath;
+            const cssPromise = rebuildTailwindCss();
+            let bundleError = null;
+            let hotEditedSource = null;
+            let hotActualName = null;
             try {
-              if (typeof globalThis.__vesk_broadcastHmr === "function") {
-                globalThis.__vesk_broadcastHmr({ type: "compiling" });
-              }
-              const stripAnnots = (t) => JSON.stringify(t, (k, v) => k === "chunk" || k === "chunkError" ? void 0 : v);
-              const prevTree = stripAnnots(routeTree);
-              routeTree = scanRoutes(appDirPath);
-              updateSourceMapping();
-              const changedComponents = sourceToComponents.get(fullPath) || [];
-              const treeChanged = prevTree !== stripAnnots(routeTree);
-              const cssPromise = rebuildTailwindCss();
-              let bundleError = null;
-              let hotEditedSource = null;
-              let hotActualName = null;
-              try {
-                if (treeChanged) {
-                  await buildClientBundle();
-                  await bundleRuntime2();
-                } else {
-                  const hot = await buildClientChunks(fullPath);
-                  bundleError = hot.err;
-                  hotEditedSource = hot.editedSource;
-                  hotActualName = hot.actualName;
-                }
-              } catch (e) {
-                bundleError = e;
-                LOG.err(`client build error:`, e.message);
+              if (treeChanged || isOutsideApp) {
+                await buildClientBundle();
+                await bundleRuntime2();
+              } else {
+                const hot = await buildClientChunks(fullPath);
+                bundleError = hot.err;
+                hotEditedSource = hot.editedSource;
+                hotActualName = hot.actualName;
               }
-              if (typeof globalThis.__vesk_broadcastHmr === "function") {
-                const hadErrorState = devLastError !== null;
-                if (changedComponents.length > 0) {
-                  let fnSources;
-                  let errorMessage = bundleError ? bundleError.message : "";
-                  if (!treeChanged && !bundleError && hotEditedSource !== null) {
-                    let compCode = hotEditedSource;
-                    for (const cname of changedComponents) {
-                      if (hotActualName && hotActualName !== cname) {
-                        compCode += `
+            } catch (e) {
+              bundleError = e;
+              LOG.err(`client build error:`, e.message);
+            }
+            if (typeof globalThis.__vesk_broadcastHmr === "function") {
+              const hadErrorState = devLastError !== null;
+              if (changedComponents.length > 0) {
+                let fnSources;
+                let errorMessage = bundleError ? bundleError.message : "";
+                if (!treeChanged && !bundleError && hotEditedSource !== null) {
+                  let compCode = hotEditedSource;
+                  for (const cname of changedComponents) {
+                    if (hotActualName && hotActualName !== cname) {
+                      compCode += `
 Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __components[${JSON.stringify(hotActualName)}], configurable: true });
 `;
-                      }
                     }
-                    if (compCode.trim()) fnSources = { _raw: compCode };
-                  } else if (fileExists && !bundleError) {
-                    try {
-                      const src2 = readFileSync33(fullPath, "utf-8");
-                      let compCode = buildHmrEvalSnippet2(
-                        compileClient2(src2, null, { forceClient: true, sourcePath: fullPath, mdRoots: [projectDir2] })
-                      );
-                      const actualName = extractCompName2(src2);
-                      for (const cname of changedComponents) {
-                        if (actualName && actualName !== cname) {
-                          compCode += `
+                  }
+                  if (compCode.trim()) fnSources = { _raw: compCode };
+                } else if (fileExists && !bundleError) {
+                  try {
+                    const src2 = readFileSync33(fullPath, "utf-8");
+                    let compCode = buildHmrEvalSnippet2(
+                      compileClient2(src2, null, { forceClient: true, sourcePath: fullPath, mdRoots: [projectDir2] })
+                    );
+                    const actualName = extractCompName2(src2);
+                    for (const cname of changedComponents) {
+                      if (actualName && actualName !== cname) {
+                        compCode += `
 Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __components[${JSON.stringify(actualName)}], configurable: true });
 `;
-                        }
                       }
-                      if (compCode.trim()) fnSources = { _raw: compCode };
-                    } catch (e) {
-                      errorMessage = e.message;
-                      bundleError = e;
                     }
-                  } else if (!fileExists) {
-                    LOG.warn(`HMR source not found: ${fullPath}`);
+                    if (compCode.trim()) fnSources = { _raw: compCode };
+                  } catch (e) {
+                    errorMessage = e.message;
+                    bundleError = e;
                   }
-                  if (fnSources) {
-                    devLastError = null;
-                    const bcast = globalThis.__vesk_broadcastHmr;
-                    if (hadErrorState) {
-                      bcast({ type: "reload" });
-                    } else {
-                      bcast({
-                        type: "update",
-                        time: Date.now() - t0,
-                        components: Object.fromEntries(changedComponents.map((name) => [name, true])),
-                        fnSources
-                      });
-                    }
-                  } else if (errorMessage) {
-                    const payload = buildDevErrorPayload({
-                      err: bundleError,
-                      errorMessage,
-                      filename,
-                      fullPath,
-                      appDir: appDirPath,
-                      fileExists
-                    });
-                    const displayFile = payload.file || filename || "";
-                    LOG.err(`[vsk:error] ${displayFile}${payload.line ? `:${payload.line}:${payload.column || 1}` : ""} \u2014 ${payload.message}`);
-                    devLastError = payload;
-                    recordDiagnostic({
-                      severity: "error",
-                      code: "HMR_COMPILE",
-                      file: displayFile || null,
-                      line: payload.line,
-                      column: payload.column,
-                      message: payload.message,
-                      hint: payload.tips && payload.tips[0] || null
-                    });
-                    globalThis.__vesk_broadcastHmr({
-                      type: "error",
-                      ...payload
-                    });
+                } else if (!fileExists) {
+                  LOG.warn(`HMR source not found: ${fullPath}`);
+                }
+                if (fnSources) {
+                  devLastError = null;
+                  const bcast = globalThis.__vesk_broadcastHmr;
+                  if (hadErrorState) {
+                    bcast({ type: "reload" });
                   } else {
-                    devLastError = null;
-                    globalThis.__vesk_broadcastHmr({ type: "reload" });
+                    bcast({
+                      type: "update",
+                      time: Date.now() - t0,
+                      components: Object.fromEntries(changedComponents.map((name) => [name, true])),
+                      fnSources
+                    });
                   }
+                } else if (errorMessage) {
+                  const payload = buildDevErrorPayload({
+                    err: bundleError,
+                    errorMessage,
+                    filename,
+                    fullPath,
+                    appDir: appDirPath,
+                    fileExists
+                  });
+                  const displayFile = payload.file || filename || "";
+                  LOG.err(`[vsk:error] ${displayFile}${payload.line ? `:${payload.line}:${payload.column || 1}` : ""} \u2014 ${payload.message}`);
+                  devLastError = payload;
+                  recordDiagnostic({
+                    severity: "error",
+                    code: "HMR_COMPILE",
+                    file: displayFile || null,
+                    line: payload.line,
+                    column: payload.column,
+                    message: payload.message,
+                    hint: payload.tips && payload.tips[0] || null
+                  });
+                  globalThis.__vesk_broadcastHmr({
+                    type: "error",
+                    ...payload
+                  });
                 } else {
                   devLastError = null;
                   globalThis.__vesk_broadcastHmr({ type: "reload" });
                 }
+              } else {
+                devLastError = null;
+                globalThis.__vesk_broadcastHmr({ type: "reload" });
               }
-              const cssChanged = await cssPromise;
-              if (cssChanged && typeof globalThis.__vesk_broadcastHmr === "function") {
-                globalThis.__vesk_broadcastHmr({ type: "css-update" });
-              }
-              LOG.info(`rebuilt (${filename}) \u2014 ${Date.now() - t0}ms`);
-            } catch (e) {
-              LOG.err(`rebuild error:`, e.message);
             }
-          }, HMR_DEBOUNCE_MS);
-        } else if (isCss) {
-          if (cssDebounceTimer) clearTimeout(cssDebounceTimer);
-          cssDebounceTimer = setTimeout(async () => {
-            try {
-              if (fileExists) {
-                rawCss = readFileSync33(fullPath, "utf-8");
-              }
-              const cssChanged = await rebuildTailwindCss();
-              if (cssChanged && typeof globalThis.__vesk_broadcastHmr === "function") {
-                globalThis.__vesk_broadcastHmr({ type: "css-update" });
-              }
-              LOG.info("CSS rebuilt");
-            } catch (e) {
-              LOG.err(`CSS rebuild error:`, e.message);
+            const cssChanged = await cssPromise;
+            if (cssChanged && typeof globalThis.__vesk_broadcastHmr === "function") {
+              globalThis.__vesk_broadcastHmr({ type: "css-update" });
             }
-          }, HMR_DEBOUNCE_MS);
-        } else if (isApiRoute) {
-          const isInApi = fullPath.includes("/api/");
-          if (isInApi && fileExists) {
-            apiWatchCache.set(fullPath, Date.now());
+            LOG.info(`rebuilt (${filename}) \u2014 ${Date.now() - t0}ms`);
+          } catch (e) {
+            LOG.err(`rebuild error:`, e.message);
           }
+        }, HMR_DEBOUNCE_MS);
+      } else if (isCss) {
+        if (cssDebounceTimer) clearTimeout(cssDebounceTimer);
+        cssDebounceTimer = setTimeout(async () => {
+          try {
+            if (fileExists) {
+              rawCss = readFileSync33(fullPath, "utf-8");
+            }
+            const cssChanged = await rebuildTailwindCss();
+            if (cssChanged && typeof globalThis.__vesk_broadcastHmr === "function") {
+              globalThis.__vesk_broadcastHmr({ type: "css-update" });
+            }
+            LOG.info("CSS rebuilt");
+          } catch (e) {
+            LOG.err(`CSS rebuild error:`, e.message);
+          }
+        }, HMR_DEBOUNCE_MS);
+      } else if (isApiRoute) {
+        const isInApi = fullPath.includes("/api/");
+        if (isInApi && fileExists) {
+          apiWatchCache.set(fullPath, Date.now());
         }
-      });
-    }
+      }
+    });
   } catch (e) {
     LOG.warn("file watching unavailable, serving without auto-rebuild");
   }
@@ -48926,6 +49697,8 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
     ".svg": "image/svg+xml",
     ".css": "text/css",
     "": "application/javascript",
+    ".js": "application/javascript",
+    ".mjs": "application/javascript",
     ".png": "image/png",
     ".jpg": "image/jpeg",
     ".ico": "image/x-icon",
@@ -48933,8 +49706,8 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
     ".json": "application/json",
     ".webmanifest": "application/manifest+json"
   };
-  const hmrJsPath = join21(runtimeDir, "hmr-client.js");
-  const hmrTsPath = join21(runtimeDir, "hmr-client.ts");
+  const hmrJsPath = join20(runtimeDir, "hmr-client.js");
+  const hmrTsPath = join20(runtimeDir, "hmr-client.ts");
   const hmrClientPath = existsSync37(hmrJsPath) ? hmrJsPath : existsSync37(hmrTsPath) ? hmrTsPath : null;
   function extractCompName2(src2) {
     return resolveComponentName(src2);
@@ -49026,12 +49799,7 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
     }
     if (url.pathname === "/_vesk/static/global.css") {
       res.writeHead(200, { "Content-Type": "text/css" });
-      res.end(devUserCssContent);
-      return;
-    }
-    if (url.pathname === "/_vesk/static/_tailwind.css") {
-      res.writeHead(200, { "Content-Type": "text/css" });
-      res.end(isTailwindActive() ? devTailwindCssContent : "");
+      res.end(devGlobalCssContent);
       return;
     }
     if (url.pathname === "/_vesk/hmr" || url.pathname === "/_vesk/hmr.js") {
@@ -49099,7 +49867,7 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
       return;
     }
     const mwChain = collectMiddlewareChain(routeTree, url.pathname, appDirPath);
-    const apiDirPath = join21(appDirPath, "api");
+    const apiDirPath = join20(appDirPath, "api");
     if (url.pathname.startsWith("/api") && existsSync37(apiDirPath)) {
       const apiRoutes = await scanApiRoutes(apiDirPath);
       const apiMatch = matchApiUrl(apiRoutes, req.url || url.pathname);
@@ -49510,7 +50278,7 @@ ${err.stack}</pre></body></html>`);
     LOG.ok(`dev server at http://localhost:${port2} (listening on ${bindHost})`);
     const routes = collectRoutePaths(routeTree);
     const pageCount = countPages(routeTree);
-    const apiCount = countFilesNamed(join21(appDirPath, "api"), "route.ts");
+    const apiCount = countFilesNamed(join20(appDirPath, "api"), "route.ts");
     LOG.info(`${projectDir2}`);
     LOG.info(`${pageCount} page${pageCount === 1 ? "" : "s"}: ${routes.join(", ") || "(none)"}`);
     if (apiCount > 0) LOG.info(`${apiCount} api route${apiCount === 1 ? "" : "s"} (app/api)`);
@@ -49544,6 +50312,23 @@ ${err.stack}</pre></body></html>`);
       if (ws.readyState === 1) ws.send(msg);
     }
   };
+  const logsCfg = config?.logs;
+  const logsEnabled = logsCfg !== false;
+  const logsLevels = typeof logsCfg === "object" && logsCfg !== null ? { log: true, warn: true, error: true, info: true, debug: true, ...logsCfg } : { log: true, warn: true, error: true, info: true, debug: true };
+  if (logsEnabled) {
+    const origFns = {};
+    for (const lvl of ["log", "warn", "error", "info", "debug"]) {
+      origFns[lvl] = console[lvl].bind(console);
+      console[lvl] = (...args2) => {
+        origFns[lvl](...args2);
+        if (!logsLevels[lvl]) return;
+        const msg = JSON.stringify({ type: "console", level: lvl, message: args2.map(String).join(" "), nonce: hmrNonce });
+        for (const ws of hmrClients) {
+          if (ws.readyState === 1) ws.send(msg);
+        }
+      };
+    }
+  }
   let stopping = false;
   const shutdown2 = (signal) => {
     if (stopping) return;
@@ -49792,8 +50577,8 @@ if (args.length === 0 || args.includes("--help") || args.includes("-h")) {
 }
 function loadEnvFiles(projectDir2) {
   const files = [
-    join23(projectDir2, ".env"),
-    join23(projectDir2, ".env.local")
+    join22(projectDir2, ".env"),
+    join22(projectDir2, ".env.local")
   ];
   for (const filePath of files) {
     if (!existsSync38(filePath)) continue;
@@ -49816,8 +50601,8 @@ function loadEnvFiles(projectDir2) {
 }
 async function loadConfig(projectDir2) {
   loadEnvFiles(projectDir2);
-  const jsPath = join23(projectDir2, "vesk.config.js");
-  const tsPath = join23(projectDir2, "vesk.config.ts");
+  const jsPath = join22(projectDir2, "vesk.config.js");
+  const tsPath = join22(projectDir2, "vesk.config.ts");
   let configPath3 = null;
   if (existsSync38(jsPath)) configPath3 = jsPath;
   else if (existsSync38(tsPath)) configPath3 = tsPath;
@@ -49830,7 +50615,7 @@ async function loadConfig(projectDir2) {
     js = js.replace(/import\s+\{[^}]*\}\s*from\s+['"]@vesk\/compiler['"]\s*;?\s*/g, "");
     js = `const { defineConfig, definePlugin, preset } = globalThis.__vesk_inject;
 ` + js;
-    const tmpFile = join23(projectDir2, ".vesk", "config.tmp.js");
+    const tmpFile = join22(projectDir2, ".vesk", "config.tmp.js");
     mkdirSync16(dirname23(tmpFile), { recursive: true });
     writeFileSync19(tmpFile, js, "utf-8");
     globalThis.__vesk_inject = { defineConfig, definePlugin, preset };
@@ -49852,8 +50637,8 @@ async function loadConfig(projectDir2) {
 }
 if (cmd === "build") {
   const projectDir2 = process.cwd();
-  const appDirPath = join23(projectDir2, "app");
-  const publicDir = join23(projectDir2, "public");
+  const appDirPath = join22(projectDir2, "app");
+  const publicDir = join22(projectDir2, "public");
   if (!existsSync38(appDirPath)) {
     console.error(`vesk build: no app/ directory found in ${projectDir2}`);
     process.exit(1);
@@ -49924,7 +50709,7 @@ ${code}`;
 }
 if (cmd === "seo") {
   const projectDir2 = process.cwd();
-  const appDirPath = join23(projectDir2, "app");
+  const appDirPath = join22(projectDir2, "app");
   if (!existsSync38(appDirPath)) {
     console.error(`vesk seo: no app/ directory found in ${projectDir2}`);
     process.exit(1);
@@ -49939,7 +50724,7 @@ if (cmd === "seo") {
 }
 if (cmd === "typecheck") {
   const projectDir2 = process.cwd();
-  const appDirPath = join23(projectDir2, "app");
+  const appDirPath = join22(projectDir2, "app");
   if (!existsSync38(appDirPath)) {
     console.error(`vesk typecheck: no app/ directory found in ${projectDir2}`);
     process.exit(1);
@@ -49964,7 +50749,7 @@ if (cmd === "typecheck") {
 }
 if (cmd === "start") {
   const projectDir2 = process.cwd();
-  const outDir2 = join23(projectDir2, ".vesk");
+  const outDir2 = join22(projectDir2, ".vesk");
   const port2 = parsePortArg(args);
   const host2 = parseHostArg(args);
   startProdServer(outDir2, { port: port2, host: host2 });
@@ -49973,8 +50758,8 @@ if (cmd === "start") {
 }
 if (cmd === "init") {
   const projectDir2 = process.cwd();
-  const srcDir = join23(projectDir2, "src");
-  const target = join23(srcDir, "global.css");
+  const srcDir = join22(projectDir2, "src");
+  const target = join22(srcDir, "global.css");
   if (existsSync38(target)) {
     console.error(`vesk init: ${target} already exists \u2014 skipping`);
     process.exit(0);
@@ -49993,7 +50778,7 @@ if (cmd === "init") {
 }
 if (cmd === "dev") {
   const projectDir2 = process.cwd();
-  const appDirPath = join23(projectDir2, "app");
+  const appDirPath = join22(projectDir2, "app");
   const port2 = parsePortArg(args);
   const host2 = parseHostArg(args);
   if (!existsSync38(appDirPath)) {