@vesk/vesk-cli 0.2.72 → 0.2.74

package/dist/cli.js

@@ -1081,8 +1081,8 @@ function run_teardown(block2) {
 }
 function on_destroy(fn) {
   const block2 = scope();
-  if (block2 === null) return;
-  if (block2.tc === null) block2.tc = [];
+  if (block2 == null) return;
+  if (block2.tc == null) block2.tc = [];
   block2.tc.push(fn);
 }
 function with_block(block2, fn) {
@@ -2094,7 +2094,7 @@ async function runFetcher(handle2, timeout) {
   }
 }
 function sleep(ms) {
-  return new Promise((resolve41) => setTimeout(resolve41, ms));
+  return new Promise((resolve42) => setTimeout(resolve42, ms));
 }
 function streamText(res, into, onChunk) {
   const decoder = new TextDecoder();
@@ -2896,12 +2896,12 @@ function hydrateViewport(container, componentFn, props, rootMargin = 500, option
   let cancelled = false;
   let cancelFn = () => {
   };
-  const promise = new Promise((resolve41) => {
+  const promise = new Promise((resolve42) => {
     const finish = () => {
       cancelled = true;
       cancelFn = () => {
       };
-      resolve41();
+      resolve42();
     };
     cancelFn = finish;
     if (!batchAlive(container, epoch, isCurrent)) return finish();
@@ -4422,7 +4422,8 @@ function usePathname() {
   return get(_state.path);
 }
 function useSearchParams() {
-  const s = get(_state.search);
+  const routed = get(_state.search);
+  const s = routed || (typeof window !== "undefined" && window.location?.search ? window.location.search.replace(/^\?/, "") : "");
   const sp = new URLSearchParams(s || "");
   const setter = (next) => {
     const q = typeof next === "string" ? next : new URLSearchParams(next).toString();
@@ -4616,7 +4617,7 @@ function ensureChunk(chunkUrl) {
   if (typeof document === "undefined" || typeof document.createElement !== "function") {
     return Promise.resolve();
   }
-  const promise = new Promise((resolve41, reject) => {
+  const promise = new Promise((resolve42, reject) => {
     const s = document.createElement("script");
     s.src = chunkUrl;
     let settled = false;
@@ -4635,7 +4636,7 @@ function ensureChunk(chunkUrl) {
       loadedChunks.add(chunkUrl);
       inFlightChunks.delete(chunkUrl);
       failedChunks.delete(chunkUrl);
-      resolve41();
+      resolve42();
     };
     s.onerror = () => {
       fail(new Error(`Failed to load chunk: ${chunkUrl}`));
@@ -4839,6 +4840,7 @@ async function renderNotFound(router, match, container) {
     } else if (typeof nfDom === "string") {
       container.innerHTML = nfDom;
     }
+    router._currentMatch = match;
     return;
   }
   if (container.replaceChildren) container.replaceChildren();
@@ -5323,12 +5325,14 @@ function clearOfflineFlag(router, container) {
   router._showingOffline = false;
   if (container) container.__veskNetworkUI = false;
 }
-async function renderErrorPage(router, match, container, error) {
+async function renderErrorPage(router, match, container, error, navToken) {
+  const stale = () => navToken !== void 0 && (router._navToken || 0) !== navToken;
   clearOfflineFlag(router, container);
   const chain = match.matchChain;
   const paramValues = match.params;
   const errorFn = findErrorComponent(chain);
   if (!errorFn) {
+    if (stale()) return;
     if (container.replaceChildren) container.replaceChildren();
     else container.innerHTML = "";
     container.innerHTML = defaultErrorHtml(500, "Internal Server Error");
@@ -5371,6 +5375,7 @@ async function renderErrorPage(router, match, container, error) {
     return result;
   };
   const dom = await runInBlockWindow(() => renderErrorChain(0));
+  if (stale()) return;
   if (dom && typeof dom === "object" && dom.nodeType) {
     if (container.replaceChildren) container.replaceChildren(dom);
     else {
@@ -5382,6 +5387,7 @@ async function renderErrorPage(router, match, container, error) {
   }
 }
 async function hydrateInitial(router, match, container, strategy) {
+  const hydrationNavToken = router._navToken || 0;
   const chain = match.matchChain;
   const paramValues = match.params;
   let pageNode = findPageNodeOrFailed(match);
@@ -5422,7 +5428,7 @@ async function hydrateInitial(router, match, container, strategy) {
       } catch {
       }
     }
-    await renderErrorPage(router, match, container, makeSsrError(message));
+    await renderErrorPage(router, match, container, makeSsrError(message), hydrationNavToken);
     return;
   }
   const layoutNodes = chain.filter((n) => n.layout);
@@ -5446,7 +5452,8 @@ async function hydrateInitial(router, match, container, strategy) {
       router,
       match,
       container,
-      chunkErr || new Error(`Component "${pageNode._pageName}" is unavailable`)
+      chunkErr || new Error(`Component "${pageNode._pageName}" is unavailable`),
+      hydrationNavToken
     );
     return;
   }
@@ -5541,7 +5548,7 @@ async function hydrateInitial(router, match, container, strategy) {
     try {
       await renderMatch(router, match, container);
     } catch (err2) {
-      await renderErrorPage(router, match, container, err2);
+      await renderErrorPage(router, match, container, err2, hydrationNavToken);
     }
   }
 }
@@ -6153,7 +6160,7 @@ function createFileRouter(routeTree, options = {}) {
           looksOffline().then((offline) => {
             navDebug("handleNavFailure verdict", offline ? "offline" : "online");
             if (offline) return void renderOfflinePage(router, match, container);
-            return void renderErrorPage(router, match, container, err);
+            return void renderErrorPage(router, match, container, err, navToken);
           }).catch(() => {
           });
         };
@@ -6370,7 +6377,7 @@ var init_router = __esm({
     loadedChunks = /* @__PURE__ */ new Set();
     failedChunks = /* @__PURE__ */ new Map();
     inFlightChunks = /* @__PURE__ */ new Map();
-    CHUNK_LOAD_TIMEOUT_MS = 1e4;
+    CHUNK_LOAD_TIMEOUT_MS = typeof window !== "undefined" && Number(window.__vesk_chunk_timeout_ms) || 1e4;
     _dataPromises = /* @__PURE__ */ new Map();
     PAGE_START_MARKER = "vesk:page";
     PAGE_END_MARKER = "/vesk:page";
@@ -20594,7 +20601,9 @@ function resolveVskTarget(target, sourcePath2) {
     return existsSync3(full) ? full : null;
   }
   const aliased = resolveImportPath(target, dirname3(sourcePath2));
-  return aliased !== target && existsSync3(aliased) ? aliased : null;
+  if (aliased !== target && existsSync3(aliased)) return aliased;
+  const published = resolveSsrModule(target, dirname3(sourcePath2));
+  return published !== null && published.endsWith(".vsk") && existsSync3(published) ? published : null;
 }
 function vskImportValueNames(imports) {
   const names = [];
@@ -20670,6 +20679,30 @@ var init_vsk_imports = __esm({
 });
 
 // ../compiler/src/ir-generator.ts
+function resolveNamedTypeText(text) {
+  if (!text || !__typeTexts || __typeTexts.size === 0) return text;
+  let t = text.trim();
+  for (let i = 0; i < 8; i++) {
+    if (!/^[A-Za-z_$][\w$]*$/.test(t)) return t;
+    const next = __typeTexts.get(t);
+    if (!next || next === t) return t;
+    t = next.trim();
+  }
+  return t;
+}
+function collectTypeTexts(ast, source) {
+  const out = /* @__PURE__ */ new Map();
+  for (const node of ast?.body || []) {
+    const decl = (node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration") && node.declaration ? node.declaration : node;
+    if (decl?.type !== "TSInterfaceDeclaration" && decl?.type !== "TSTypeAliasDeclaration") continue;
+    const name = decl.id?.name;
+    if (!name) continue;
+    const typeNode = decl.type === "TSInterfaceDeclaration" ? decl.body : decl.typeAnnotation;
+    if (!typeNode || typeof typeNode.start !== "number" || typeof typeNode.end !== "number") continue;
+    out.set(name, source.slice(typeNode.start, typeNode.end).trim());
+  }
+  return out;
+}
 function parseExprNode(text) {
   try {
     const ParserClass = createBaseParser();
@@ -21310,18 +21343,48 @@ function slotReadPropName(expr) {
   }
   return null;
 }
+function splitTypeMembers(text) {
+  const parts = [];
+  let depth = 0;
+  let last = 0;
+  let i = 0;
+  while (i < text.length) {
+    const c = text[i];
+    if (c === '"' || c === "'" || c === "`") {
+      i = skipString(text, i);
+      continue;
+    }
+    if (c === "/" && (text[i + 1] === "/" || text[i + 1] === "*")) {
+      i = skipComment(text, i);
+      continue;
+    }
+    if (c === "(" || c === "[" || c === "{" || c === "<") depth++;
+    else if (c === ")" || c === "]" || c === "}" || c === ">") {
+      if (depth > 0) depth--;
+    } else if (depth === 0 && (c === ";" || c === "\n")) {
+      parts.push(text.slice(last, i));
+      last = i + 1;
+      i++;
+      continue;
+    }
+    i++;
+  }
+  parts.push(text.slice(last));
+  return parts;
+}
 function slotPropNamesFromType(propsType) {
   const out = /* @__PURE__ */ new Set();
   if (!propsType) return out;
   const trimmed = propsType.trim();
   if (trimmed.startsWith("{")) {
     const inner = findBalancedEnd(trimmed, 0) === trimmed.length - 1 ? trimmed.slice(1, -1) : trimmed;
-    for (const part of splitTopLevel(inner, ";")) {
+    const members = splitTypeMembers(inner);
+    for (const part of members) {
       const colon = findTopLevelColon(part);
       if (colon === -1) continue;
-      const namePart = part.slice(0, colon).trim().replace(/^\$/, "").replace(/\?$/, "").trim();
+      const namePart = part.slice(0, colon).trim().replace(/^readonly\s+/, "").replace(/^\$/, "").replace(/\?$/, "").trim();
       const typePart = part.slice(colon + 1).trim();
-      if (namePart && typePart.includes("Component")) out.add(namePart);
+      if (namePart && /^[A-Za-z_$][\w$]*$/.test(namePart) && typePart.includes("Component")) out.add(namePart);
     }
   }
   return out;
@@ -22199,6 +22262,7 @@ function collectIdentifiers(node, into) {
 function generateIR(ast, source, filename) {
   __vskAnnotations = ast.__vskAnnotations ?? [];
   __slotProps = null;
+  __typeTexts = collectTypeTexts(ast, source);
   const file = filename || "";
   const components = [];
   const imports = [];
@@ -22341,7 +22405,7 @@ function generateIR(ast, source, filename) {
         const bodyStmts = inner.body.body;
         const isClientComp = !!inner.client;
         const prevSlotProps = __slotProps;
-        __slotProps = slotPropNamesFromType(propsType);
+        __slotProps = slotPropNamesFromType(resolveNamedTypeText(propsType));
         __propsParam = propsAlias || null;
         if (isStatementMode(bodyStmts)) {
           const raw2 = processStatementModeBody(source, bodyStmts, file);
@@ -22496,7 +22560,7 @@ function generateIR(ast, source, filename) {
     currentComponentCallHelpers = null;
   }
 }
-var __vskAnnotations, __slotProps, __propsParam, currentVskNamespaceLocals, currentSourceFile, currentComponentValues, currentFileComponentNames, currentFileValueBindings, currentImportedNames, currentComponentCallHelpers;
+var __vskAnnotations, __slotProps, __typeTexts, __propsParam, currentVskNamespaceLocals, currentSourceFile, currentComponentValues, currentFileComponentNames, currentFileValueBindings, currentImportedNames, currentComponentCallHelpers;
 var init_ir_generator = __esm({
   "../compiler/src/ir-generator.ts"() {
     "use strict";
@@ -22510,6 +22574,7 @@ var init_ir_generator = __esm({
     init_tokens();
     __vskAnnotations = [];
     __slotProps = null;
+    __typeTexts = null;
     __propsParam = null;
     currentVskNamespaceLocals = null;
     currentComponentValues = null;
@@ -29947,7 +30012,7 @@ is not a problem with esbuild. You need to fix your environment instead.
         let latestResultPromise;
         let provideLatestResult;
         if (isContext)
-          requestCallbacks["on-end"] = (id, request2) => new Promise((resolve41) => {
+          requestCallbacks["on-end"] = (id, request2) => new Promise((resolve42) => {
             buildResponseToResult(request2, (err, result, onEndErrors, onEndWarnings) => {
               const response = {
                 errors: onEndErrors,
@@ -29957,7 +30022,7 @@ is not a problem with esbuild. You need to fix your environment instead.
               latestResultPromise = void 0;
               provideLatestResult = void 0;
               sendResponse(id, response);
-              resolve41();
+              resolve42();
             });
           });
         sendRequest(refs, request, (error, response) => {
@@ -29974,10 +30039,10 @@ is not a problem with esbuild. You need to fix your environment instead.
           let didDispose = false;
           const result = {
             rebuild: () => {
-              if (!latestResultPromise) latestResultPromise = new Promise((resolve41, reject) => {
+              if (!latestResultPromise) latestResultPromise = new Promise((resolve42, reject) => {
                 let settlePromise;
                 provideLatestResult = (err, result2) => {
-                  if (!settlePromise) settlePromise = () => err ? reject(err) : resolve41(result2);
+                  if (!settlePromise) settlePromise = () => err ? reject(err) : resolve42(result2);
                 };
                 const triggerAnotherBuild = () => {
                   const request2 = {
@@ -29998,7 +30063,7 @@ is not a problem with esbuild. You need to fix your environment instead.
               });
               return latestResultPromise;
             },
-            watch: (options2 = {}) => new Promise((resolve41, reject) => {
+            watch: (options2 = {}) => new Promise((resolve42, reject) => {
               if (!streamIn.hasFS) throw new Error(`Cannot use the "watch" API in this environment`);
               const keys = {};
               const delay = getFlag(options2, keys, "delay", mustBeInteger);
@@ -30010,10 +30075,10 @@ is not a problem with esbuild. You need to fix your environment instead.
               if (delay) request2.delay = delay;
               sendRequest(refs, request2, (error2) => {
                 if (error2) reject(new Error(error2));
-                else resolve41(void 0);
+                else resolve42(void 0);
               });
             }),
-            serve: (options2 = {}) => new Promise((resolve41, reject) => {
+            serve: (options2 = {}) => new Promise((resolve42, reject) => {
               if (!streamIn.hasFS) throw new Error(`Cannot use the "serve" API in this environment`);
               const keys = {};
               const port = getFlag(options2, keys, "port", mustBeValidPortNumber);
@@ -30051,28 +30116,28 @@ is not a problem with esbuild. You need to fix your environment instead.
                     sendResponse(id, {});
                   };
                 }
-                resolve41(response2);
+                resolve42(response2);
               });
             }),
-            cancel: () => new Promise((resolve41) => {
-              if (didDispose) return resolve41();
+            cancel: () => new Promise((resolve42) => {
+              if (didDispose) return resolve42();
               const request2 = {
                 command: "cancel",
                 key: buildKey
               };
               sendRequest(refs, request2, () => {
-                resolve41();
+                resolve42();
               });
             }),
-            dispose: () => new Promise((resolve41) => {
-              if (didDispose) return resolve41();
+            dispose: () => new Promise((resolve42) => {
+              if (didDispose) return resolve42();
               didDispose = true;
               const request2 = {
                 command: "dispose",
                 key: buildKey
               };
               sendRequest(refs, request2, () => {
-                resolve41();
+                resolve42();
                 scheduleOnDisposeCallbacks();
                 refs.unref();
               });
@@ -30111,7 +30176,7 @@ is not a problem with esbuild. You need to fix your environment instead.
             onLoad: []
           };
           i++;
-          let resolve41 = (path3, options = {}) => {
+          let resolve42 = (path3, options = {}) => {
             if (!isSetupDone) throw new Error('Cannot call "resolve" before plugin setup has completed');
             if (typeof path3 !== "string") throw new Error(`The path to resolve must be a string`);
             let keys2 = /* @__PURE__ */ Object.create(null);
@@ -30155,7 +30220,7 @@ is not a problem with esbuild. You need to fix your environment instead.
           };
           let promise = setup({
             initialOptions,
-            resolve: resolve41,
+            resolve: resolve42,
             onStart(callback) {
               let registeredText = `This error came from the "onStart" callback registered here:`;
               let registeredNote = extractCallerV8(new Error(registeredText), streamIn, "onStart");
@@ -30848,46 +30913,46 @@ More information: The file containing the code for esbuild's JavaScript API (${_
         }
       };
       longLivedService = {
-        build: (options) => new Promise((resolve41, reject) => {
+        build: (options) => new Promise((resolve42, reject) => {
           service.buildOrContext({
             callName: "build",
             refs,
             options,
             isTTY: isTTY(),
             defaultWD,
-            callback: (err, res) => err ? reject(err) : resolve41(res)
+            callback: (err, res) => err ? reject(err) : resolve42(res)
           });
         }),
-        context: (options) => new Promise((resolve41, reject) => service.buildOrContext({
+        context: (options) => new Promise((resolve42, reject) => service.buildOrContext({
           callName: "context",
           refs,
           options,
           isTTY: isTTY(),
           defaultWD,
-          callback: (err, res) => err ? reject(err) : resolve41(res)
+          callback: (err, res) => err ? reject(err) : resolve42(res)
         })),
-        transform: (input, options) => new Promise((resolve41, reject) => service.transform({
+        transform: (input, options) => new Promise((resolve42, reject) => service.transform({
           callName: "transform",
           refs,
           input,
           options: options || {},
           isTTY: isTTY(),
           fs: fsAsync,
-          callback: (err, res) => err ? reject(err) : resolve41(res)
+          callback: (err, res) => err ? reject(err) : resolve42(res)
         })),
-        formatMessages: (messages, options) => new Promise((resolve41, reject) => service.formatMessages({
+        formatMessages: (messages, options) => new Promise((resolve42, reject) => service.formatMessages({
           callName: "formatMessages",
           refs,
           messages,
           options,
-          callback: (err, res) => err ? reject(err) : resolve41(res)
+          callback: (err, res) => err ? reject(err) : resolve42(res)
         })),
-        analyzeMetafile: (metafile, options) => new Promise((resolve41, reject) => service.analyzeMetafile({
+        analyzeMetafile: (metafile, options) => new Promise((resolve42, reject) => service.analyzeMetafile({
           callName: "analyzeMetafile",
           refs,
           metafile: typeof metafile === "string" ? metafile : JSON.stringify(metafile),
           options,
-          callback: (err, res) => err ? reject(err) : resolve41(res)
+          callback: (err, res) => err ? reject(err) : resolve42(res)
         }))
       };
       return longLivedService;
@@ -30965,13 +31030,13 @@ error: ${text}`);
         worker.postMessage(msg);
         let status = Atomics.wait(sharedBufferView, 0, 0);
         if (status !== "ok" && status !== "not-equal") throw new Error("Internal error: Atomics.wait() failed: " + status);
-        let { message: { id: id2, resolve: resolve41, reject, properties } } = worker_threads2.receiveMessageOnPort(mainPort);
+        let { message: { id: id2, resolve: resolve42, reject, properties } } = worker_threads2.receiveMessageOnPort(mainPort);
         if (id !== id2) throw new Error(`Internal error: Expected id ${id} but got id ${id2}`);
         if (reject) {
           applyProperties(reject, properties);
           throw reject;
         }
-        return resolve41;
+        return resolve42;
       };
       worker.unref();
       return {
@@ -31856,8 +31921,19 @@ function emitStatic(ctx2, node, tracked2, effectsVar, skipK = 0, regionBudget) {
     let childVar;
     const isPureStaticChild = ctx2.hydrate && child instanceof StaticNode && isStaticIR(child.children);
     if (isPureStaticChild) {
-      const ssrEl = `${el}.__vsk_ssrEls[${residueBefore}]`;
-      childVar = ssrEl;
+      const savedHydrate = ctx2.hydrate;
+      ctx2.hydrate = false;
+      const buildStart = ctx2.lines.length;
+      const freshChild = emitStatic(ctx2, child, tracked2, effectsVar);
+      const buildLines = ctx2.lines.splice(buildStart, ctx2.lines.length - buildStart);
+      ctx2.hydrate = savedHydrate;
+      const childSlot = ctx2.n();
+      ctx2.push(`const ${childSlot} = ${el}.__vsk_ssrEls ? ${el}.__vsk_ssrEls[${residueBefore}] : (() => {`);
+      for (const line of buildLines) ctx2.push(`	${line}`);
+      ctx2.push(`	return ${freshChild ?? "document.createElement('div')"};`);
+      ctx2.push(`})();`);
+      childVar = childSlot;
+      const ssrEl = childSlot;
       const dynAttrs2 = [];
       const staticChildren = [];
       for (const c of child.children) {
@@ -32080,12 +32156,12 @@ function emitDynamicBinding(ctx2, node, tracked2, effectsVar, ssrTextExpr = null
   const expr = transformTracked(node.expression, tracked2);
   const v = ctx2.n();
   if (!isReactiveExpression(node.expression, tracked2)) {
-    ctx2.push(`const ${v} = document.createTextNode(String(${expr}));`);
+    ctx2.push(`const ${v} = document.createTextNode(String((${expr}) ?? ''));`);
     return v;
   }
   const init = ssrTextExpr ? `String(${ssrTextExpr} ?? '')` : `''`;
   ctx2.push(`const ${v} = document.createTextNode(${init});`);
-  const eff = `effect(() => { ${v}.data = String(${expr}); })`;
+  const eff = `effect(() => { const __v = ${expr}; ${v}.data = __v == null ? '' : String(__v); })`;
   if (effectsVar) {
     ctx2.push(`${effectsVar}.push(${eff});`);
   } else {
@@ -33246,7 +33322,9 @@ function isStaticIR(body) {
 function claimsWalkerNode(ctx2, node) {
   if (node instanceof StaticNode) return ctx2.claimStatic || !isStaticIR(node.children);
   if (node instanceof ComponentCall) return true;
-  if (node instanceof OpaqueDynamicRegion) return true;
+  if (node instanceof OpaqueDynamicRegion) {
+    return branchClaimsWalker(ctx2, node.consequentNodes) || branchClaimsWalker(ctx2, node.alternateNodes);
+  }
   if (node instanceof MapRegion) return true;
   if (node instanceof ForLoop) return true;
   if (node instanceof WhileLoop) return true;
@@ -33254,6 +33332,13 @@ function claimsWalkerNode(ctx2, node) {
   if (node instanceof TryCatch) return true;
   return false;
 }
+function branchClaimsWalker(ctx2, nodes) {
+  const previous = ctx2.claimStatic;
+  ctx2.claimStatic = true;
+  const claims = nodes.some((node) => claimsWalkerNode(ctx2, node));
+  ctx2.claimStatic = previous;
+  return claims;
+}
 function isStaticComponent(comp) {
   if (comp.style) return false;
   return isStaticIR(comp.body);
@@ -35652,7 +35737,7 @@ import {
   rmSync as rmSync2,
   readFileSync as readFileSync17
 } from "node:fs";
-import { resolve as resolve13, join as join11, extname as extname3, dirname as dirname10 } from "node:path";
+import { resolve as resolve13, join as join11, extname as extname3, dirname as dirname11 } from "node:path";
 function ensureCleanDir(dir) {
   rmSync2(dir, { recursive: true, force: true });
   mkdirSync6(dir, { recursive: true });
@@ -35666,13 +35751,13 @@ function copyDirContents(srcDir, destDir) {
     if (statSync7(srcPath).isDirectory()) {
       copyDirContents(srcPath, destPath);
     } else {
-      mkdirSync6(dirname10(destPath), { recursive: true });
+      mkdirSync6(dirname11(destPath), { recursive: true });
       copyFileSync2(srcPath, destPath);
     }
   }
 }
 function writeFile(path, content) {
-  mkdirSync6(dirname10(path), { recursive: true });
+  mkdirSync6(dirname11(path), { recursive: true });
   writeFileSync7(path, content, "utf-8");
 }
 function writePlatformStatic(buildStaticDir, platformStaticDir) {
@@ -35686,7 +35771,7 @@ function writePlatformStatic(buildStaticDir, platformStaticDir) {
   const runtimeAlias = resolve13(platformStaticDir, "_vesk", "runtime.js");
   const clientPath = resolve13(buildStaticDir, "client.js");
   if (existsSync15(clientPath)) {
-    mkdirSync6(dirname10(runtimeAlias), { recursive: true });
+    mkdirSync6(dirname11(runtimeAlias), { recursive: true });
     copyFileSync2(clientPath, runtimeAlias);
   }
 }
@@ -35781,7 +35866,7 @@ import {
   mkdirSync as mkdirSync7,
   statSync as statSync9
 } from "node:fs";
-import { resolve as resolve15, dirname as dirname12, join as join12, extname as extname4, basename as basename2 } from "node:path";
+import { resolve as resolve15, dirname as dirname13, join as join12, extname as extname4, basename as basename2 } from "node:path";
 import { createRequire as createRequire4 } from "node:module";
 import { spawn } from "node:child_process";
 function defaultState() {
@@ -35815,7 +35900,7 @@ function readPluginState(veskDir) {
 }
 function writePluginState(veskDir, state) {
   const file = stateFilePath(veskDir);
-  const dir = dirname12(file);
+  const dir = dirname13(file);
   if (!existsSync17(dir)) mkdirSync7(dir, { recursive: true });
   writeFileSync8(file, JSON.stringify(state, null, 2) + "\n", "utf-8");
 }
@@ -35829,16 +35914,16 @@ function resolvePackage(appDir, pkg) {
   } catch {
     try {
       entryPath = require3.resolve(pkg);
-      let cur = dirname12(entryPath);
+      let cur = dirname13(entryPath);
       const seen = /* @__PURE__ */ new Set();
-      while (cur && cur !== dirname12(cur) && !seen.has(cur)) {
+      while (cur && cur !== dirname13(cur) && !seen.has(cur)) {
         seen.add(cur);
         const candidate = join12(cur, "package.json");
         if (existsSync17(candidate)) {
           pkgJsonPath = candidate;
           break;
         }
-        const parent = dirname12(cur);
+        const parent = dirname13(cur);
         if (parent !== cur && basename2(cur) === "node_modules") break;
         cur = parent;
       }
@@ -35848,7 +35933,7 @@ function resolvePackage(appDir, pkg) {
   if (pkgJsonPath && existsSync17(pkgJsonPath)) {
     pkgJson = readJsonFile(pkgJsonPath);
     const main = pkgJson?.main || pkgJson?.module || "index.js";
-    entryPath = resolve15(dirname12(pkgJsonPath), main);
+    entryPath = resolve15(dirname13(pkgJsonPath), main);
   }
   let localPath = localDir(appDir, pkg);
   if (!localPath) {
@@ -35869,7 +35954,7 @@ function resolvePackage(appDir, pkg) {
     return { installed: true, path: localPath, dir: localPath, packageJson: json ?? pkgJson };
   }
   const installed2 = !!pkgJsonPath && existsSync17(pkgJsonPath);
-  return { installed: installed2, path: entryPath, dir: installed2 ? dirname12(pkgJsonPath) : null, packageJson: pkgJson };
+  return { installed: installed2, path: entryPath, dir: installed2 ? dirname13(pkgJsonPath) : null, packageJson: pkgJson };
 }
 function localDir(base, pkg) {
   if (pkg.startsWith("@")) {
@@ -36844,7 +36929,7 @@ __export(image_pipeline_exports, {
 });
 import { mkdirSync as mkdirSync9, writeFileSync as writeFileSync10, readFileSync as readFileSync21, existsSync as existsSync19, readdirSync as readdirSync6, statSync as statSync11 } from "node:fs";
 import { spawnSync } from "node:child_process";
-import { resolve as resolve17, extname as extname5, dirname as dirname13, join as join14 } from "node:path";
+import { resolve as resolve17, extname as extname5, dirname as dirname14, join as join14 } from "node:path";
 import { createRequire as createRequire5 } from "node:module";
 import { tmpdir as tmpdir2 } from "node:os";
 function probeMemoPath() {
@@ -36910,7 +36995,7 @@ async function processImage(srcPath, outDir, baseName) {
     const written = [];
     for (const w of OUTPUT_WIDTHS) {
       const outputPath = resolve17(outDir, `${baseName}-${w}w${ext}`);
-      mkdirSync9(dirname13(outputPath), { recursive: true });
+      mkdirSync9(dirname14(outputPath), { recursive: true });
       writeFileSync10(outputPath, original);
       written.push(outputPath);
     }
@@ -36923,14 +37008,14 @@ async function processImage(srcPath, outDir, baseName) {
     const base = `${baseName}-${w}w`;
     if (w >= originalWidth) {
       const copyPath = resolve17(outDir, `${base}${extname5(srcPath)}`);
-      mkdirSync9(dirname13(copyPath), { recursive: true });
+      mkdirSync9(dirname14(copyPath), { recursive: true });
       writeFileSync10(copyPath, readFileSync21(srcPath));
       generated.push(copyPath);
       continue;
     }
     const resized = image.clone().resize({ width: w, withoutEnlargement: true });
     const jpgPath = resolve17(outDir, `${base}${extname5(srcPath)}`);
-    mkdirSync9(dirname13(jpgPath), { recursive: true });
+    mkdirSync9(dirname14(jpgPath), { recursive: true });
     await resized.toFile(jpgPath);
     generated.push(jpgPath);
     for (const fmt of FORMATS) {
@@ -37259,7 +37344,7 @@ var init_platform = __esm({
 
 // ../adapter/src/platform-handler.ts
 import { existsSync as existsSync21 } from "node:fs";
-import { resolve as resolve19, dirname as dirname14, join as join15 } from "node:path";
+import { resolve as resolve19, dirname as dirname15, join as join15 } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 function routeName2(segments) {
   const parts = segments.filter(Boolean).map((s) => {
@@ -37573,7 +37658,7 @@ var init_platform_handler = __esm({
   "../adapter/src/platform-handler.ts"() {
     "use strict";
     init_default_pages();
-    __dirname5 = dirname14(fileURLToPath4(import.meta.url));
+    __dirname5 = dirname15(fileURLToPath4(import.meta.url));
   }
 });
 
@@ -42307,8 +42392,8 @@ __export(typecheck_exports, {
   formatTypecheckWarnings: () => formatTypecheckWarnings,
   typecheckProject: () => typecheckProject
 });
-import { readFileSync as readFileSync41, readdirSync as readdirSync15, statSync as statSync23 } from "node:fs";
-import { join as join28, dirname as dirname27, normalize, relative as relative8, resolve as resolve39, sep as sep7 } from "node:path";
+import { readFileSync as readFileSync42, readdirSync as readdirSync15, statSync as statSync23 } from "node:fs";
+import { join as join29, dirname as dirname28, normalize, relative as relative10, resolve as resolve40, sep as sep7 } from "node:path";
 import * as ts8 from "typescript";
 function walkProjectFiles(projectRoot) {
   const code = [];
@@ -42321,7 +42406,7 @@ function walkProjectFiles(projectRoot) {
       return;
     }
     for (const e of entries) {
-      const p = join28(dir, e);
+      const p = join29(dir, e);
       let st;
       try {
         st = statSync23(p);
@@ -42349,15 +42434,15 @@ function walkProjectFiles(projectRoot) {
   return { code, js };
 }
 function isUnder(dir, file) {
-  const base = resolve39(dir);
-  const abs = resolve39(file);
+  const base = resolve40(dir);
+  const abs = resolve40(file);
   return abs === base || abs.startsWith(base + sep7);
 }
 function structureWarning(rel, message) {
   return { file: rel, line: 1, column: 1, code: "vesk-structure", message };
 }
 function checkStructureFile(appDir, file) {
-  const rel = relative8(appDir, file);
+  const rel = relative10(appDir, file);
   const parts = rel.split("\\").join("/").split("/");
   const name = parts[parts.length - 1] ?? "";
   const isApi = parts.includes("api");
@@ -42376,8 +42461,8 @@ function checkStructureFile(appDir, file) {
   return null;
 }
 function createTypecheckHost(projectRoot, appDir, vskFiles) {
-  const ambientPath = join28(appDir, "__vesk_ambient.d.ts");
-  const overridePath = join28(appDir, "__vesk_runtime_override.d.ts");
+  const ambientPath = join29(appDir, "__vesk_ambient.d.ts");
+  const overridePath = join29(appDir, "__vesk_runtime_override.d.ts");
   const cached = /* @__PURE__ */ new Map();
   const scriptKindFor = (file) => file.endsWith(".vsk") ? ts8.ScriptKind.TSX : ts8.ScriptKind.TS;
   const host = {
@@ -42447,7 +42532,7 @@ function createTypecheckHost(projectRoot, appDir, vskFiles) {
     directoryExists: (dir) => ts8.sys.directoryExists(dir),
     getDirectories: (dir) => {
       try {
-        return readdirSync15(dir, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => join28(dir, d.name));
+        return readdirSync15(dir, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => join29(dir, d.name));
       } catch {
         return [];
       }
@@ -42458,8 +42543,8 @@ function createTypecheckHost(projectRoot, appDir, vskFiles) {
     resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, options) {
       return moduleLiterals.map(({ text }) => {
         if (text.endsWith(".vsk")) {
-          const aliased = text.startsWith(".") ? null : resolveAliasModule(text, dirname27(containingFile));
-          const abs = normalize(aliased ?? join28(dirname27(containingFile), text));
+          const aliased = text.startsWith(".") ? null : resolveAliasModule(text, dirname28(containingFile));
+          const abs = normalize(aliased ?? join29(dirname28(containingFile), text));
           return {
             resolvedModule: {
               resolvedFileName: abs + ".d.ts",
@@ -42470,7 +42555,7 @@ function createTypecheckHost(projectRoot, appDir, vskFiles) {
           };
         }
         if (text.endsWith(".css")) {
-          const abs = normalize(join28(dirname27(containingFile), text));
+          const abs = normalize(join29(dirname28(containingFile), text));
           return {
             resolvedModule: {
               resolvedFileName: abs + ".d.ts",
@@ -42517,7 +42602,7 @@ function sourcePosition(source, offset2) {
   return { line, character: bounded - lineStart + 1 };
 }
 function typecheckProject(projectRoot, opts = {}) {
-  const appDir = opts.appDir ?? join28(projectRoot, "app");
+  const appDir = opts.appDir ?? join29(projectRoot, "app");
   const vskFiles = /* @__PURE__ */ new Map();
   const parseErrors = [];
   const warnings = [];
@@ -42539,12 +42624,12 @@ function typecheckProject(projectRoot, opts = {}) {
       }
     }
     if (f.endsWith(".vsk")) {
-      const src2 = readFileSync41(f, "utf-8");
+      const src2 = readFileSync42(f, "utf-8");
       try {
         parse4(src2);
       } catch (e) {
         parseErrors.push({
-          file: relative8(projectRoot, f),
+          file: relative10(projectRoot, f),
           line: 1,
           column: 1,
           code: "vesk-parse",
@@ -42556,8 +42641,8 @@ function typecheckProject(projectRoot, opts = {}) {
     }
     rootNames.push(f);
   }
-  const ambientPath = join28(appDir, "__vesk_ambient.d.ts");
-  const overridePath = join28(appDir, "__vesk_runtime_override.d.ts");
+  const ambientPath = join29(appDir, "__vesk_ambient.d.ts");
+  const overridePath = join29(appDir, "__vesk_runtime_override.d.ts");
   rootNames.push(ambientPath);
   rootNames.push(overridePath);
   const options = {
@@ -42615,7 +42700,7 @@ function typecheckProject(projectRoot, opts = {}) {
     }
     const code = typeof diag.code === "number" ? `TS${diag.code}` : String(diag.code);
     errors.push({
-      file: relative8(projectRoot, filePath),
+      file: relative10(projectRoot, filePath),
       line,
       column,
       code,
@@ -48678,8 +48763,8 @@ __export(codemods_exports, {
   applicableCodemods: () => applicableCodemods,
   compareCore: () => compareCore
 });
-import { readFileSync as readFileSync42, existsSync as existsSync43 } from "node:fs";
-import { join as join29 } from "node:path";
+import { readFileSync as readFileSync43, existsSync as existsSync44 } from "node:fs";
+import { join as join30 } from "node:path";
 import { walk as walk8 } from "zimmerframe";
 function safeParse(source, filePath) {
   try {
@@ -48699,12 +48784,12 @@ function isVskFile(filePath) {
 }
 function typesPackageExports(projectDir) {
   const candidates = [
-    projectDir ? join29(projectDir, "node_modules", "@vesk", "types", "dist", "index.d.ts") : null,
+    projectDir ? join30(projectDir, "node_modules", "@vesk", "types", "dist", "index.d.ts") : null,
     new URL("../../types/dist/index.d.ts", import.meta.url).pathname
-  ].filter((p) => typeof p === "string" && existsSync43(p));
+  ].filter((p) => typeof p === "string" && existsSync44(p));
   for (const path of candidates) {
     try {
-      const src2 = readFileSync42(path, "utf-8");
+      const src2 = readFileSync43(path, "utf-8");
       const names = /* @__PURE__ */ new Set();
       for (const line of src2.split("\n")) {
         const m = /^export\s+(?:declare\s+)?(?:abstract\s+)?(?:interface|class|type|enum|const|function|let|var|namespace)\s+([A-Za-z_$][\w$]*)/.exec(line);
@@ -48828,14 +48913,14 @@ __export(migrate_exports, {
   detectInstalledVersion: () => detectInstalledVersion,
   runMigrate: () => runMigrate
 });
-import { readFileSync as readFileSync43, writeFileSync as writeFileSync22, existsSync as existsSync44, statSync as statSync24, readdirSync as readdirSync16 } from "node:fs";
-import { join as join30, relative as relative9, extname as extname8 } from "node:path";
+import { readFileSync as readFileSync44, writeFileSync as writeFileSync22, existsSync as existsSync45, statSync as statSync24, readdirSync as readdirSync16 } from "node:fs";
+import { join as join31, relative as relative11, extname as extname8 } from "node:path";
 function detectInstalledVersion(projectDir, cliVersion) {
   for (const pkg of ["@vesk/vesk-cli", "@vesk/adapter", "@vesk/compiler"]) {
-    const p = join30(projectDir, "node_modules", pkg, "package.json");
-    if (!existsSync44(p)) continue;
+    const p = join31(projectDir, "node_modules", pkg, "package.json");
+    if (!existsSync45(p)) continue;
     try {
-      const version2 = JSON.parse(readFileSync43(p, "utf-8")).version;
+      const version2 = JSON.parse(readFileSync44(p, "utf-8")).version;
       if (typeof version2 === "string" && version2) return { version: version2, source: pkg };
     } catch {
     }
@@ -48852,7 +48937,7 @@ function collectTargets(dir, root3 = dir) {
   }
   for (const entry of entries.sort()) {
     if (SKIP_DIRS2.has(entry)) continue;
-    const full = join30(dir, entry);
+    const full = join31(dir, entry);
     let st;
     try {
       st = statSync24(full);
@@ -48862,7 +48947,7 @@ function collectTargets(dir, root3 = dir) {
     if (st.isDirectory()) {
       out.push(...collectTargets(full, root3));
     } else if (SCAN_EXTENSIONS.has(extname8(entry))) {
-      out.push(relative9(root3, full));
+      out.push(relative11(root3, full));
     }
   }
   return out;
@@ -48887,12 +48972,12 @@ function runMigrate(options) {
     return report;
   }
   for (const relPath of collectTargets(options.projectDir)) {
-    const abs = join30(options.projectDir, relPath);
+    const abs = join31(options.projectDir, relPath);
     const ctx2 = { filePath: abs, displayPath: relPath, projectDir: options.projectDir };
-    if (!existsSync44(abs)) continue;
+    if (!existsSync45(abs)) continue;
     let source;
     try {
-      source = readFileSync43(abs, "utf-8");
+      source = readFileSync44(abs, "utf-8");
     } catch (e) {
       report.skipped.push(`${relPath}: unreadable (${e.message})`);
       continue;
@@ -48932,9 +49017,11 @@ var init_migrate = __esm({
 });
 
 // src/index.ts
-import { readFileSync as readFileSync44, writeFileSync as writeFileSync23, mkdirSync as mkdirSync20, existsSync as existsSync45 } from "fs";
-import { resolve as resolve40, join as join31 } from "path";
+import { readFileSync as readFileSync45, writeFileSync as writeFileSync23, mkdirSync as mkdirSync20, existsSync as existsSync46 } from "fs";
+import { resolve as resolve41, join as join32 } from "path";
 import { fileURLToPath as fileURLToPath9 } from "url";
+import { createRequire as createRequire8 } from "module";
+import { spawn as spawn3 } from "child_process";
 
 // ../adapter/dist/load-config.js
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from "node:fs";
@@ -49512,7 +49599,7 @@ function setRuntimeModule2(mod) {
 
 // ../adapter/dist/index.js
 import { mkdirSync as mkdirSync11, writeFileSync as writeFileSync12, existsSync as existsSync22, readFileSync as readFileSync23 } from "node:fs";
-import { resolve as resolve21, dirname as dirname16, relative as relative4, basename as basename3, join as join16 } from "node:path";
+import { resolve as resolve21, dirname as dirname17, relative as relative4, basename as basename3, join as join16 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 
 // ../adapter/src/runtime-bundle.ts
@@ -50385,7 +50472,9 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
     ""
   ].join("\n");
   const actionCode = [
-    "export async function handleAction(request, id) {",
+    // Underscored internal name (see api-function.ts): page source is inlined
+    // into this module and may declare/import `handleAction` itself.
+    "async function __vesk_handleAction(request, id) {",
     "  // CSRF defense: cross-site browser POSTs always carry an Origin header.",
     "  try {",
     "    assertSameOrigin(request);",
@@ -50462,6 +50551,8 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
     "    globalThis.__vesk_request = prevReq;",
     "  }",
     "}",
+    "",
+    "export { __vesk_handleAction as handleAction };",
     ""
   ].join("\n");
   const funcCode = [
@@ -50499,8 +50590,9 @@ init_actions();
 
 // ../adapter/src/api-function.ts
 init_strip_ts();
+init_module_imports();
 import { readFileSync as readFileSync8 } from "node:fs";
-import { resolve as resolve8 } from "node:path";
+import { resolve as resolve8, dirname as dirname8 } from "node:path";
 function apiRouteName(fullPath) {
   const parts = fullPath.split("/").filter(Boolean);
   return parts.map((s) => s.startsWith(":") ? s.slice(1) || "param" : s).join("_") || "index";
@@ -50512,6 +50604,17 @@ function generateApiFunction(apiNode, _apiDir, outDir, options) {
   const routeFilePath = apiNode.filePath;
   if (!routeFilePath) throw new Error(`api route ${apiNode.fullPath} has no filePath`);
   let routeSrc = readFileSync8(routeFilePath, "utf-8");
+  const routeDir = dirname8(routeFilePath);
+  routeSrc = routeSrc.replace(
+    /(from\s+['"]|import\s*\(\s*['"])(\.{1,2}\/[^'"]+)(['"])/g,
+    (match, prefix, spec, suffix) => {
+      try {
+        return prefix + resolveImportPath(spec, routeDir) + suffix;
+      } catch {
+        return match;
+      }
+    }
+  );
   routeSrc = routeSrc.replace(/from\s+['"]@vesk\/runtime['"]\s*;?/g, "from '../runtime.js';").replace(/from\s+['"]@vesk\/runtime\/(\w+)['"]\s*;?/g, () => {
     return "from '../runtime.js';";
   });
@@ -50524,9 +50627,12 @@ function generateApiFunction(apiNode, _apiDir, outDir, options) {
   const urlParts = apiNode.fullPath.split("/").filter(Boolean);
   const extracts = [];
   let partIdx = 0;
-  for (const p of urlParts) {
-    if (p.startsWith(":") && p.includes("...")) {
+  for (let i = 0; i < urlParts.length; i++) {
+    const p = urlParts[i];
+    const isCatchAll = apiNode.isCatchAll && i === urlParts.length - 1;
+    if (p.startsWith(":") && (isCatchAll || p.includes("..."))) {
       extracts.push(`${JSON.stringify(p.slice(1))}: urlParts.slice(${partIdx}).join('/')`);
+      partIdx = urlParts.length;
     } else if (p.startsWith(":")) {
       extracts.push(`${JSON.stringify(p.slice(1))}: urlParts[${partIdx}]`);
       partIdx++;
@@ -50709,9 +50815,14 @@ function generateApiFunction(apiNode, _apiDir, outDir, options) {
     middlewareCode ? "import { parseCookies as __parseCookies } from '../runtime.js';" : "",
     "",
     middlewareCode || "",
-    "export async function handle(request) {",
+    // Underscored internal name: route source is inlined above and commonly
+    // imports a user helper called `handle`, which would otherwise clash with
+    // (and crash) this wrapper. The public export name is preserved.
+    "async function __vesk_api_handle(request) {",
     handleBody,
     "}",
+    "",
+    "export { __vesk_api_handle as handle };",
     ""
   ].filter(Boolean).join("\n");
   return { funcPath, funcCode, name };
@@ -51071,7 +51182,7 @@ async function compileEvents(appDir, outDir) {
 // ../adapter/src/client-bundle.ts
 init_esbuild_fallback();
 import { readFileSync as readFileSync13, existsSync as existsSync11, writeFileSync as writeFileSync4, unlinkSync as unlinkSync3, statSync as statSync4, rmSync, mkdtempSync, mkdirSync as mkdirSync3 } from "node:fs";
-import { resolve as resolve10, join as join8, dirname as dirname8, relative as relative2, sep } from "node:path";
+import { resolve as resolve10, join as join8, dirname as dirname9, relative as relative2, sep } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 import { tmpdir } from "node:os";
 init_strip_ts();
@@ -51366,7 +51477,7 @@ async function mapWithConcurrency(items, limit, fn) {
   if (firstError !== null) throw firstError;
   return out;
 }
-var __dirname3 = dirname8(fileURLToPath2(import.meta.url));
+var __dirname3 = dirname9(fileURLToPath2(import.meta.url));
 function fileUnchanged(filePath, cached) {
   try {
     const st = statSync4(filePath);
@@ -51535,7 +51646,9 @@ function demoteExports(code) {
 function chunkHasImports(headLen, mergeAborted) {
   return headLen > 0 || mergeAborted;
 }
-function runtimeImportsOf(filePath) {
+function runtimeImportsOf(filePath, seen = /* @__PURE__ */ new Set()) {
+  if (seen.has(filePath)) return [];
+  seen.add(filePath);
   let text;
   try {
     text = readFileSync13(filePath, "utf8");
@@ -51553,6 +51666,29 @@ function runtimeImportsOf(filePath) {
       if (name) names.push(name);
     }
   }
+  const relativeImport = /import\s+(?:type\s+)?(?:[^'"]*?\sfrom\s*)?['"](\.[^'"]+)['"]/g;
+  for (const match of text.matchAll(relativeImport)) {
+    const base = resolve10(dirname9(filePath), match[1]);
+    const candidates = [
+      base,
+      `${base}.ts`,
+      `${base}.tsx`,
+      `${base}.js`,
+      `${base}.jsx`,
+      join8(base, "index.ts"),
+      join8(base, "index.tsx"),
+      join8(base, "index.js")
+    ];
+    for (const candidate of candidates) {
+      try {
+        if (!existsSync11(candidate) || !statSync4(candidate).isFile()) continue;
+      } catch {
+        continue;
+      }
+      names.push(...runtimeImportsOf(candidate, seen));
+      break;
+    }
+  }
   return names;
 }
 function sharedRuntimeResolver(shimPath) {
@@ -51590,7 +51726,7 @@ var ChunkImports = class {
       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 = resolveImportPath(src2, dirname8(filePath));
+      const resolved = resolveImportPath(src2, dirname9(filePath));
       for (const spec of node.specifiers ?? []) {
         const s = spec;
         const local = s.local?.name;
@@ -51895,7 +52031,7 @@ async function generateClientBundle(routeTree, appDir, componentMap, options) {
     __stats.distinct.add(filePath);
     let src2 = readFileSync13(filePath, "utf-8");
     if (/content=["'][^"']*\.md["']/i.test(src2)) {
-      src2 = inlineMdContentAttrs(src2, dirname8(filePath), guessProjectRoots(appDir));
+      src2 = inlineMdContentAttrs(src2, dirname9(filePath), guessProjectRoots(appDir));
     }
     const namesBefore = cache2 ? new Set(runtimeImportNames) : null;
     const importedPaths = resolveVskImports(filePath, (p, n) => compileFile2(p, n, output, imports));
@@ -51994,6 +52130,7 @@ async function generateClientBundle(routeTree, appDir, componentMap, options) {
         }
         if (chunkCode.length > 0) {
           const chunkName = `page-${buildChunkName(appDir, node)}.js`;
+          allRouteImportTables.push(chunkImports);
           if (!onlyRoutes || onlyRoutes.has(node.fullPath)) {
             if (!chunkImports.ok) console.error("[vesk] chunk import merge aborted for", chunkName + ":", chunkImports.reason);
             const head = chunkImports.render();
@@ -52010,7 +52147,7 @@ async function generateClientBundle(routeTree, appDir, componentMap, options) {
         if (emitted) {
           const fileName = options?.hmr ? chunkName : hashedName(chunkName, emitted.code);
           node.chunk = `/_vesk/static/${fileName}`;
-        } else if (options?.skipRouteChunks) {
+        } else if (options?.skipRouteChunks && (node.page || node.layout)) {
           node.chunk = `/_vesk/static/${chunkName}`;
         }
         annotate2(node.children || []);
@@ -52018,6 +52155,7 @@ async function generateClientBundle(routeTree, appDir, componentMap, options) {
     };
     var walkSplit = walkSplit2, annotate = annotate2;
     const chunkEntries = [];
+    const allRouteImportTables = [];
     walkSplit2(routeTree, []);
     const sharedCode = [];
     const sharedImports = new ChunkImports();
@@ -52039,16 +52177,37 @@ ${body}
 })();
 `;
     const sharedUsage = /* @__PURE__ */ new Map();
-    for (const entry of chunkEntries) {
-      for (const source of new Set(entry.importsTable.sources())) {
+    const sharedUsageTables = [...allRouteImportTables];
+    if (sharedCode.length > 0) sharedUsageTables.push(sharedImports);
+    for (const table of sharedUsageTables) {
+      for (const source of new Set(table.sources())) {
         sharedUsage.set(source, (sharedUsage.get(source) ?? 0) + 1);
       }
     }
     const isAppLocal = (source) => !source.includes("node_modules") && source.startsWith(resolve10(appDir, ".."));
-    const sharedSources = [...sharedUsage.entries()].filter(([source, uses]) => uses > 1 && isAppLocal(source)).map(([source]) => source);
+    const sharedFilesFor = /* @__PURE__ */ new Map();
+    for (const [source, uses] of sharedUsage) {
+      let file = source;
+      if (!source.startsWith("/")) {
+        try {
+          file = resolveSsrModule(source, appDir) ?? source;
+        } catch {
+        }
+      }
+      if (file.endsWith(".vsk") || !existsSync11(file)) continue;
+      let needsRuntime = false;
+      try {
+        needsRuntime = runtimeImportsOf(file).length > 0;
+      } catch {
+      }
+      if (needsRuntime || uses > 1 && isAppLocal(source)) {
+        sharedFilesFor.set(source, file);
+      }
+    }
+    const sharedSources = [...new Set(sharedFilesFor.values())];
     if (process.env.VESK_DEBUG_SHARED) {
       console.error("[shared] candidates:", [...sharedUsage.entries()].map(([s, n]) => `${n}x ${s}`).join("\n"));
-      console.error("[shared] selected:", sharedSources.join(", "));
+      console.error("[shared] selected:", [...sharedFilesFor.entries()].map(([s, f]) => `${s} -> ${f}`).join("\n"));
     }
     const chunkAlias = {};
     let sharedBundleCode = "";
@@ -52098,7 +52257,7 @@ ${body}
           ...appTsconfig ? { tsconfig: appTsconfig } : {}
         });
         sharedBundleCode = result.outputFiles[0].text;
-        sharedSources.forEach((source, i) => {
+        [...sharedFilesFor.entries()].forEach(([source, file], i) => {
           const named = /* @__PURE__ */ new Set();
           let hasDefault = false;
           for (const entry of chunkEntries) {
@@ -52107,7 +52266,7 @@ ${body}
             hasDefault = hasDefault || bindings.hasDefault;
           }
           const shim = join8(tmpBase, `shim-${i}.js`);
-          const shimLines = [`const m = globalThis.__veskShared[${JSON.stringify(source)}];`];
+          const shimLines = [`const m = globalThis.__veskShared[${JSON.stringify(file)}];`];
           if (hasDefault) shimLines.push(`export default m;`);
           for (const name of [...named].sort()) {
             shimLines.push(`export const ${name} = m[${JSON.stringify(name)}];`);
@@ -52394,7 +52553,7 @@ async function bundleRuntimeNames(runtimeDir, names, strict = false) {
   const unique = [...new Set(names)];
   try {
     try {
-      mkdirSync3(dirname8(entry), { recursive: true });
+      mkdirSync3(dirname9(entry), { recursive: true });
     } catch {
     }
     try {
@@ -52630,7 +52789,7 @@ function copyStaticAssets(publicDir, outDir) {
 
 // ../adapter/src/prod-server.ts
 import { readFileSync as readFileSync18, existsSync as existsSync16, statSync as statSync8 } from "node:fs";
-import { resolve as resolve14, dirname as dirname11, basename } from "node:path";
+import { resolve as resolve14, dirname as dirname12, basename } from "node:path";
 import { createServer } from "node:http";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 init_server_utils();
@@ -52670,7 +52829,7 @@ init_paths();
 
 // ../adapter/src/load-config.ts
 import { existsSync as existsSync14, readFileSync as readFileSync16, writeFileSync as writeFileSync6, mkdirSync as mkdirSync5 } from "node:fs";
-import { join as join10, dirname as dirname9 } from "node:path";
+import { join as join10, dirname as dirname10 } from "node:path";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 import { createRequire as createRequire3 } from "node:module";
 async function loadVeskConfig2(projectDir) {
@@ -52714,7 +52873,7 @@ async function loadVeskConfig2(projectDir) {
     js = `const {${injectKeys.join(",")}} = globalThis.__vesk_inject;
 ` + js;
     const tmpFile = join10(projectDir, ".vesk", "config.loader.tmp.mjs");
-    mkdirSync5(dirname9(tmpFile), { recursive: true });
+    mkdirSync5(dirname10(tmpFile), { recursive: true });
     writeFileSync6(tmpFile, js, "utf-8");
     globalThis.__vesk_inject = inject;
     try {
@@ -53027,7 +53186,7 @@ function makeWebRequest(nodeReq, url, maxBodyBytes = DEFAULT_MAX_BODY_BYTES) {
   const settleEnd = (body) => {
     if (body !== null) cachedBody = body;
     streamEnded = true;
-    for (const resolve41 of endWaiters.splice(0)) resolve41();
+    for (const resolve42 of endWaiters.splice(0)) resolve42();
   };
   function createBodyStream() {
     streamTaken = true;
@@ -53148,11 +53307,17 @@ function makeWebRequest(nodeReq, url, maxBodyBytes = DEFAULT_MAX_BODY_BYTES) {
 
 // ../adapter/src/prod-server.ts
 init_platform_output();
-var __dirname4 = dirname11(fileURLToPath3(import.meta.url));
+var __dirname4 = dirname12(fileURLToPath3(import.meta.url));
 var STREAMING_TYPES = /* @__PURE__ */ new Set(["text/event-stream", "application/x-ndjson"]);
 var DELIVER_BUFFER_LIMIT = 1024 * 1024;
-async function deliverResponse(res, response) {
+function toNodeHeaders(response) {
   const headers2 = Object.fromEntries(response.headers);
+  const cookies2 = response.headers.getSetCookie?.() ?? [];
+  if (cookies2.length > 0) headers2["set-cookie"] = cookies2;
+  return headers2;
+}
+async function deliverResponse(res, response) {
+  const headers2 = toNodeHeaders(response);
   const body = response.body;
   if (!body || typeof body.getReader !== "function") {
     res.writeHead(response.status, headers2);
@@ -53207,6 +53372,22 @@ function errorStatus(e, fallback) {
   const s = e?.status ?? e?.statusCode;
   return typeof s === "number" && s >= 400 && s < 600 ? s : fallback;
 }
+function firstHeaderValue(value) {
+  const raw2 = Array.isArray(value) ? value[0] : value;
+  const trimmed = raw2?.split(",")[0]?.trim();
+  return trimmed || void 0;
+}
+function resolveRequestUrl(req, port, trustProxy) {
+  const proto = req.socket.encrypted ? "https" : getClientProtocol({ headers: req.headers }, trustProxy);
+  const forwardedHost = trustProxy ? firstHeaderValue(req.headers["x-forwarded-host"]) : void 0;
+  const host = forwardedHost || req.headers.host || `localhost:${port}`;
+  const path = req.url || "/";
+  try {
+    return new URL(path, `${proto}://${host}`);
+  } catch {
+    return new URL(path, `http://localhost:${port}`);
+  }
+}
 async function startProdServer(outDir, options) {
   const port = options?.port || 3e3;
   const host = options?.host || "127.0.0.1";
@@ -53333,10 +53514,8 @@ async function startProdServer(outDir, options) {
     return req.headers["x-real-ip"] || req.socket?.remoteAddress || "unknown";
   }
   const server = createServer(async (req, res) => {
-    const url = new URL(req.url || "/", `http://localhost:${port}`);
-    const reqHost = req.headers.host || `localhost:${port}`;
-    const proto = req.socket.encrypted ? "https" : getClientProtocol({ headers: req.headers }, !!securityConfig?.trustProxy);
-    globalThis.__vesk_ssr_base_url = `${proto}://${reqHost}`;
+    const url = resolveRequestUrl(req, port, !!securityConfig?.trustProxy);
+    globalThis.__vesk_ssr_base_url = url.origin;
     if (healthCheckEnabled && (url.pathname === "/healthz" || url.pathname === "/_vesk/healthz")) {
       const probe = JSON.stringify({ status: "ok", uptime: Math.floor(process.uptime()) });
       res.writeHead(200, {
@@ -53739,9 +53918,9 @@ init_paths();
 
 // ../adapter/dist/index.js
 function PACKAGES_DIR_SELF() {
-  return resolve21(dirname16(fileURLToPath5(import.meta.url)), "..");
+  return resolve21(dirname17(fileURLToPath5(import.meta.url)), "..");
 }
-var __dirname6 = dirname16(fileURLToPath5(import.meta.url));
+var __dirname6 = dirname17(fileURLToPath5(import.meta.url));
 async function resolveCompilerApi(name) {
   const monorepoSrc = resolve21(__dirname6, "..", "..", "compiler", "src");
   if (existsSync22(monorepoSrc)) {
@@ -53792,7 +53971,7 @@ function filterPluginsForBuild(plugins, state) {
 function veskDirFromOutDir(outDir) {
   const base = basename3(outDir);
   if (base === "dev" || base === "build")
-    return dirname16(outDir);
+    return dirname17(outDir);
   return outDir;
 }
 async function collectPluginHeadExtra(pluginsPipelines) {
@@ -54139,9 +54318,9 @@ vesk build: done (${outDir})`);
 init_seo_audit();
 
 // src/dev-server.ts
-import { readFileSync as readFileSync40, watch, statSync as statSync22, existsSync as existsSync42, mkdirSync as mkdirSync19, readdirSync as readdirSync14, writeFileSync as writeFileSync21, renameSync as renameSync2 } from "node:fs";
+import { readFileSync as readFileSync41, watch, statSync as statSync22, existsSync as existsSync43, mkdirSync as mkdirSync19, readdirSync as readdirSync14, writeFileSync as writeFileSync21, renameSync as renameSync2 } from "node:fs";
 import { createHash as createHash3 } from "node:crypto";
-import { resolve as resolve38, extname as extname7, join as join27, dirname as dirname26 } from "node:path";
+import { resolve as resolve39, extname as extname7, join as join28, dirname as dirname27, relative as relative9 } from "node:path";
 import { createServer as createServer2 } from "node:http";
 import { WebSocketServer as WebSocketServer2 } from "ws";
 
@@ -55183,8 +55362,20 @@ function emitStatic2(ctx2, node, tracked2, effectsVar, skipK = 0, regionBudget)
     let childVar;
     const isPureStaticChild = ctx2.hydrate && child instanceof StaticNode && isStaticIR2(child.children);
     if (isPureStaticChild) {
-      const ssrEl = `${el}.__vsk_ssrEls[${residueBefore}]`;
-      childVar = ssrEl;
+      const savedHydrate = ctx2.hydrate;
+      ctx2.hydrate = false;
+      const buildStart = ctx2.lines.length;
+      const freshChild = emitStatic2(ctx2, child, tracked2, effectsVar);
+      const buildLines = ctx2.lines.splice(buildStart, ctx2.lines.length - buildStart);
+      ctx2.hydrate = savedHydrate;
+      const childSlot = ctx2.n();
+      ctx2.push(`const ${childSlot} = ${el}.__vsk_ssrEls ? ${el}.__vsk_ssrEls[${residueBefore}] : (() => {`);
+      for (const line of buildLines)
+        ctx2.push(`	${line}`);
+      ctx2.push(`	return ${freshChild ?? "document.createElement('div')"};`);
+      ctx2.push(`})();`);
+      childVar = childSlot;
+      const ssrEl = childSlot;
       const dynAttrs2 = [];
       const staticChildren = [];
       for (const c of child.children) {
@@ -55428,12 +55619,12 @@ function emitDynamicBinding2(ctx2, node, tracked2, effectsVar, ssrTextExpr = nul
   const expr = transformTracked2(node.expression, tracked2);
   const v = ctx2.n();
   if (!isReactiveExpression2(node.expression, tracked2)) {
-    ctx2.push(`const ${v} = document.createTextNode(String(${expr}));`);
+    ctx2.push(`const ${v} = document.createTextNode(String((${expr}) ?? ''));`);
     return v;
   }
   const init = ssrTextExpr ? `String(${ssrTextExpr} ?? '')` : `''`;
   ctx2.push(`const ${v} = document.createTextNode(${init});`);
-  const eff = `effect(() => { ${v}.data = String(${expr}); })`;
+  const eff = `effect(() => { const __v = ${expr}; ${v}.data = __v == null ? '' : String(__v); })`;
   if (effectsVar) {
     ctx2.push(`${effectsVar}.push(${eff});`);
   } else {
@@ -56738,8 +56929,9 @@ function claimsWalkerNode2(ctx2, node) {
     return ctx2.claimStatic || !isStaticIR2(node.children);
   if (node instanceof ComponentCall)
     return true;
-  if (node instanceof OpaqueDynamicRegion)
-    return true;
+  if (node instanceof OpaqueDynamicRegion) {
+    return branchClaimsWalker2(ctx2, node.consequentNodes) || branchClaimsWalker2(ctx2, node.alternateNodes);
+  }
   if (node instanceof MapRegion)
     return true;
   if (node instanceof ForLoop)
@@ -56752,6 +56944,13 @@ function claimsWalkerNode2(ctx2, node) {
     return true;
   return false;
 }
+function branchClaimsWalker2(ctx2, nodes) {
+  const previous = ctx2.claimStatic;
+  ctx2.claimStatic = true;
+  const claims = nodes.some((node) => claimsWalkerNode2(ctx2, node));
+  ctx2.claimStatic = previous;
+  return claims;
+}
 function isStaticComponent2(comp) {
   if (comp.style)
     return false;
@@ -58105,7 +58304,7 @@ async function runEventHandlers(handlers, name, ctx2) {
 
 // ../compiler/dist/md-inline.js
 import { readFileSync as readFileSync25, existsSync as existsSync27 } from "node:fs";
-import { dirname as dirname17, join as join20, resolve as resolve23 } from "node:path";
+import { dirname as dirname18, join as join20, resolve as resolve23 } from "node:path";
 var MD_EXT_MARKER2 = ".md";
 function looksLikeMarkdownPath2(value) {
   const v = value.trim();
@@ -58201,7 +58400,7 @@ function guessProjectRoots2(dir) {
     roots.push(cur);
     if (existsSync27(join20(cur, "package.json")))
       break;
-    const parent = dirname17(cur);
+    const parent = dirname18(cur);
     if (parent === cur)
       break;
     cur = parent;
@@ -58211,7 +58410,7 @@ function guessProjectRoots2(dir) {
 
 // ../adapter/dist/client-bundle.js
 import { readFileSync as readFileSync26, existsSync as existsSync28, writeFileSync as writeFileSync13, unlinkSync as unlinkSync4, statSync as statSync15, rmSync as rmSync4, mkdtempSync as mkdtempSync2, mkdirSync as mkdirSync12 } from "node:fs";
-import { resolve as resolve24, join as join21, dirname as dirname18, relative as relative6, sep as sep3 } from "node:path";
+import { resolve as resolve24, join as join21, dirname as dirname19, relative as relative6, sep as sep3 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 import { tmpdir as tmpdir3 } from "node:os";
 
@@ -58299,7 +58498,7 @@ async function mapWithConcurrency2(items, limit, fn) {
     throw firstError;
   return out;
 }
-var __dirname7 = dirname18(fileURLToPath6(import.meta.url));
+var __dirname7 = dirname19(fileURLToPath6(import.meta.url));
 function fileUnchanged2(filePath, cached) {
   try {
     const st = statSync15(filePath);
@@ -58481,7 +58680,10 @@ function demoteExports2(code) {
 function chunkHasImports2(headLen, mergeAborted) {
   return headLen > 0 || mergeAborted;
 }
-function runtimeImportsOf2(filePath) {
+function runtimeImportsOf2(filePath, seen = /* @__PURE__ */ new Set()) {
+  if (seen.has(filePath))
+    return [];
+  seen.add(filePath);
   let text;
   try {
     text = readFileSync26(filePath, "utf8");
@@ -58502,6 +58704,30 @@ function runtimeImportsOf2(filePath) {
         names.push(name);
     }
   }
+  const relativeImport = /import\s+(?:type\s+)?(?:[^'"]*?\sfrom\s*)?['"](\.[^'"]+)['"]/g;
+  for (const match of text.matchAll(relativeImport)) {
+    const base = resolve24(dirname19(filePath), match[1]);
+    const candidates = [
+      base,
+      `${base}.ts`,
+      `${base}.tsx`,
+      `${base}.js`,
+      `${base}.jsx`,
+      join21(base, "index.ts"),
+      join21(base, "index.tsx"),
+      join21(base, "index.js")
+    ];
+    for (const candidate of candidates) {
+      try {
+        if (!existsSync28(candidate) || !statSync15(candidate).isFile())
+          continue;
+      } catch {
+        continue;
+      }
+      names.push(...runtimeImportsOf2(candidate, seen));
+      break;
+    }
+  }
   return names;
 }
 function sharedRuntimeResolver2(shimPath) {
@@ -58542,7 +58768,7 @@ var ChunkImports2 = class {
       const src2 = node.source?.value;
       if (typeof src2 !== "string")
         continue;
-      const resolved = resolveImportPath(src2, dirname18(filePath));
+      const resolved = resolveImportPath(src2, dirname19(filePath));
       for (const spec of node.specifiers ?? []) {
         const s = spec;
         const local = s.local?.name;
@@ -58879,7 +59105,7 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options) {
     __stats.distinct.add(filePath);
     let src2 = readFileSync26(filePath, "utf-8");
     if (/content=["'][^"']*\.md["']/i.test(src2)) {
-      src2 = inlineMdContentAttrs(src2, dirname18(filePath), guessProjectRoots(appDir));
+      src2 = inlineMdContentAttrs(src2, dirname19(filePath), guessProjectRoots(appDir));
     }
     const namesBefore = cache2 ? new Set(runtimeImportNames) : null;
     const importedPaths = resolveVskImports(filePath, (p, n) => compileFile2(p, n, output, imports));
@@ -58985,6 +59211,7 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options) {
         }
         if (chunkCode.length > 0) {
           const chunkName = `page-${buildChunkName2(appDir, node)}.js`;
+          allRouteImportTables.push(chunkImports);
           if (!onlyRoutes || onlyRoutes.has(node.fullPath)) {
             if (!chunkImports.ok)
               console.error("[vesk] chunk import merge aborted for", chunkName + ":", chunkImports.reason);
@@ -59002,7 +59229,7 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options) {
         if (emitted) {
           const fileName = options?.hmr ? chunkName : hashedName(chunkName, emitted.code);
           node.chunk = `/_vesk/static/${fileName}`;
-        } else if (options?.skipRouteChunks) {
+        } else if (options?.skipRouteChunks && (node.page || node.layout)) {
           node.chunk = `/_vesk/static/${chunkName}`;
         }
         annotate2(node.children || []);
@@ -59010,6 +59237,7 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options) {
     };
     var walkSplit = walkSplit2, annotate = annotate2;
     const chunkEntries = [];
+    const allRouteImportTables = [];
     walkSplit2(routeTree, []);
     const sharedCode = [];
     const sharedImports = new ChunkImports2();
@@ -59032,16 +59260,39 @@ ${body}
 })();
 `;
     const sharedUsage = /* @__PURE__ */ new Map();
-    for (const entry of chunkEntries) {
-      for (const source of new Set(entry.importsTable.sources())) {
+    const sharedUsageTables = [...allRouteImportTables];
+    if (sharedCode.length > 0)
+      sharedUsageTables.push(sharedImports);
+    for (const table of sharedUsageTables) {
+      for (const source of new Set(table.sources())) {
         sharedUsage.set(source, (sharedUsage.get(source) ?? 0) + 1);
       }
     }
     const isAppLocal = (source) => !source.includes("node_modules") && source.startsWith(resolve24(appDir, ".."));
-    const sharedSources = [...sharedUsage.entries()].filter(([source, uses]) => uses > 1 && isAppLocal(source)).map(([source]) => source);
+    const sharedFilesFor = /* @__PURE__ */ new Map();
+    for (const [source, uses] of sharedUsage) {
+      let file = source;
+      if (!source.startsWith("/")) {
+        try {
+          file = resolveSsrModule(source, appDir) ?? source;
+        } catch {
+        }
+      }
+      if (file.endsWith(".vsk") || !existsSync28(file))
+        continue;
+      let needsRuntime = false;
+      try {
+        needsRuntime = runtimeImportsOf2(file).length > 0;
+      } catch {
+      }
+      if (needsRuntime || uses > 1 && isAppLocal(source)) {
+        sharedFilesFor.set(source, file);
+      }
+    }
+    const sharedSources = [...new Set(sharedFilesFor.values())];
     if (process.env.VESK_DEBUG_SHARED) {
       console.error("[shared] candidates:", [...sharedUsage.entries()].map(([s, n]) => `${n}x ${s}`).join("\n"));
-      console.error("[shared] selected:", sharedSources.join(", "));
+      console.error("[shared] selected:", [...sharedFilesFor.entries()].map(([s, f]) => `${s} -> ${f}`).join("\n"));
     }
     const chunkAlias = {};
     let sharedBundleCode = "";
@@ -59092,7 +59343,7 @@ ${body}
           ...appTsconfig ? { tsconfig: appTsconfig } : {}
         });
         sharedBundleCode = result.outputFiles[0].text;
-        sharedSources.forEach((source, i) => {
+        [...sharedFilesFor.entries()].forEach(([source, file], i) => {
           const named = /* @__PURE__ */ new Set();
           let hasDefault = false;
           for (const entry of chunkEntries) {
@@ -59101,7 +59352,7 @@ ${body}
             hasDefault = hasDefault || bindings.hasDefault;
           }
           const shim = join21(tmpBase, `shim-${i}.js`);
-          const shimLines = [`const m = globalThis.__veskShared[${JSON.stringify(source)}];`];
+          const shimLines = [`const m = globalThis.__veskShared[${JSON.stringify(file)}];`];
           if (hasDefault)
             shimLines.push(`export default m;`);
           for (const name of [...named].sort()) {
@@ -59407,7 +59658,7 @@ async function bundleRuntimeNames2(runtimeDir, names, strict = false) {
   const unique = [...new Set(names)];
   try {
     try {
-      mkdirSync12(dirname18(entry), { recursive: true });
+      mkdirSync12(dirname19(entry), { recursive: true });
     } catch {
     }
     try {
@@ -59648,7 +59899,7 @@ import { resolve as resolve28 } from "node:path";
 // ../adapter/dist/plugins.js
 init_paths();
 import { readFileSync as readFileSync28, writeFileSync as writeFileSync14, existsSync as existsSync30, mkdirSync as mkdirSync13, statSync as statSync17 } from "node:fs";
-import { resolve as resolve26, dirname as dirname19, join as join22, extname as extname6, basename as basename6 } from "node:path";
+import { resolve as resolve26, dirname as dirname20, join as join22, extname as extname6, basename as basename6 } from "node:path";
 import { createRequire as createRequire6 } from "node:module";
 import { spawn as spawn2 } from "node:child_process";
 var PLUGIN_STATE_FILENAME2 = "plugins.json";
@@ -59689,7 +59940,7 @@ function readPluginState2(veskDir) {
 }
 function writePluginState2(veskDir, state) {
   const file = stateFilePath2(veskDir);
-  const dir = dirname19(file);
+  const dir = dirname20(file);
   if (!existsSync30(dir))
     mkdirSync13(dir, { recursive: true });
   writeFileSync14(file, JSON.stringify(state, null, 2) + "\n", "utf-8");
@@ -59704,16 +59955,16 @@ function resolvePackage2(appDir, pkg) {
   } catch {
     try {
       entryPath = require3.resolve(pkg);
-      let cur = dirname19(entryPath);
+      let cur = dirname20(entryPath);
       const seen = /* @__PURE__ */ new Set();
-      while (cur && cur !== dirname19(cur) && !seen.has(cur)) {
+      while (cur && cur !== dirname20(cur) && !seen.has(cur)) {
         seen.add(cur);
         const candidate = join22(cur, "package.json");
         if (existsSync30(candidate)) {
           pkgJsonPath = candidate;
           break;
         }
-        const parent = dirname19(cur);
+        const parent = dirname20(cur);
         if (parent !== cur && basename6(cur) === "node_modules")
           break;
         cur = parent;
@@ -59724,7 +59975,7 @@ function resolvePackage2(appDir, pkg) {
   if (pkgJsonPath && existsSync30(pkgJsonPath)) {
     pkgJson = readJsonFile2(pkgJsonPath);
     const main = pkgJson?.main || pkgJson?.module || "index.js";
-    entryPath = resolve26(dirname19(pkgJsonPath), main);
+    entryPath = resolve26(dirname20(pkgJsonPath), main);
   }
   let localPath = localDir2(appDir, pkg);
   if (!localPath) {
@@ -59745,7 +59996,7 @@ function resolvePackage2(appDir, pkg) {
     return { installed: true, path: localPath, dir: localPath, packageJson: json ?? pkgJson };
   }
   const installed2 = !!pkgJsonPath && existsSync30(pkgJsonPath);
-  return { installed: installed2, path: entryPath, dir: installed2 ? dirname19(pkgJsonPath) : null, packageJson: pkgJson };
+  return { installed: installed2, path: entryPath, dir: installed2 ? dirname20(pkgJsonPath) : null, packageJson: pkgJson };
 }
 function localDir2(base, pkg) {
   if (pkg.startsWith("@")) {
@@ -60625,7 +60876,7 @@ var __internals2 = {
 // ../adapter/dist/dev-config.js
 import { existsSync as existsSync31, readFileSync as readFileSync29, writeFileSync as writeFileSync15, mkdirSync as mkdirSync14, mkdtempSync as mkdtempSync3, rmSync as rmSync5 } from "node:fs";
 import { tmpdir as tmpdir4 } from "node:os";
-import { resolve as resolve27, dirname as dirname20, join as join23 } from "node:path";
+import { resolve as resolve27, dirname as dirname21, join as join23 } from "node:path";
 init_parser();
 function findConfigFile2(projectDir) {
   const ts9 = resolve27(projectDir, "vesk.config.ts");
@@ -60690,7 +60941,7 @@ async function writeConfigSource2(projectDir, source) {
   const { path, isTs } = findConfigFile2(projectDir);
   const target = path || resolve27(projectDir, "vesk.config.ts");
   await parseConfigSource(source, isTs, projectDir);
-  mkdirSync14(dirname20(target), { recursive: true });
+  mkdirSync14(dirname21(target), { recursive: true });
   writeFileSync15(target, source, "utf-8");
   const config = await parseConfigSource(source, isTs, projectDir);
   return { path: target, exists: true, source, config };
@@ -61965,7 +62216,7 @@ function produceDiagnostics(input) {
 
 // ../agentic/dist/checkpoints.js
 import { existsSync as existsSync33, mkdirSync as mkdirSync15, readFileSync as readFileSync31, writeFileSync as writeFileSync16, statSync as statSync19, unlinkSync as unlinkSync5, rmSync as rmSync6, renameSync } from "node:fs";
-import { join as join24, resolve as resolve29, dirname as dirname21, sep as sep5 } from "node:path";
+import { join as join24, resolve as resolve29, dirname as dirname22, sep as sep5 } from "node:path";
 import { randomUUID as nodeRandomUUID } from "node:crypto";
 function generateId() {
   try {
@@ -62125,7 +62376,7 @@ function readJson(filePath, fallback) {
   }
 }
 function writeJsonAtomic(filePath, data2) {
-  ensureDir(dirname21(filePath));
+  ensureDir(dirname22(filePath));
   const tmp = `${filePath}.tmp`;
   writeFileSync16(tmp, JSON.stringify(data2, null, 2), "utf-8");
   try {
@@ -62226,7 +62477,7 @@ function rollback(projectDir, id) {
       }
     } else {
       try {
-        ensureDir(dirname21(abs));
+        ensureDir(dirname22(abs));
         writeFileSync16(abs, f.before, "utf-8");
       } catch {
       }
@@ -62237,7 +62488,7 @@ function rollback(projectDir, id) {
 
 // ../agentic/dist/config.js
 import { readFileSync as readFileSync32, writeFileSync as writeFileSync17, existsSync as existsSync34, mkdirSync as mkdirSync16, chmodSync } from "node:fs";
-import { resolve as resolve30, dirname as dirname22 } from "node:path";
+import { resolve as resolve30, dirname as dirname23 } from "node:path";
 var DEFAULT_CONFIG = {
   provider: "openai",
   model: "",
@@ -62366,7 +62617,7 @@ function saveAgenticConfig(projectDir, patch) {
   if (next.baseUrl)
     toWrite.baseUrl = next.baseUrl;
   try {
-    mkdirSync16(dirname22(p), { recursive: true });
+    mkdirSync16(dirname23(p), { recursive: true });
     writeFileSync17(p, JSON.stringify(toWrite, null, 2), "utf-8");
   } catch {
   }
@@ -63692,7 +63943,7 @@ var Agent = class {
 
 // ../agentic/dist/tools/vesk.js
 import { existsSync as existsSync36, readFileSync as readFileSync34, writeFileSync as writeFileSync18, mkdirSync as mkdirSync17, readdirSync as readdirSync11, statSync as statSync20 } from "node:fs";
-import { resolve as resolve32, join as join25, dirname as dirname23, sep as sep6 } from "node:path";
+import { resolve as resolve32, join as join25, dirname as dirname24, sep as sep6 } from "node:path";
 function resolveWithin3(baseDir, relPath) {
   const base = resolve32(baseDir);
   const target = resolve32(baseDir, relPath);
@@ -63725,7 +63976,7 @@ function readPluginState3(veskDir) {
 }
 function writePluginState3(veskDir, state) {
   const file = stateFilePath3(veskDir);
-  mkdirSync17(dirname23(file), { recursive: true });
+  mkdirSync17(dirname24(file), { recursive: true });
   writeFileSync18(file, JSON.stringify(state, null, 2) + "\n", "utf-8");
 }
 function eqIgnoreCase3(a, b) {
@@ -64085,7 +64336,7 @@ function createVeskTools(deps) {
               if (!contained)
                 return jsonError("path escapes project root");
             }
-            mkdirSync17(dirname23(target), { recursive: true });
+            mkdirSync17(dirname24(target), { recursive: true });
             writeFileSync18(target, source, "utf-8");
             return jsonOk({ ok: true, path: target, source });
           }
@@ -64506,19 +64757,34 @@ function renderDefaultNotFoundPage2(opts = {}) {
   });
 }
 
-// ../adapter/dist/css.js
+// ../adapter/dist/ssr-function.js
 import { readFileSync as readFileSync35, existsSync as existsSync37 } from "node:fs";
-import { resolve as resolve33 } from "node:path";
+import { resolve as resolve33, relative as relative7, join as join26 } from "node:path";
+init_default_pages();
+function resolveBoundaryFileForUrl2(pathname, appDir, file) {
+  const segments = pathname.split("/").filter(Boolean);
+  for (let depth = segments.length; depth >= 0; depth--) {
+    const dir = join26(appDir, ...segments.slice(0, depth));
+    const p = join26(dir, file);
+    if (existsSync37(p))
+      return p;
+  }
+  return null;
+}
+
+// ../adapter/dist/css.js
+import { readFileSync as readFileSync36, existsSync as existsSync38 } from "node:fs";
+import { resolve as resolve34 } from "node:path";
 var GLOBAL_CSS_URL2 = "/_vesk/static/global.css";
 function resolveUserCssPath2(appDir) {
-  const appCssSrc = resolve33(appDir, "global.css");
-  if (existsSync37(appCssSrc))
+  const appCssSrc = resolve34(appDir, "global.css");
+  if (existsSync38(appCssSrc))
     return appCssSrc;
-  const cssSrc = resolve33(appDir, "..", "src", "global.css");
-  if (existsSync37(cssSrc))
+  const cssSrc = resolve34(appDir, "..", "src", "global.css");
+  if (existsSync38(cssSrc))
     return cssSrc;
-  const altCssSrc = resolve33(appDir, "..", "src", "app.css");
-  if (existsSync37(altCssSrc))
+  const altCssSrc = resolve34(appDir, "..", "src", "app.css");
+  if (existsSync38(altCssSrc))
     return altCssSrc;
   return null;
 }
@@ -64534,8 +64800,8 @@ function resolveCssUrls2(opts) {
 // ../adapter/dist/hmr.js
 init_client_codegen();
 import { WebSocketServer } from "ws";
-import { readFileSync as readFileSync36, existsSync as existsSync38, writeFileSync as writeFileSync19 } from "node:fs";
-import { resolve as resolve34, dirname as dirname24 } from "node:path";
+import { readFileSync as readFileSync37, existsSync as existsSync39, writeFileSync as writeFileSync19 } from "node:fs";
+import { resolve as resolve35, dirname as dirname25 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 init_default_pages();
 init_paths();
@@ -64743,7 +65009,7 @@ function suggestFor(message) {
 }
 
 // ../adapter/dist/hmr.js
-var __dirname8 = dirname24(fileURLToPath7(import.meta.url));
+var __dirname8 = dirname25(fileURLToPath7(import.meta.url));
 function buildErrorPayload(error, filename, opts = {}) {
   const file = typeof filename === "string" && filename ? filename : "unknown";
   const parsed = parseCompilerError(error, file);
@@ -64766,19 +65032,19 @@ function buildErrorPayload(error, filename, opts = {}) {
     if (file.startsWith("/")) {
       candidates.push(file);
     } else {
-      candidates.push(resolve34(opts.appDir, file));
+      candidates.push(resolve35(opts.appDir, file));
       if (file.startsWith("app/")) {
-        candidates.push(resolve34(opts.appDir, file.slice(4)));
-        candidates.push(resolve34(opts.appDir, "..", file));
+        candidates.push(resolve35(opts.appDir, file.slice(4)));
+        candidates.push(resolve35(opts.appDir, "..", file));
       } else {
-        candidates.push(resolve34(opts.appDir, "..", file));
+        candidates.push(resolve35(opts.appDir, "..", file));
       }
-      candidates.push(resolve34(file));
+      candidates.push(resolve35(file));
     }
     for (const absPath of candidates) {
       try {
-        if (existsSync38(absPath)) {
-          src2 = readFileSync36(absPath, "utf-8");
+        if (existsSync39(absPath)) {
+          src2 = readFileSync37(absPath, "utf-8");
           resolvedAbsPath = absPath;
           break;
         }
@@ -64794,7 +65060,7 @@ function buildErrorPayload(error, filename, opts = {}) {
     }
   }
   const tipsData = suggestFor(message);
-  const filePath = resolvedAbsPath ?? (typeof opts.appDir === "string" ? resolve34(opts.appDir, file) : void 0);
+  const filePath = resolvedAbsPath ?? (typeof opts.appDir === "string" ? resolve35(opts.appDir, file) : void 0);
   const errorCode = parsed && typeof parsed.code === "string" && parsed.code ? parsed.code : error?.code ? String(error.code) : void 0;
   const cleanMessage = filePath && message.endsWith(` in ${filePath}`) ? message.slice(0, -` in ${filePath}`.length).trim() : message.endsWith(` in ${file}`) ? message.slice(0, -` in ${file}`.length).trim() : message;
   const payload = {
@@ -64826,8 +65092,8 @@ function buildErrorPayload(error, filename, opts = {}) {
 }
 
 // ../adapter/dist/ssr-error.js
-import { existsSync as existsSync39, readFileSync as readFileSync37 } from "node:fs";
-import { relative as relative7, resolve as resolve35 } from "node:path";
+import { existsSync as existsSync40, readFileSync as readFileSync38 } from "node:fs";
+import { relative as relative8, resolve as resolve36 } from "node:path";
 
 // ../adapter/dist/error-codeframe.js
 function buildCodeframe2(src2, line, column, context = 5) {
@@ -65011,7 +65277,7 @@ function firstSourceFileFrame(stack, projectRoot) {
     if (!isInsideRoot(p, projectRoot))
       continue;
     try {
-      if (!existsSync39(p))
+      if (!existsSync40(p))
         continue;
     } catch {
       continue;
@@ -65042,22 +65308,22 @@ function findIdentifierUsage(src2, name) {
   return null;
 }
 function projectOf(ctx2) {
-  return ctx2.projectDir || resolve35(ctx2.appDir, "..");
+  return ctx2.projectDir || resolve36(ctx2.appDir, "..");
 }
 function displayPath(absPath, ctx2) {
-  const appRel = relative7(ctx2.appDir, absPath);
+  const appRel = relative8(ctx2.appDir, absPath);
   if (appRel && !appRel.startsWith(".."))
     return appRel || absPath;
-  const projRel = relative7(projectOf(ctx2), absPath);
+  const projRel = relative8(projectOf(ctx2), absPath);
   if (projRel && !projRel.startsWith(".."))
     return projRel;
   return absPath;
 }
 function readIfFile(absPath) {
   try {
-    if (!existsSync39(absPath))
+    if (!existsSync40(absPath))
       return null;
-    return readFileSync37(absPath, "utf-8");
+    return readFileSync38(absPath, "utf-8");
   } catch {
     return null;
   }
@@ -65065,13 +65331,13 @@ function readIfFile(absPath) {
 function resolveComponentFile(name, ctx2) {
   const fromRoutes = ctx2.routeSources?.get(name);
   if (fromRoutes) {
-    const abs = resolve35(ctx2.appDir, fromRoutes);
+    const abs = resolve36(ctx2.appDir, fromRoutes);
     if (readIfFile(abs) !== null)
       return abs;
   }
   const fromShared = ctx2.componentMap?.get(name);
   if (fromShared) {
-    const abs = resolve35(projectOf(ctx2), fromShared);
+    const abs = resolve36(projectOf(ctx2), fromShared);
     if (readIfFile(abs) !== null)
       return abs;
     if (readIfFile(fromShared) !== null)
@@ -65205,13 +65471,13 @@ function renderDevErrorPage(payload, opts) {
 
 // src/build-packages.ts
 import { spawnSync as spawnSync2 } from "node:child_process";
-import { cpSync as cpSync2, existsSync as existsSync40, mkdirSync as mkdirSync18, readFileSync as readFileSync38, readdirSync as readdirSync12, statSync as statSync21, writeFileSync as writeFileSync20 } from "node:fs";
+import { cpSync as cpSync2, existsSync as existsSync41, mkdirSync as mkdirSync18, readFileSync as readFileSync39, readdirSync as readdirSync12, statSync as statSync21, writeFileSync as writeFileSync20 } from "node:fs";
 import { createRequire as createRequire7 } from "node:module";
-import { dirname as dirname25, join as join26, resolve as resolve36 } from "node:path";
+import { dirname as dirname26, join as join27, resolve as resolve37 } from "node:path";
 import { fileURLToPath as fileURLToPath8 } from "node:url";
 var require2 = createRequire7(import.meta.url);
-var __dirname9 = dirname25(fileURLToPath8(import.meta.url));
-var root2 = resolve36(__dirname9, "..", "..", "..");
+var __dirname9 = dirname26(fileURLToPath8(import.meta.url));
+var root2 = resolve37(__dirname9, "..", "..", "..");
 var PACKAGES = {
   // types first — it is a dependency-free leaf that compiler and adapter
   // import for their shared type definitions.
@@ -65242,7 +65508,7 @@ var PACKAGES = {
 function newestSourceMtime(srcDir) {
   let newest = 0;
   for (const name of readdirSync12(srcDir)) {
-    const p = join26(srcDir, name);
+    const p = join27(srcDir, name);
     const st = statSync21(p);
     if (st.isDirectory()) {
       newest = Math.max(newest, newestSourceMtime(p));
@@ -65253,11 +65519,11 @@ function newestSourceMtime(srcDir) {
   return newest;
 }
 function distStale(pkgDir, entry) {
-  const distIndex = join26(pkgDir, "dist", `${entry}.js`);
-  if (!existsSync40(distIndex)) return true;
-  const distPkg = join26(pkgDir, "dist", "package.json");
-  const distStamp = Math.max(statSync21(distIndex).mtimeMs, existsSync40(distPkg) ? statSync21(distPkg).mtimeMs : 0);
-  return newestSourceMtime(join26(pkgDir, "src")) > distStamp;
+  const distIndex = join27(pkgDir, "dist", `${entry}.js`);
+  if (!existsSync41(distIndex)) return true;
+  const distPkg = join27(pkgDir, "dist", "package.json");
+  const distStamp = Math.max(statSync21(distIndex).mtimeMs, existsSync41(distPkg) ? statSync21(distPkg).mtimeMs : 0);
+  return newestSourceMtime(join27(pkgDir, "src")) > distStamp;
 }
 function distPackageJson(pkgName, entry, serverEntry, version2) {
   const exports = {
@@ -65280,24 +65546,24 @@ function distPackageJson(pkgName, entry, serverEntry, version2) {
 }
 function buildPackages(force = false) {
   for (const [pkg, cfg] of Object.entries(PACKAGES)) {
-    const pkgDir = resolve36(root2, "packages", pkg);
-    if (!existsSync40(join26(pkgDir, "src"))) continue;
+    const pkgDir = resolve37(root2, "packages", pkg);
+    if (!existsSync41(join27(pkgDir, "src"))) continue;
     if (!force && !distStale(pkgDir, cfg.entry)) continue;
     console.log(`[build] ${cfg.name} -> tsc`);
     const tscBin = require2.resolve("typescript/bin/tsc");
-    const result = spawnSync2(process.execPath, [tscBin, "-p", join26(pkgDir, "tsconfig.build.json")], {
+    const result = spawnSync2(process.execPath, [tscBin, "-p", join27(pkgDir, "tsconfig.build.json")], {
       stdio: "inherit"
     });
     if (result.status !== 0) {
       throw new Error(`tsc failed for ${cfg.name}`);
     }
-    const distDir = join26(pkgDir, "dist");
+    const distDir = join27(pkgDir, "dist");
     for (const c of cfg.copy || []) {
-      const to = join26(distDir, c.to);
-      mkdirSync18(dirname25(to), { recursive: true });
-      cpSync2(join26(pkgDir, c.from), to, { recursive: true });
+      const to = join27(distDir, c.to);
+      mkdirSync18(dirname26(to), { recursive: true });
+      cpSync2(join27(pkgDir, c.from), to, { recursive: true });
     }
-    const srcPkg = JSON.parse(readFileSync38(join26(pkgDir, "package.json"), "utf-8"));
+    const srcPkg = JSON.parse(readFileSync39(join27(pkgDir, "package.json"), "utf-8"));
     if (pkg === "lucide-vesk") {
       const lucideDistPkg = {
         name: srcPkg.name,
@@ -65311,9 +65577,9 @@ function buildPackages(force = false) {
           "./package.json": "./package.json"
         }
       };
-      writeFileSync20(join26(distDir, "package.json"), JSON.stringify(lucideDistPkg, null, 2) + "\n");
+      writeFileSync20(join27(distDir, "package.json"), JSON.stringify(lucideDistPkg, null, 2) + "\n");
     } else {
-      writeFileSync20(join26(distDir, "package.json"), distPackageJson(cfg.name, cfg.entry, cfg.serverEntry, srcPkg.version || "1.0.0"));
+      writeFileSync20(join27(distDir, "package.json"), distPackageJson(cfg.name, cfg.entry, cfg.serverEntry, srcPkg.version || "1.0.0"));
     }
     console.log(`[build] ${cfg.name} -> dist`);
   }
@@ -65321,13 +65587,13 @@ function buildPackages(force = false) {
 function ensurePackagesBuilt() {
   buildPackages(false);
 }
-if (process.argv[1] && resolve36(process.argv[1]) === fileURLToPath8(import.meta.url)) {
+if (process.argv[1] && resolve37(process.argv[1]) === fileURLToPath8(import.meta.url)) {
   buildPackages(process.argv.includes("--force"));
 }
 
 // src/action-handler.ts
-import { existsSync as existsSync41, readFileSync as readFileSync39, readdirSync as readdirSync13 } from "node:fs";
-import { resolve as resolve37 } from "node:path";
+import { existsSync as existsSync42, readFileSync as readFileSync40, readdirSync as readdirSync13 } from "node:fs";
+import { resolve as resolve38 } from "node:path";
 
 // ../compiler/dist/server-cookies.js
 function parseCookies3(str3) {
@@ -65410,8 +65676,8 @@ function pageSourcesFor(appDirPath, routeTree) {
   const out = [];
   function walk9(nodes) {
     for (const node of nodes) {
-      if (node.page) out.push(resolve37(appDirPath, node.sourceDir, "page.vsk"));
-      if (node.layout) out.push(resolve37(appDirPath, node.sourceDir, "layout.vsk"));
+      if (node.page) out.push(resolve38(appDirPath, node.sourceDir, "page.vsk"));
+      if (node.layout) out.push(resolve38(appDirPath, node.sourceDir, "layout.vsk"));
       walk9(node.children);
     }
   }
@@ -65419,7 +65685,7 @@ function pageSourcesFor(appDirPath, routeTree) {
   return out;
 }
 function walkVskFiles(dir, out, seen) {
-  if (!existsSync41(dir)) return;
+  if (!existsSync42(dir)) return;
   let entries;
   try {
     entries = readdirSync13(dir, { withFileTypes: true });
@@ -65427,7 +65693,7 @@ function walkVskFiles(dir, out, seen) {
     return;
   }
   for (const entry of entries) {
-    const full = resolve37(dir, entry.name);
+    const full = resolve38(dir, entry.name);
     if (seen.has(full)) continue;
     seen.add(full);
     if (entry.isDirectory()) {
@@ -65447,16 +65713,16 @@ function candidateSources(appDirPath, routeTree) {
     seen.add(src2);
     out.push(src2);
   }
-  const projectRoot = resolve37(appDirPath, "..");
-  for (const dir of [resolve37(projectRoot, "components"), appDirPath, projectRoot]) {
+  const projectRoot = resolve38(appDirPath, "..");
+  for (const dir of [resolve38(projectRoot, "components"), appDirPath, projectRoot]) {
     walkVskFiles(dir, out, seen);
   }
   return out;
 }
 function registerSource(sourcePath2) {
-  if (!existsSync41(sourcePath2)) return;
+  if (!existsSync42(sourcePath2)) return;
   try {
-    compileFile(readFileSync39(sourcePath2, "utf-8"), { sourcePath: sourcePath2 });
+    compileFile(readFileSync40(sourcePath2, "utf-8"), { sourcePath: sourcePath2 });
   } catch {
   }
 }
@@ -65465,8 +65731,8 @@ function ensureActionRegistered(actionId, pagePathname, appDirPath, routeTree) {
   const match = matchUrl(routeTree, pagePathname);
   if (match) {
     for (let i = match.nodes.length - 1; i >= 0; i--) {
-      registerSource(resolve37(appDirPath, match.nodes[i].sourceDir, "page.vsk"));
-      registerSource(resolve37(appDirPath, match.nodes[i].sourceDir, "layout.vsk"));
+      registerSource(resolve38(appDirPath, match.nodes[i].sourceDir, "page.vsk"));
+      registerSource(resolve38(appDirPath, match.nodes[i].sourceDir, "layout.vsk"));
     }
   }
   if (getAction2(actionId)) return;
@@ -65492,24 +65758,24 @@ async function renderPageHtml(pagePathname, params, ctx2) {
   let head = "";
   for (let i = chain.length - 1; i >= 0; i--) {
     const node = chain[i];
-    const pageFilePath = resolve37(ctx2.appDirPath, node.sourceDir, "page.vsk");
-    const layoutFilePath = resolve37(ctx2.appDirPath, node.sourceDir, "layout.vsk");
-    if (i === chain.length - 1 && node.page && existsSync41(pageFilePath)) {
-      const src3 = readFileSync39(pageFilePath, "utf-8");
+    const pageFilePath = resolve38(ctx2.appDirPath, node.sourceDir, "page.vsk");
+    const layoutFilePath = resolve38(ctx2.appDirPath, node.sourceDir, "layout.vsk");
+    if (i === chain.length - 1 && node.page && existsSync42(pageFilePath)) {
+      const src3 = readFileSync40(pageFilePath, "utf-8");
       const compName2 = resolveComponentName(src3) || node.page;
       const result = await renderPage(src3, compName2, { params }, /* @__PURE__ */ new Map(), { hydrate: true, sourcePath: pageFilePath });
       body = result.body;
       head = result.head || "";
     }
-    if (node.layout && existsSync41(layoutFilePath)) {
-      const src3 = readFileSync39(layoutFilePath, "utf-8");
+    if (node.layout && existsSync42(layoutFilePath)) {
+      const src3 = readFileSync40(layoutFilePath, "utf-8");
       const compName2 = resolveComponentName(src3) || node.layout;
       const result = await renderPage(src3, compName2, { children: body }, /* @__PURE__ */ new Map(), { hydrate: true, sourcePath: layoutFilePath });
       body = result.body;
       head = (result.head || "") + head;
     }
   }
-  const hasLayout = chain.some((n) => n.layout && existsSync41(resolve37(ctx2.appDirPath, n.sourceDir, "layout.vsk")));
+  const hasLayout = chain.some((n) => n.layout && existsSync42(resolve38(ctx2.appDirPath, n.sourceDir, "layout.vsk")));
   if (hasLayout) {
     const secMeta = securityMeta(ctx2.security);
     const headBlock = await applyHeadInjects(
@@ -65533,9 +65799,9 @@ ${prettifyHtml(body)}
   }
   const leaf2 = chain.find((n) => n.page);
   if (!leaf2) return null;
-  const src2 = readFileSync39(resolve37(ctx2.appDirPath, leaf2.sourceDir, "page.vsk"), "utf-8");
+  const src2 = readFileSync40(resolve38(ctx2.appDirPath, leaf2.sourceDir, "page.vsk"), "utf-8");
   const compName = resolveComponentName(src2) || leaf2.page;
-  const html = await renderFullPage(src2, compName, { params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: actionCssUrls(ctx2.appDirPath), security: ctx2.security, sourcePath: resolve37(ctx2.appDirPath, leaf2.sourceDir, "page.vsk"), plugins: ctx2.plugins });
+  const html = await renderFullPage(src2, compName, { params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: actionCssUrls(ctx2.appDirPath), security: ctx2.security, sourcePath: resolve38(ctx2.appDirPath, leaf2.sourceDir, "page.vsk"), plugins: ctx2.plugins });
   return applyHtmlPlugins(html.replace("</body>", '	<script type="module" src="/_vesk/hmr.js"></script>\n</body>'), ctx2.plugins, { sourcePath: ctx2.url.pathname });
 }
 async function handleActionRequest(req, res, ctx2) {
@@ -65676,6 +65942,12 @@ async function handleActionRequest(req, res, ctx2) {
 }
 
 // src/dev-server.ts
+function toNodeHeaders2(response) {
+  const headers2 = Object.fromEntries(response.headers);
+  const cookies2 = response.headers.getSetCookie?.() ?? [];
+  if (cookies2.length > 0) headers2["set-cookie"] = cookies2;
+  return headers2;
+}
 var agenticCheckpointManager = new CheckpointManager();
 function buildDevErrorPayload(input) {
   const { err, errorMessage, filename, fullPath, appDir, fileExists } = input;
@@ -65700,7 +65972,7 @@ function buildDevErrorPayload(input) {
       payload.column = colMatch ? parseInt(colMatch[1], 10) : 1;
       if (fileExists && payload.line > 0) {
         try {
-          const src2 = readFileSync40(fullPath, "utf-8");
+          const src2 = readFileSync41(fullPath, "utf-8");
           const cf = buildCodeframe2(src2, payload.line, payload.column);
           if (cf) {
             cf.file = payload.file || filename;
@@ -65718,14 +65990,14 @@ function resolveDevErrorReport(report, ctx2) {
   let componentMap;
   let routeSources;
   try {
-    componentMap = scanComponents(resolve38(ctx2.projectDir, "components"));
+    componentMap = scanComponents(resolve39(ctx2.projectDir, "components"));
   } catch {
     componentMap = void 0;
   }
   try {
     routeSources = /* @__PURE__ */ new Map();
     for (const [name, rel] of collectSources(ctx2.routeTree || [])) {
-      routeSources.set(name, resolve38(ctx2.appDir, rel));
+      routeSources.set(name, resolve39(ctx2.appDir, rel));
     }
   } catch {
     routeSources = void 0;
@@ -65756,9 +66028,9 @@ function devErrorContextForMatch(match, appDir, projectDir, routeTree) {
     for (const kind of ["page.vsk", "layout.vsk", "error.vsk"]) {
       for (const node of nodes) {
         if (!node || typeof node.sourceDir !== "string") continue;
-        const p = resolve38(appDir, node.sourceDir, kind);
+        const p = resolve39(appDir, node.sourceDir, kind);
         try {
-          if (existsSync42(p) && !routeFiles.includes(p)) routeFiles.push(p);
+          if (existsSync43(p) && !routeFiles.includes(p)) routeFiles.push(p);
         } catch {
         }
       }
@@ -65768,14 +66040,14 @@ function devErrorContextForMatch(match, appDir, projectDir, routeTree) {
   let componentMap;
   let routeSources;
   try {
-    componentMap = scanComponents(resolve38(projectDir, "components"));
+    componentMap = scanComponents(resolve39(projectDir, "components"));
   } catch {
     componentMap = void 0;
   }
   try {
     routeSources = /* @__PURE__ */ new Map();
     for (const [name, rel] of collectSources(routeTree || [])) {
-      routeSources.set(name, resolve38(appDir, rel));
+      routeSources.set(name, resolve39(appDir, rel));
     }
   } catch {
     routeSources = void 0;
@@ -65785,14 +66057,14 @@ function devErrorContextForMatch(match, appDir, projectDir, routeTree) {
 function resolveRuntimeDir(projectDir) {
   const candidates = [
     // installed app layout
-    resolve38(projectDir, "node_modules", "@vesk", "runtime"),
+    resolve39(projectDir, "node_modules", "@vesk", "runtime"),
     // monorepo checkout (tests/probes run from the repo root)
-    resolve38(import.meta.dirname ?? ".", "..", "..", "runtime", "dist")
+    resolve39(import.meta.dirname ?? ".", "..", "..", "runtime", "dist")
   ];
   for (const dir of candidates) {
-    if (existsSync42(join27(dir, "ripple-runtime.js"))) return dir;
-    const distDir = join27(dir, "dist");
-    if (existsSync42(join27(distDir, "ripple-runtime.js"))) return distDir;
+    if (existsSync43(join28(dir, "ripple-runtime.js"))) return dir;
+    const distDir = join28(dir, "dist");
+    if (existsSync43(join28(distDir, "ripple-runtime.js"))) return distDir;
   }
   return null;
 }
@@ -65834,7 +66106,7 @@ var LOG = {
     console.log(`  ${m} ${pathname} ${s}${t}`);
   }
 };
-var DEV_SCRIPTS = '	<script type="module" src="/_vesk/client.js"></script>\n	<script type="module" src="/_vesk/hmr.js"></script>';
+var DEV_SCRIPTS = '	<script src="/_vesk/dev-config.js"></script>\n	<script type="module" src="/_vesk/client.js"></script>\n	<script type="module" src="/_vesk/hmr.js"></script>';
 function injectDevScripts(html) {
   if (!html.includes("</body>")) return html;
   return html.replace("</body>", DEV_SCRIPTS + "\n</body>");
@@ -65950,6 +66222,7 @@ var HMR_SKIP_MARKERS = [
   "node_modules/",
   ".vesk/",
   "tmp-vesk-chunk-",
+  "tmp-vesk-shared-",
   "/dist/",
   "/build/",
   "/coverage/",
@@ -66029,10 +66302,10 @@ function collectRoutePaths(nodes, out = []) {
   return out;
 }
 function countFilesNamed(dir, name) {
-  if (!existsSync42(dir)) return 0;
+  if (!existsSync43(dir)) return 0;
   let n = 0;
   for (const entry of readdirSync14(dir, { withFileTypes: true })) {
-    const p = join27(dir, entry.name);
+    const p = join28(dir, entry.name);
     if (entry.isDirectory()) n += countFilesNamed(p, name);
     else if (entry.name === name) n++;
   }
@@ -66061,8 +66334,8 @@ async function startDevServer(port, projectDir, config, host) {
   if (!process.env.NODE_ENV) process.env.NODE_ENV = "development";
   const secCfg = config.security || {};
   const maxBodyBytes = (typeof secCfg.maxBodyBytes === "number" ? secCfg.maxBodyBytes : void 0) || DEFAULT_MAX_BODY_BYTES;
-  const appDirPath = resolve38(projectDir, typeof config.appDir === "string" ? config.appDir : "./app");
-  const publicDir = resolve38(projectDir, typeof config.publicDir === "string" ? config.publicDir : "./public");
+  const appDirPath = resolve39(projectDir, typeof config.appDir === "string" ? config.appDir : "./app");
+  const publicDir = resolve39(projectDir, typeof config.publicDir === "string" ? config.publicDir : "./public");
   installMdReadHook2([publicDir]);
   try {
     ensurePackagesBuilt();
@@ -66075,7 +66348,7 @@ async function startDevServer(port, projectDir, config, host) {
     process.exit(1);
   }
   const runtimeDir = runtimeDirUnchecked;
-  const veskStateDir = join27(projectDir, ".vesk");
+  const veskStateDir = join28(projectDir, ".vesk");
   const configPluginsRaw = config.plugins || [];
   const configPluginNames = configPluginsRaw.map((p) => typeof p === "string" ? p : p?.name).filter((n) => !!n);
   const rawDevPlugins = config.plugins || [];
@@ -66174,21 +66447,21 @@ async function startDevServer(port, projectDir, config, host) {
   }
   let devGlobalCssContent = "";
   let lastServedCssGlobal = "";
-  const appCssPath = join27(appDirPath, "global.css");
-  const srcDir = join27(projectDir, "src");
-  const cssPath = join27(srcDir, "global.css");
-  const altCssPath = join27(srcDir, "app.css");
+  const appCssPath = join28(appDirPath, "global.css");
+  const srcDir = join28(projectDir, "src");
+  const cssPath = join28(srcDir, "global.css");
+  const altCssPath = join28(srcDir, "app.css");
   let rawCss = "";
   let devCssSource = "";
-  if (existsSync42(appCssPath)) {
+  if (existsSync43(appCssPath)) {
     devCssSource = appCssPath;
-    rawCss = readFileSync40(appCssPath, "utf-8");
-  } else if (existsSync42(cssPath)) {
+    rawCss = readFileSync41(appCssPath, "utf-8");
+  } else if (existsSync43(cssPath)) {
     devCssSource = cssPath;
-    rawCss = readFileSync40(cssPath, "utf-8");
-  } else if (existsSync42(altCssPath)) {
+    rawCss = readFileSync41(cssPath, "utf-8");
+  } else if (existsSync43(altCssPath)) {
     devCssSource = altCssPath;
-    rawCss = readFileSync40(altCssPath, "utf-8");
+    rawCss = readFileSync41(altCssPath, "utf-8");
   }
   if (rawCss) {
     const activeAtStart = getActiveDevPlugins();
@@ -66235,8 +66508,9 @@ async function startDevServer(port, projectDir, config, host) {
     clientChunks = next;
   }
   const routeChunksBuilt = /* @__PURE__ */ new Set();
+  const routeChunkBuilds = /* @__PURE__ */ new Map();
   let clientGeneration = 0;
-  const devCacheDir = () => join27(projectDir, "node_modules", ".vesk", "dev-cache");
+  const devCacheDir = () => join28(projectDir, "node_modules", ".vesk", "dev-cache");
   function devCacheKey() {
     const parts = [`flags:${!!config.routeDataCache}`];
     const walk9 = (dir) => {
@@ -66248,7 +66522,7 @@ async function startDevServer(port, projectDir, config, host) {
       }
       for (const name of entries.sort()) {
         if (name === "node_modules" || name.startsWith(".")) continue;
-        const p = join27(dir, name);
+        const p = join28(dir, name);
         let st;
         try {
           st = statSync22(p);
@@ -66265,27 +66539,42 @@ async function startDevServer(port, projectDir, config, host) {
     };
     walk9(appDirPath);
     try {
-      parts.push(`compiler:${readFileSync40(join27(process.cwd(), "node_modules", "@vesk", "compiler", "package.json"), "utf8")}`);
+      parts.push(`compiler:${readFileSync41(join28(process.cwd(), "node_modules", "@vesk", "compiler", "package.json"), "utf8")}`);
     } catch {
     }
     return createHash3("sha256").update(parts.join("\n")).digest("hex").slice(0, 32);
   }
   function readDevBundleCache() {
     try {
-      const file = join27(devCacheDir(), "client-bundle.json");
-      const parsed = JSON.parse(readFileSync40(file, "utf8"));
+      const file = join28(devCacheDir(), "client-bundle.json");
+      const parsed = JSON.parse(readFileSync41(file, "utf8"));
       if (parsed.key !== devCacheKey() || typeof parsed.main !== "string" || !Array.isArray(parsed.chunks)) return null;
       return { main: parsed.main, chunks: parsed.chunks };
     } catch {
       return null;
     }
   }
+  let persistChunksTimer = null;
+  function persistDevChunksSoon() {
+    if (persistChunksTimer) return;
+    persistChunksTimer = setTimeout(() => {
+      persistChunksTimer = null;
+      writeDevBundleCache(
+        clientBundle,
+        [...clientChunks].map(([url, code]) => ({
+          name: url.slice(url.lastIndexOf("/") + 1),
+          code
+        }))
+      );
+    }, 2e3);
+    persistChunksTimer.unref?.();
+  }
   function writeDevBundleCache(main, chunks) {
     try {
       const dir = devCacheDir();
       mkdirSync19(dir, { recursive: true });
-      const file = join27(dir, "client-bundle.json");
-      const tmp = join27(dir, `client-bundle.${process.pid}.tmp`);
+      const file = join28(dir, "client-bundle.json");
+      const tmp = join28(dir, `client-bundle.${process.pid}.tmp`);
       writeFileSync21(tmp, JSON.stringify({ key: devCacheKey(), main, chunks }), "utf8");
       renameSync2(tmp, file);
     } catch {
@@ -66293,23 +66582,36 @@ async function startDevServer(port, projectDir, config, host) {
   }
   async function ensureRouteChunk(fullPath) {
     if (routeChunksBuilt.has(fullPath)) return;
-    routeChunksBuilt.add(fullPath);
-    const generation = clientGeneration;
-    const { chunks } = await generateClientBundle2(routeTree, appDirPath, /* @__PURE__ */ new Map(), {
-      importRuntime: true,
-      hmr: true,
-      codeSplit: true,
-      cache: bundleCache,
-      onlyRoutes: [fullPath],
-      ...config.routeDataCache !== void 0 ? { routeDataCache: config.routeDataCache } : {}
-    });
-    if (generation !== clientGeneration) {
-      routeChunksBuilt.delete(fullPath);
+    const inFlight = routeChunkBuilds.get(fullPath);
+    if (inFlight) {
+      await inFlight;
       return;
     }
-    const next = new Map(clientChunks);
-    for (const c of chunks) next.set(`/_vesk/static/${c.name}`, c.code);
-    clientChunks = next;
+    const build4 = (async () => {
+      const generation = clientGeneration;
+      const { chunks } = await generateClientBundle2(routeTree, appDirPath, /* @__PURE__ */ new Map(), {
+        importRuntime: true,
+        hmr: true,
+        codeSplit: true,
+        cache: bundleCache,
+        onlyRoutes: [fullPath],
+        ...config.routeDataCache !== void 0 ? { routeDataCache: config.routeDataCache } : {}
+      });
+      if (generation !== clientGeneration) return false;
+      const next = new Map(clientChunks);
+      for (const c of chunks) next.set(`/_vesk/static/${c.name}`, c.code);
+      clientChunks = next;
+      return true;
+    })();
+    routeChunkBuilds.set(fullPath, build4);
+    try {
+      if (await build4) {
+        routeChunksBuilt.add(fullPath);
+        persistDevChunksSoon();
+      }
+    } finally {
+      routeChunkBuilds.delete(fullPath);
+    }
   }
   function routeFullPathForChunk(chunkName) {
     let found = null;
@@ -66355,6 +66657,12 @@ async function startDevServer(port, projectDir, config, host) {
       clientBundle = main;
       devBundleBytes = Buffer.byteLength(main, "utf8");
       storeChunks(chunks);
+      routeChunksBuilt.clear();
+      for (const c of chunks) {
+        const fullPath = c.name === SHARED_CHUNK_NAME2 ? null : routeFullPathForChunk(c.name);
+        if (fullPath) routeChunksBuilt.add(fullPath);
+      }
+      clientGeneration++;
       writeDevBundleCache(main, chunks);
     } catch (e) {
       LOG.err(`client build error:`, e.message);
@@ -66574,12 +66882,54 @@ async function startDevServer(port, projectDir, config, host) {
     let debounceTimer = null;
     let cssDebounceTimer = null;
     const watchDir = projectDir;
-    watch(watchDir, { recursive: true }, (eventType, filename) => {
-      if (!filename) return;
+    const dirWatchers = /* @__PURE__ */ new Map();
+    const watchDirTree = (dir) => {
+      if (dirWatchers.has(dir)) return;
+      let entries;
+      try {
+        entries = readdirSync14(dir, { withFileTypes: true });
+      } catch {
+        return;
+      }
+      try {
+        const watcher = watch(dir, (eventType, changed) => {
+          if (!changed) return;
+          const abs = join28(dir, String(changed));
+          const rel = relative9(projectDir, abs);
+          if (!rel || rel.startsWith("..")) return;
+          if (eventType === "rename") {
+            try {
+              if (statSync22(abs).isDirectory()) {
+                watchDirTree(abs);
+                return;
+              }
+            } catch {
+            }
+          }
+          onWatchEvent(eventType, normalizeWatchPath(rel));
+        });
+        watcher.on("error", () => {
+          try {
+            watcher.close();
+          } catch {
+          }
+          dirWatchers.delete(dir);
+        });
+        dirWatchers.set(dir, watcher);
+      } catch {
+        return;
+      }
+      for (const entry of entries) {
+        if (!entry.isDirectory()) continue;
+        if (HMR_SKIP_DIRS.has(entry.name)) continue;
+        watchDirTree(join28(dir, entry.name));
+      }
+    };
+    const onWatchEvent = (eventType, filename) => {
       const kind = classifyHmrWatchPath(filename);
       if (kind === "ignored") return;
-      const fullPath = filename.startsWith("/") ? filename : join27(watchDir, filename);
-      const fileExists = existsSync42(fullPath);
+      const fullPath = filename.startsWith("/") ? filename : join28(watchDir, filename);
+      const fileExists = existsSync43(fullPath);
       const bcast = (msg) => {
         const f = globalThis.__vesk_broadcastHmr;
         if (typeof f === "function") f(msg);
@@ -66603,7 +66953,7 @@ async function startDevServer(port, projectDir, config, host) {
         debounceTimer = setTimeout(async () => {
           const t0 = Date.now();
           try {
-            const current3 = fileExists ? readFileSync40(fullPath, "utf-8") : null;
+            const current3 = fileExists ? readFileSync41(fullPath, "utf-8") : null;
             if (eventType !== "rename" && current3 !== null && lastSeenContent.get(fullPath) === current3) {
               LOG.info(`skipped unchanged (${filename})`);
               return;
@@ -66635,7 +66985,7 @@ async function startDevServer(port, projectDir, config, host) {
               } else if (fileExists && current3 !== null) {
                 let source = current3;
                 if (/content=["'][^"']*\.md["']/i.test(source)) {
-                  source = inlineMdContentAttrs2(source, dirname26(fullPath), guessProjectRoots2(appDirPath));
+                  source = inlineMdContentAttrs2(source, dirname27(fullPath), guessProjectRoots2(appDirPath));
                 }
                 const { comp, name } = compileClientBoth2(source, null, fullPath, { skipHyd: true });
                 hotEditedSource = buildHmrEvalSnippet2(comp);
@@ -66662,7 +67012,7 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
                   if (compCode.trim()) fnSources = { _raw: compCode };
                 } else if (fileExists && !bundleError) {
                   try {
-                    const src2 = readFileSync40(fullPath, "utf-8");
+                    const src2 = readFileSync41(fullPath, "utf-8");
                     let compCode = buildHmrEvalSnippet2(
                       compileClient2(src2, null, { forceClient: true, sourcePath: fullPath, mdRoots: [projectDir] })
                     );
@@ -66746,7 +67096,7 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
         cssDebounceTimer = setTimeout(async () => {
           try {
             if (fileExists) {
-              rawCss = readFileSync40(fullPath, "utf-8");
+              rawCss = readFileSync41(fullPath, "utf-8");
             }
             const cssChanged = await rebuildTailwindCss();
             if (cssChanged && typeof globalThis.__vesk_broadcastHmr === "function") {
@@ -66776,7 +67126,8 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
           }
         }, HMR_DEBOUNCE_MS);
       }
-    });
+    };
+    watchDirTree(watchDir);
   } catch (e) {
     LOG.warn("file watching unavailable, serving without auto-rebuild");
   }
@@ -66793,9 +67144,9 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
     ".json": "application/json",
     ".webmanifest": "application/manifest+json"
   };
-  const hmrJsPath = join27(runtimeDir, "hmr-client.js");
-  const hmrTsPath = join27(runtimeDir, "hmr-client.ts");
-  const hmrClientPath = existsSync42(hmrJsPath) ? hmrJsPath : existsSync42(hmrTsPath) ? hmrTsPath : null;
+  const hmrJsPath = join28(runtimeDir, "hmr-client.js");
+  const hmrTsPath = join28(runtimeDir, "hmr-client.ts");
+  const hmrClientPath = existsSync43(hmrJsPath) ? hmrJsPath : existsSync43(hmrTsPath) ? hmrTsPath : null;
   function extractCompName2(src2) {
     return resolveComponentName(src2);
   }
@@ -66860,6 +67211,11 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
       res.end(runtimeBundle);
       return;
     }
+    if (url.pathname === "/_vesk/dev-config.js") {
+      res.writeHead(200, { "Content-Type": "application/javascript", "Cache-Control": "no-store" });
+      res.end("globalThis.__vesk_chunk_timeout_ms = 120000;");
+      return;
+    }
     if (url.pathname === "/_vesk/client" || url.pathname === "/_vesk/client.js") {
       res.writeHead(200, { "Content-Type": "application/javascript" });
       res.end(clientBundle);
@@ -66903,7 +67259,7 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
     }
     if (url.pathname === "/_vesk/hmr" || url.pathname === "/_vesk/hmr.js") {
       if (hmrClientPath) {
-        let hmrContent = readFileSync40(hmrClientPath, "utf-8");
+        let hmrContent = readFileSync41(hmrClientPath, "utf-8");
         if (hmrClientPath.endsWith(".ts")) {
           hmrContent = stripCodeTypes2(hmrContent);
         }
@@ -66951,10 +67307,10 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
     }
     if (url.pathname !== "/") {
       const staticPath = url.pathname.length > 1 ? resolveWithin2(publicDir, url.pathname.slice(1)) : null;
-      if (staticPath && existsSync42(staticPath) && statSync22(staticPath).isFile()) {
+      if (staticPath && existsSync43(staticPath) && statSync22(staticPath).isFile()) {
         const ext = extname7(staticPath);
         res.writeHead(200, { "Content-Type": MIME2[ext] || "application/octet-stream" });
-        res.end(readFileSync40(staticPath));
+        res.end(readFileSync41(staticPath));
         return;
       }
     }
@@ -66978,8 +67334,8 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
       return;
     }
     const mwChain = collectMiddlewareChain(routeTree, url.pathname, appDirPath);
-    const apiDirPath = join27(appDirPath, "api");
-    if (url.pathname.startsWith("/api") && existsSync42(apiDirPath)) {
+    const apiDirPath = join28(appDirPath, "api");
+    if (url.pathname.startsWith("/api") && existsSync43(apiDirPath)) {
       const apiRoutes = await scanApiRoutes(apiDirPath);
       const apiMatch = matchApiUrl(apiRoutes, req.url || url.pathname);
       if (apiMatch) {
@@ -67016,7 +67372,7 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
             });
             if (mwResult.response) {
               logRequest(mwResult.response.status);
-              res.writeHead(mwResult.response.status, Object.fromEntries(mwResult.response.headers));
+              res.writeHead(mwResult.response.status, toNodeHeaders2(mwResult.response));
               res.end(await mwResult.response.text());
               return;
             }
@@ -67043,7 +67399,7 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
         }
         logRequest(response.status);
         const body = await response.text();
-        res.writeHead(response.status, Object.fromEntries(response.headers));
+        res.writeHead(response.status, toNodeHeaders2(response));
         res.end(body);
         return;
       }
@@ -67051,22 +67407,19 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
     const ctx2 = rawCtx;
     const match = matchUrl(routeTree, url.pathname);
     if (!match) {
-      const rootNode = routeTree.find((n) => n.fullPath === "/");
       let notFoundHtml = null;
-      if (rootNode && rootNode.notFound) {
-        const nfPath = resolve38(appDirPath, rootNode.sourceDir, "not-found.vsk");
-        if (existsSync42(nfPath)) {
-          try {
-            const nfSrc = readFileSync40(nfPath, "utf-8");
-            const nfCompName = extractCompName2(nfSrc) || rootNode.notFound;
-            notFoundHtml = await renderFullPage(nfSrc, nfCompName, { params: {}, url: url.pathname }, /* @__PURE__ */ new Map(), { hydrate: true, cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: nfPath, cached: cachedSsrCompile(ssrCompileCache, nfSrc, nfPath), plugins: getActiveDevPlugins() });
-          } catch {
-          }
+      const nfPath = resolveBoundaryFileForUrl2(url.pathname, appDirPath, "not-found.vsk");
+      if (nfPath) {
+        try {
+          const nfSrc = readFileSync41(nfPath, "utf-8");
+          const nfCompName = extractCompName2(nfSrc) || "NotFound";
+          notFoundHtml = await renderFullPage(nfSrc, nfCompName, { params: {}, url: url.pathname }, /* @__PURE__ */ new Map(), { hydrate: true, cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: nfPath, cached: cachedSsrCompile(ssrCompileCache, nfSrc, nfPath), plugins: getActiveDevPlugins() });
+        } catch {
         }
       }
       logRequest(404);
       res.writeHead(404, { "Content-Type": "text/html" });
-      res.end(notFoundHtml || renderDefaultNotFoundPage2({ url: url.pathname }));
+      res.end(notFoundHtml ? injectDevScripts(notFoundHtml) : renderDefaultNotFoundPage2({ url: url.pathname }));
       return;
     }
     const urlParts = url.pathname.split("/").filter(Boolean);
@@ -67086,16 +67439,6 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
     }
     const matched = match;
     const forData = req.headers["x-vesk-data"] === "1";
-    if (!forData && matched && Array.isArray(matched.nodes)) {
-      const leaf2 = matched.nodes.find((n) => n.page);
-      if (leaf2 && typeof leaf2.fullPath === "string") {
-        try {
-          await ensureRouteChunk(leaf2.fullPath);
-        } catch (e) {
-          LOG.err(`client chunk build failed for ${leaf2.fullPath}:`, e.message);
-        }
-      }
-    }
     async function renderSSR() {
       const ssg2 = globalThis;
       ssg2.__vsk_ssr_data = {};
@@ -67109,18 +67452,18 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
           let props;
           for (let i = chain.length - 1; i >= 0; i--) {
             const node = chain[i];
-            const pageFilePath = resolve38(appDirPath, node.sourceDir, "page.vsk");
-            const layoutFilePath = resolve38(appDirPath, node.sourceDir, "layout.vsk");
-            if (i === chain.length - 1 && node.page && existsSync42(pageFilePath)) {
-              const src2 = readFileSync40(pageFilePath, "utf-8");
+            const pageFilePath = resolve39(appDirPath, node.sourceDir, "page.vsk");
+            const layoutFilePath = resolve39(appDirPath, node.sourceDir, "layout.vsk");
+            if (i === chain.length - 1 && node.page && existsSync43(pageFilePath)) {
+              const src2 = readFileSync41(pageFilePath, "utf-8");
               const compName = extractCompName2(src2) || node.page;
               const result = await renderPage(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, sourcePath: pageFilePath, cached: cachedSsrCompile(ssrCompileCache, src2, pageFilePath) });
               body = result.body;
               head = result.head || "";
               props = result.props;
             }
-            if (node.layout && existsSync42(layoutFilePath)) {
-              const src2 = readFileSync40(layoutFilePath, "utf-8");
+            if (node.layout && existsSync43(layoutFilePath)) {
+              const src2 = readFileSync41(layoutFilePath, "utf-8");
               const compName = extractCompName2(src2) || node.layout;
               const result = await renderPage(src2, compName, { children: body }, /* @__PURE__ */ new Map(), { hydrate: true, sourcePath: layoutFilePath, cached: cachedSsrCompile(ssrCompileCache, src2, layoutFilePath) });
               body = result.body;
@@ -67130,7 +67473,7 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
           if (forData) {
             return { html: "", props: props || { params: matched.params }, head };
           }
-          const hasLayout = chain.some((n) => n.layout && existsSync42(resolve38(appDirPath, n.sourceDir, "layout.vsk")));
+          const hasLayout = chain.some((n) => n.layout && existsSync43(resolve39(appDirPath, n.sourceDir, "layout.vsk")));
           let html;
           if (hasLayout) {
             const ssrData = currentSsrData();
@@ -67165,9 +67508,9 @@ ${prettifyHtml(body)}
           } else {
             const leaf2 = chain.find((n) => n.page);
             if (leaf2) {
-              const src2 = readFileSync40(resolve38(appDirPath, leaf2.sourceDir, "page.vsk"), "utf-8");
+              const src2 = readFileSync41(resolve39(appDirPath, leaf2.sourceDir, "page.vsk"), "utf-8");
               const compName = extractCompName2(src2) || leaf2.page;
-              html = await renderFullPage(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: resolve38(appDirPath, leaf2.sourceDir, "page.vsk"), cached: cachedSsrCompile(ssrCompileCache, src2, resolve38(appDirPath, leaf2.sourceDir, "page.vsk")), plugins: getActiveDevPlugins() });
+              html = await renderFullPage(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: resolve39(appDirPath, leaf2.sourceDir, "page.vsk"), cached: cachedSsrCompile(ssrCompileCache, src2, resolve39(appDirPath, leaf2.sourceDir, "page.vsk")), plugins: getActiveDevPlugins() });
               html = html.replace("</body>", '	<script type="module" src="/_vesk/hmr.js"></script>\n</body>');
               html = await applyHtmlPlugins(html, getActiveDevPlugins(), { sourcePath: url.pathname });
             } else {
@@ -67190,13 +67533,13 @@ ${prettifyHtml(body)}
       sst.__vsk_ssr_data = {};
       async function* raw2() {
         const chain = cleanChain;
-        const hasLayout = chain.some((n) => n.layout && existsSync42(resolve38(appDirPath, n.sourceDir, "layout.vsk")));
+        const hasLayout = chain.some((n) => n.layout && existsSync43(resolve39(appDirPath, n.sourceDir, "layout.vsk")));
         if (!hasLayout) {
           const leaf2 = chain.find((n) => n.page);
           if (leaf2) {
-            const src2 = readFileSync40(resolve38(appDirPath, leaf2.sourceDir, "page.vsk"), "utf-8");
+            const src2 = readFileSync41(resolve39(appDirPath, leaf2.sourceDir, "page.vsk"), "utf-8");
             const compName = extractCompName2(src2) || leaf2.page;
-            yield* renderPageStream(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: resolve38(appDirPath, leaf2.sourceDir, "page.vsk"), cached: cachedSsrCompile(ssrCompileCache, src2, resolve38(appDirPath, leaf2.sourceDir, "page.vsk")), plugins: getActiveDevPlugins() });
+            yield* renderPageStream(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: resolve39(appDirPath, leaf2.sourceDir, "page.vsk"), cached: cachedSsrCompile(ssrCompileCache, src2, resolve39(appDirPath, leaf2.sourceDir, "page.vsk")), plugins: getActiveDevPlugins() });
           } else {
             throw new Error("No page or layout matched");
           }
@@ -67207,18 +67550,18 @@ ${prettifyHtml(body)}
         let props;
         for (let i = chain.length - 1; i >= 0; i--) {
           const node = chain[i];
-          const pageFilePath = resolve38(appDirPath, node.sourceDir, "page.vsk");
-          const layoutFilePath = resolve38(appDirPath, node.sourceDir, "layout.vsk");
-          if (i === chain.length - 1 && node.page && existsSync42(pageFilePath)) {
-            const src2 = readFileSync40(pageFilePath, "utf-8");
+          const pageFilePath = resolve39(appDirPath, node.sourceDir, "page.vsk");
+          const layoutFilePath = resolve39(appDirPath, node.sourceDir, "layout.vsk");
+          if (i === chain.length - 1 && node.page && existsSync43(pageFilePath)) {
+            const src2 = readFileSync41(pageFilePath, "utf-8");
             const compName = extractCompName2(src2) || node.page;
             const result = await renderPage(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, sourcePath: pageFilePath, cached: cachedSsrCompile(ssrCompileCache, src2, pageFilePath) });
             body = result.body;
             head = result.head || "";
             props = result.props;
           }
-          if (node.layout && existsSync42(layoutFilePath)) {
-            const src2 = readFileSync40(layoutFilePath, "utf-8");
+          if (node.layout && existsSync43(layoutFilePath)) {
+            const src2 = readFileSync41(layoutFilePath, "utf-8");
             const compName = extractCompName2(src2) || node.layout;
             const result = await renderPage(src2, compName, { children: body }, /* @__PURE__ */ new Map(), { hydrate: true, sourcePath: layoutFilePath, cached: cachedSsrCompile(ssrCompileCache, src2, layoutFilePath) });
             body = result.body;
@@ -67312,7 +67655,7 @@ ${prettifyHtml(body)}
           const respRecord = mwResult.response;
           if (typeof respRecord.build === "function") respRecord.build();
           logRequest(mwResult.response.status);
-          res.writeHead(mwResult.response.status, Object.fromEntries(mwResult.response.headers));
+          res.writeHead(mwResult.response.status, toNodeHeaders2(mwResult.response));
           res.end(await mwResult.response.text());
           return;
         }
@@ -67359,10 +67702,10 @@ ${prettifyHtml(body)}
           for (let i = match.nodes.length - 1; i >= 0; i--) {
             const node = match.nodes[i];
             if (node.notFound) {
-              const nfPath = resolve38(appDirPath, node.sourceDir, "not-found.vsk");
-              if (existsSync42(nfPath)) {
+              const nfPath = resolve39(appDirPath, node.sourceDir, "not-found.vsk");
+              if (existsSync43(nfPath)) {
                 try {
-                  const nfSrc = readFileSync40(nfPath, "utf-8");
+                  const nfSrc = readFileSync41(nfPath, "utf-8");
                   const nfCompName = extractCompName2(nfSrc) || node.notFound;
                   const html = await renderFullPage(nfSrc, nfCompName, { params: match.params, url: url.pathname }, /* @__PURE__ */ new Map(), { hydrate: true, cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: nfPath, cached: cachedSsrCompile(ssrCompileCache, nfSrc, nfPath), plugins: getActiveDevPlugins() });
                   notFoundHtml = injectDevScripts(html);
@@ -67405,10 +67748,10 @@ ${prettifyHtml(body)}
           for (let i = match.nodes.length - 1; i >= 0; i--) {
             const node = match.nodes[i];
             if (node.error) {
-              const errPath = resolve38(appDirPath, node.sourceDir, "error.vsk");
-              if (existsSync42(errPath)) {
+              const errPath = resolve39(appDirPath, node.sourceDir, "error.vsk");
+              if (existsSync43(errPath)) {
                 try {
-                  const errSrc = readFileSync40(errPath, "utf-8");
+                  const errSrc = readFileSync41(errPath, "utf-8");
                   const errCompName = extractCompName2(errSrc) || node.error;
                   const errProps = {
                     error: err.message,
@@ -67480,7 +67823,7 @@ ${prettifyHtml(body)}
     LOG.ok(`dev server at http://localhost:${port} (listening on ${bindHost})`);
     const routes = collectRoutePaths(routeTree);
     const pageCount = countPages(routeTree);
-    const apiCount = countFilesNamed(join27(appDirPath, "api"), "route.ts");
+    const apiCount = countFilesNamed(join28(appDirPath, "api"), "route.ts");
     LOG.info(`${projectDir}`);
     LOG.info(`${pageCount} page${pageCount === 1 ? "" : "s"}: ${routes.join(", ") || "(none)"}`);
     if (apiCount > 0) LOG.info(`${apiCount} api route${apiCount === 1 ? "" : "s"} (app/api)`);
@@ -67762,7 +68105,8 @@ init_path_store();
 
 // src/index.ts
 var __filename2 = fileURLToPath9(import.meta.url);
-var __dirname10 = resolve40(__filename2, "..");
+var __dirname10 = resolve41(__filename2, "..");
+var requireFromCli = createRequire8(import.meta.url);
 var args = process.argv.slice(2);
 var cmd = args[0];
 function usage(code = 0) {
@@ -67807,12 +68151,12 @@ if (args.length === 0 || args.includes("--help") || args.includes("-h")) {
 }
 function loadEnvFiles(projectDir) {
   const files = [
-    join31(projectDir, ".env"),
-    join31(projectDir, ".env.local")
+    join32(projectDir, ".env"),
+    join32(projectDir, ".env.local")
   ];
   for (const filePath of files) {
-    if (!existsSync45(filePath)) continue;
-    const content = readFileSync44(filePath, "utf-8");
+    if (!existsSync46(filePath)) continue;
+    const content = readFileSync45(filePath, "utf-8");
     for (const line of content.split("\n")) {
       const trimmed = line.trim();
       if (!trimmed || trimmed.startsWith("#")) continue;
@@ -67845,16 +68189,39 @@ async function loadConfig(projectDir) {
 function resolveProjectDirs(projectDir, config) {
   const cfg = config || {};
   return {
-    appDir: resolve40(projectDir, typeof cfg.appDir === "string" ? cfg.appDir : "./app"),
-    publicDir: resolve40(projectDir, typeof cfg.publicDir === "string" ? cfg.publicDir : "./public"),
-    outDir: resolve40(projectDir, typeof cfg.outDir === "string" ? cfg.outDir : ".vesk")
+    appDir: resolve41(projectDir, typeof cfg.appDir === "string" ? cfg.appDir : "./app"),
+    publicDir: resolve41(projectDir, typeof cfg.publicDir === "string" ? cfg.publicDir : "./public"),
+    outDir: resolve41(projectDir, typeof cfg.outDir === "string" ? cfg.outDir : ".vesk")
   };
 }
+async function typecheckBeforeBuild(projectDir) {
+  if (!existsSync46(join32(projectDir, "tsconfig.json"))) return;
+  let tscPath;
+  try {
+    tscPath = requireFromCli.resolve("typescript/bin/tsc", { paths: [projectDir] });
+  } catch {
+    console.error("vesk build: typecheck skipped \u2014 TypeScript is not installed in this project.");
+    return;
+  }
+  console.error("vesk build: typechecking...");
+  const exitCode = await new Promise((resolveExit) => {
+    const child = spawn3(process.execPath, [tscPath, "--noEmit", "-p", projectDir], {
+      cwd: projectDir,
+      stdio: "inherit"
+    });
+    child.on("error", () => resolveExit(1));
+    child.on("close", (code) => resolveExit(code ?? 1));
+  });
+  if (exitCode !== 0) {
+    console.error("vesk build: typecheck failed \u2014 fix the errors above and build again.");
+    process.exit(1);
+  }
+}
 if (cmd === "build") {
   const projectDir = process.cwd();
   const rawConfig = await loadConfig(projectDir) || {};
   const { appDir: appDirPath, publicDir, outDir } = resolveProjectDirs(projectDir, rawConfig);
-  if (!existsSync45(appDirPath)) {
+  if (!existsSync46(appDirPath)) {
     console.error(`vesk build: no app directory found in ${projectDir} (config appDir: ${rawConfig.appDir ?? "./app"})`);
     process.exit(1);
   }
@@ -67874,6 +68241,7 @@ if (cmd === "build") {
   if (platform) opts.platform = platform;
   if (config.ssg !== void 0 && config.ssg !== false) opts.ssg = true;
   try {
+    await typecheckBeforeBuild(projectDir);
     await build2(appDirPath, opts);
     const { drainMdHtmlWarnings: drainMdHtmlWarnings3 } = await Promise.resolve().then(() => (init_md2(), md_exports2));
     const drained = drainMdHtmlWarnings3();
@@ -67928,7 +68296,7 @@ ${frame}`;
 if (cmd === "seo") {
   const projectDir = process.cwd();
   const { appDir: appDirPath } = resolveProjectDirs(projectDir, await loadConfig(projectDir) || {});
-  if (!existsSync45(appDirPath)) {
+  if (!existsSync46(appDirPath)) {
     console.error(`vesk seo: no app directory found in ${projectDir}`);
     process.exit(1);
   }
@@ -67943,7 +68311,7 @@ if (cmd === "seo") {
 if (cmd === "typecheck") {
   const projectDir = process.cwd();
   const { appDir: appDirPath } = resolveProjectDirs(projectDir, await loadConfig(projectDir) || {});
-  if (!existsSync45(appDirPath)) {
+  if (!existsSync46(appDirPath)) {
     console.error(`vesk typecheck: no app directory found in ${projectDir}`);
     process.exit(1);
   }
@@ -67970,7 +68338,7 @@ if (cmd === "start") {
   const { outDir } = resolveProjectDirs(projectDir, await loadConfig(projectDir) || {});
   const port = parsePortArg(args);
   const host = parseHostArg(args);
-  if (!existsSync45(outDir)) {
+  if (!existsSync46(outDir)) {
     console.error(`vesk start: no build found at ${outDir} \u2014 run "vesk build" first.`);
     process.exit(1);
   }
@@ -67981,8 +68349,8 @@ if (cmd === "start") {
 if (cmd === "init") {
   const projectDir = process.cwd();
   const { appDir: appDirPath } = resolveProjectDirs(projectDir, await loadConfig(projectDir) || {});
-  const target = join31(appDirPath, "global.css");
-  if (existsSync45(target)) {
+  const target = join32(appDirPath, "global.css");
+  if (existsSync46(target)) {
     console.error(`vesk init: ${target} already exists \u2014 skipping`);
     process.exit(0);
   }
@@ -68002,7 +68370,7 @@ if (cmd === "migrate") {
   const projectDir = process.cwd();
   const { runMigrate: runMigrate2 } = await Promise.resolve().then(() => (init_migrate(), migrate_exports));
   const { CODEMODS: CODEMODS2 } = await Promise.resolve().then(() => (init_codemods(), codemods_exports));
-  const { version: cliVersion } = JSON.parse(readFileSync44(join31(__dirname10, "..", "package.json"), "utf-8"));
+  const { version: cliVersion } = JSON.parse(readFileSync45(join32(__dirname10, "..", "package.json"), "utf-8"));
   if (args.includes("--list")) {
     console.error("vesk migrate: available codemods");
     for (const c of CODEMODS2) {
@@ -68044,7 +68412,7 @@ if (cmd === "dev") {
   const { appDir: appDirPath, publicDir } = resolveProjectDirs(projectDir, await loadConfig(projectDir) || {});
   const port = parsePortArg(args);
   const host = parseHostArg(args);
-  if (!existsSync45(appDirPath)) {
+  if (!existsSync46(appDirPath)) {
     console.error(`vesk: no app/ directory found in ${projectDir}`);
     console.error('Run "npx create-vesk@latest <project-name>" first');
     process.exit(1);