@vesk/vesk-cli 0.2.43 → 0.2.45

package/dist/cli.js

@@ -184,21 +184,36 @@ var init_errors = __esm({
           tip: isBuiltin ? `"${name}" is a Vesk built-in. Use it directly \u2014 no manual import needed.` : ""
         });
       }
-      static vskNamespaceTag(context = {}) {
+      /**
+       * A `.vsk` namespace is resolved at the JSX-tag level: `<ns.Icon />` looks
+       * the component up in the registry by its exported name, exactly like
+       * `import { Icon }`, and no module object is ever built. The two forms that
+       * genuinely need a real module object are reported here.
+       *
+       * - `nested` — `<ns.Sub.Icon />`. A `.vsk` module's exports are flat
+       *   component names, so there is no object to walk into.
+       * - `value` — `ns.max` read as a value. Component tags resolve; plain value
+       *   reads do not, because nothing binds `ns` at runtime.
+       */
+      static vskNamespaceMember(context = {}) {
+        const nested = context.form === "nested";
         return new _VeskError(
-          "Namespace imports are not supported for `.vsk` modules.",
+          nested ? "A `.vsk` namespace is flat, so `<ns.Sub.Icon />` cannot be resolved." : "A `.vsk` namespace resolves component tags only, so `ns.value` is not available.",
           {
             ...context,
             code: context.code || "V0410",
-            suggestions: [
-              "Import the component by name: import { MyIcon } from './icons.vsk'",
-              "Rename on import: import { MyIcon as Icon } from './icons.vsk'"
+            suggestions: nested ? [
+              "Import the component by name: import { Icon } from './icons.vsk'",
+              "Import from the module that owns Sub: import * as Sub from './sub.vsk'"
+            ] : [
+              "Import the value by name: import { MAX } from './constants.vsk'",
+              "Move the value into a .ts module and import it from there \u2014 those are real ES modules with live bindings."
             ],
             nextSteps: [
-              "A `.vsk` component is a registry entry keyed by its name, not a module namespace object, so `<ns.Icon />` cannot be resolved.",
-              "If you need a namespace object, import from a `.ts`/`.js` module instead \u2014 those are real ES modules."
+              "A `.vsk` tag resolves by component name in the global registry, not by module exports, so `import * as ns` + `<ns.Icon />` needs no module object.",
+              nested ? "Re-export with a flat name (`export { Icon }`) or import the component directly." : "Re-export the value under a flat name and import it directly, or keep the value in a .ts module."
             ],
-            tip: "A `.vsk` module exposes its components as named exports; use a named or renamed import rather than `import * as ns`."
+            tip: "`<ns.Icon />` works; only nested paths and value reads need a real module namespace."
           }
         );
       }
@@ -1644,11 +1659,11 @@ var init_context = __esm({
 
 // ../runtime/src/server-events.ts
 function getStore() {
-  const g2 = globalThis;
-  if (!g2.__vesk_server_ctx || typeof g2.__vesk_server_ctx !== "object") {
-    g2.__vesk_server_ctx = {};
+  const g4 = globalThis;
+  if (!g4.__vesk_server_ctx || typeof g4.__vesk_server_ctx !== "object") {
+    g4.__vesk_server_ctx = {};
   }
-  return g2.__vesk_server_ctx;
+  return g4.__vesk_server_ctx;
 }
 function server_locals() {
   return getStore();
@@ -2638,9 +2653,9 @@ function createHydrateWalker(container, markerList) {
 }
 function bumpNavEpoch() {
   try {
-    const g2 = globalThis;
-    const next = (g2.__vesk_nav_epoch || 0) + 1;
-    g2.__vesk_nav_epoch = next;
+    const g4 = globalThis;
+    const next = (g4.__vesk_nav_epoch || 0) + 1;
+    g4.__vesk_nav_epoch = next;
     return next;
   } catch {
     return 0;
@@ -5320,8 +5335,8 @@ function createRouter(routes, options = {}) {
     },
     _runGuards(to) {
       const from = get(_state.path) || window.location.pathname;
-      for (const g2 of this._beforeGuards ?? []) {
-        const d = g2(to, from);
+      for (const g4 of this._beforeGuards ?? []) {
+        const d = g4(to, from);
         if (d instanceof Promise) {
           return d.then((r) => {
             if (r === false || typeof r === "string") return r;
@@ -5647,8 +5662,8 @@ function createFileRouter(routeTree, options = {}) {
     },
     _runGuards(to) {
       const from = get(_state.path) || window.location.pathname;
-      for (const g2 of this._beforeGuards ?? []) {
-        const d = g2(to, from);
+      for (const g4 of this._beforeGuards ?? []) {
+        const d = g4(to, from);
         if (d instanceof Promise) {
           return d.then((r) => {
             if (r === false || typeof r === "string") return r;
@@ -20181,17 +20196,125 @@ function jsxTagRootName(nameNode) {
   while (node && node.type === "JSXMemberExpression") node = node.object;
   return node && node.type === "JSXIdentifier" ? node.name : "";
 }
+function jsxTagMemberName(nameNode) {
+  let node = nameNode;
+  while (node && node.type === "JSXMemberExpression") {
+    node = node.property;
+    if (node && node.type === "JSXIdentifier") return node.name;
+  }
+  return "";
+}
+function jsxTagDepth(nameNode) {
+  let depth = 0;
+  let node = nameNode;
+  while (node && node.type === "JSXMemberExpression") {
+    depth++;
+    node = node.object;
+  }
+  return depth;
+}
 function collectVskNamespaceLocals(ast) {
-  const out = /* @__PURE__ */ new Set();
+  const namespaceLocals = /* @__PURE__ */ new Map();
   for (const node of ast.body || []) {
     if (node.type !== "ImportDeclaration") continue;
     if (typeof node.source?.value !== "string" || !node.source.value.endsWith(".vsk")) continue;
     for (const spec of node.specifiers || []) {
-      if (spec.type === "ImportNamespaceSpecifier" && spec.local?.name) out.add(spec.local.name);
+      if (spec.type === "ImportNamespaceSpecifier" && spec.local?.name) {
+        namespaceLocals.set(spec.local.name, { path: node.source.value, shadowed: false });
+      }
+    }
+  }
+  if (namespaceLocals.size === 0) return /* @__PURE__ */ new Set();
+  markShadowedBindings(ast, namespaceLocals);
+  return new Set([...namespaceLocals].filter(([, v]) => !v.shadowed).map(([k]) => k));
+}
+function markShadowedBindings(node, namespaceLocals) {
+  if (!node || typeof node !== "object") return;
+  if (Array.isArray(node)) {
+    for (const child of node) markShadowedBindings(child, namespaceLocals);
+    return;
+  }
+  if (typeof node.type === "string") {
+    if (node.type === "ImportNamespaceSpecifier") return;
+    for (const name of declaredBindingNames(node)) {
+      const entry = namespaceLocals.get(name);
+      if (entry) entry.shadowed = true;
     }
   }
+  for (const key of Object.keys(node)) {
+    if (key === "loc" || key === "range" || key === "start" || key === "end") continue;
+    markShadowedBindings(node[key], namespaceLocals);
+  }
+}
+function declaredBindingNames(node) {
+  const out = [];
+  const pushPattern = (id) => {
+    if (!id) return;
+    if (id.type === "Identifier") {
+      out.push(id.name);
+      return;
+    }
+    if (id.type === "ObjectPattern") {
+      for (const prop of id.properties || []) {
+        if (prop.type === "RestElement") pushPattern(prop.argument);
+        else pushPattern(prop.value);
+      }
+      return;
+    }
+    if (id.type === "ArrayPattern") {
+      for (const el of id.elements || []) if (el) pushPattern(el.type === "RestElement" ? el.argument : el);
+      return;
+    }
+    if (id.type === "AssignmentPattern") pushPattern(id.left);
+    if (id.type === "RestElement") pushPattern(id.argument);
+  };
+  switch (node.type) {
+    case "VariableDeclarator":
+      pushPattern(node.id);
+      break;
+    case "FunctionDeclaration":
+    case "FunctionExpression":
+    case "ArrowFunctionExpression":
+      if (node.id) pushPattern(node.id);
+      for (const param of node.params || []) pushPattern(param);
+      break;
+    case "ClassDeclaration":
+    case "ClassExpression":
+      if (node.id) pushPattern(node.id);
+      break;
+    case "CatchClause":
+      pushPattern(node.param);
+      break;
+    default:
+      break;
+  }
   return out;
 }
+function assertNoVskNamespaceValue(source, expr) {
+  if (!currentVskNamespaceLocals || currentVskNamespaceLocals.size === 0) return;
+  const hit = findNamespaceValueUse(expr, currentVskNamespaceLocals);
+  if (!hit) return;
+  const { line, column } = offsetToLineCol2(source, hit.start ?? 0);
+  throw VeskError.vskNamespaceMember({ file: currentSourceFile, line, column, code: codeFrame(source, line, column), form: "value" });
+}
+function findNamespaceValueUse(node, locals2) {
+  if (!node || typeof node !== "object") return null;
+  if (Array.isArray(node)) {
+    for (const child of node) {
+      const hit = findNamespaceValueUse(child, locals2);
+      if (hit) return hit;
+    }
+    return null;
+  }
+  if (typeof node.type !== "string") return null;
+  if (node.type === "MemberExpression" && node.object?.type === "Identifier" && locals2.has(node.object.name)) return node;
+  for (const key of Object.keys(node)) {
+    if (key === "loc" || key === "range" || key === "start" || key === "end") continue;
+    const hit = findNamespaceValueUse(node[key], locals2);
+    if (hit) return hit;
+  }
+  return null;
+}
 function isHTMLTag(name) {
   return name.length > 0 && name[0] === name[0].toLowerCase();
 }
@@ -20199,6 +20322,7 @@ function isMapCall(expr) {
   return expr.type === "CallExpression" && expr.callee.type === "MemberExpression" && expr.callee.property.name === "map" && expr.arguments.length === 1 && expr.arguments[0].type === "ArrowFunctionExpression";
 }
 function toExpression(source, expr) {
+  assertNoVskNamespaceValue(source, expr);
   return new Expression(getSource(source, expr), [], expr, source);
 }
 function processAttribute(source, attr) {
@@ -20561,12 +20685,16 @@ function processJSXElement(source, element) {
   }
   if (nameNode && nameNode.type === "JSXMemberExpression") {
     const root3 = jsxTagRootName(nameNode);
-    if (currentVskNamespaceLocals && currentVskNamespaceLocals.has(root3)) {
+    const isVskNamespace = !!currentVskNamespaceLocals && currentVskNamespaceLocals.has(root3);
+    if (isVskNamespace && jsxTagDepth(nameNode) > 1) {
       const { line, column } = offsetToLineCol2(source, nameNode.start ?? 0);
-      throw VeskError.vskNamespaceTag({ file: currentSourceFile, line, column, code: codeFrame(source, line, column) });
+      throw VeskError.vskNamespaceMember({ file: currentSourceFile, line, column, code: codeFrame(source, line, column), form: "nested" });
     }
     const { props, spreadProps, slots } = extractProps(source, element);
     const children2 = selfClosing ? [] : processJSXChildren(source, element.children || []);
+    if (isVskNamespace) {
+      return [new ComponentCall(jsxTagMemberName(nameNode), props, [...children2, ...slots.map((s) => new PropSlot(s.name, s.nodes))], spreadProps, element.start)];
+    }
     return [new ComponentCall(tagName, props, [...children2, ...slots.map((s) => new PropSlot(s.name, s.nodes))], spreadProps, element.start, getSource(source, nameNode))];
   }
   if (!isHTMLTag(tagName) && selfClosing) {
@@ -21621,16 +21749,16 @@ function sha256Bytes(msg) {
       const s1 = rr(w[j - 2], 17) ^ rr(w[j - 2], 19) ^ w[j - 2] >>> 10;
       w[j] = w[j - 16] + s0 + w[j - 7] + s1 >>> 0;
     }
-    let a = h0, b = h1, c = h2, d = h3, e = h4, f = h5, g2 = h6, h = h7;
+    let a = h0, b = h1, c = h2, d = h3, e = h4, f = h5, g4 = h6, h = h7;
     for (let j = 0; j < 64; j++) {
       const S1 = rr(e, 6) ^ rr(e, 11) ^ rr(e, 25);
-      const ch = e & f ^ ~e & g2;
+      const ch = e & f ^ ~e & g4;
       const t1 = h + S1 + ch + SHA_K[j] + w[j] >>> 0;
       const S0 = rr(a, 2) ^ rr(a, 13) ^ rr(a, 22);
       const maj = a & b ^ a & c ^ b & c;
       const t2 = S0 + maj >>> 0;
-      h = g2;
-      g2 = f;
+      h = g4;
+      g4 = f;
       f = e;
       e = d + t1 >>> 0;
       d = c;
@@ -21644,7 +21772,7 @@ function sha256Bytes(msg) {
     h3 = h3 + d >>> 0;
     h4 = h4 + e >>> 0;
     h5 = h5 + f >>> 0;
-    h6 = h6 + g2 >>> 0;
+    h6 = h6 + g4 >>> 0;
     h7 = h7 + h >>> 0;
   }
   const out = new Uint8Array(32);
@@ -22695,23 +22823,23 @@ async function _getImpl() {
   return _signImpl;
 }
 async function signCookie2(name, value, host) {
-  const impl = await _getImpl();
-  if (impl.signCookie) return impl.signCookie(name, value, host);
+  const impl3 = await _getImpl();
+  if (impl3.signCookie) return impl3.signCookie(name, value, host);
   throw new Error("signCookie: @vesk/compiler not available");
 }
 async function unsignCookie2(name, signedValue, host) {
-  const impl = await _getImpl();
-  if (impl.unsignCookie) return impl.unsignCookie(name, signedValue, host);
+  const impl3 = await _getImpl();
+  if (impl3.unsignCookie) return impl3.unsignCookie(name, signedValue, host);
   throw new Error("unsignCookie: @vesk/compiler not available");
 }
 async function setSignedCookie2(name, value, options = {}, host) {
-  const impl = await _getImpl();
-  if (impl.setSignedCookie) return impl.setSignedCookie(name, value, options, host);
+  const impl3 = await _getImpl();
+  if (impl3.setSignedCookie) return impl3.setSignedCookie(name, value, options, host);
   throw new Error("setSignedCookie: @vesk/compiler not available");
 }
 async function readSignedCookie2(name, cookieString, host) {
-  const impl = await _getImpl();
-  if (impl.readSignedCookie) return impl.readSignedCookie(name, cookieString, host);
+  const impl3 = await _getImpl();
+  if (impl3.readSignedCookie) return impl3.readSignedCookie(name, cookieString, host);
   throw new Error("readSignedCookie: @vesk/compiler not available");
 }
 var ServerRequest, ServerResponse, DEFAULT_MAX_BODY_BYTES2, PayloadTooLargeError, VeskRequest, _VeskResponse, VeskResponse, _signImpl;
@@ -26227,9 +26355,9 @@ var init_primitive = __esm({
 
 // ../runtime/src/action.ts
 function getActionRegistry() {
-  const g2 = globalThis;
-  if (!g2[registryKey]) g2[registryKey] = {};
-  return g2[registryKey];
+  const g4 = globalThis;
+  if (!g4[registryKey]) g4[registryKey] = {};
+  return g4[registryKey];
 }
 function hashString(str3) {
   let h1 = 2166136261;
@@ -26267,8 +26395,8 @@ function getAction(id) {
   return getActionRegistry()[id] || null;
 }
 function clearActions() {
-  const g2 = globalThis;
-  g2[registryKey] = {};
+  const g4 = globalThis;
+  g4[registryKey] = {};
 }
 function isFormAction(action) {
   return typeof action === "object" && action !== null && (action.__veskAction === true || typeof action.id === "string" && typeof action.url === "string");
@@ -30999,15 +31127,23 @@ function compileClientBoth(source, _componentName, sourcePath2, opts) {
   const comp = emitClientFromIR(ir, { forceClient: true, nameAllocator: alloc });
   const aliases = vskRegistryAliases(ir.imports, ir.exportAliases);
   const reexportPaths = sourcePath2 ? collectVskReexportPaths(ir.reexportSources, sourcePath2) : [];
-  if (opts?.skipHyd) return { comp, hyd: "", name, aliases, reexportPaths };
+  if (opts?.skipHyd) return { comp, hyd: "", name, aliases, reexportPaths, componentNames: ir.components.map((c) => c.name) };
   return {
     comp,
     hyd: emitClientFromIR(irHyd, { forceClient: true, hydrate: true, includeTopLevel: false, nameAllocator: alloc, markerless: opts?.markerless !== false }),
     name,
     aliases,
-    reexportPaths
+    reexportPaths,
+    // Every component NAME this file registers, not just the resolved one —
+    // the bundle needs the full list to spot same-name declarations across
+    // files (see findVskComponentCollisions).
+    componentNames: ir.components.map((c) => c.name)
   };
 }
+function vskComponentNames(source, sourcePath2) {
+  const ast = parse4(source, sourcePath2 ? { filename: sourcePath2 } : {});
+  return generateIR(ast, source, sourcePath2).components.map((c) => c.name);
+}
 var BINDING_REF_CALLS, NON_BUBBLING_EVENTS, Ctx, PROPERTY_ATTRS;
 var init_client_codegen = __esm({
   "../compiler/src/client-codegen.ts"() {
@@ -31608,35 +31744,159 @@ var init_server_jsgen = __esm({
 
 // ../compiler/src/ssr-store.ts
 import { AsyncLocalStorage } from "node:async_hooks";
+function newSsrToken() {
+  return Math.random().toString(36).slice(2);
+}
+function createSsrStore() {
+  return { token: newSsrToken(), data: {} };
+}
+function adoptSsrStore() {
+  return storage.getStore() ?? createSsrStore();
+}
+function isThenable(value) {
+  return typeof value?.then === "function";
+}
 function withSsrStore(fn) {
   const existing = storage.getStore();
   if (existing) return fn();
-  return storage.run({}, fn);
+  const store = createSsrStore();
+  keepSsrSlot(store.token);
+  let result;
+  try {
+    result = storage.run(store, fn);
+  } catch (err) {
+    dropSsrSlot(store.token);
+    throw err;
+  }
+  if (isThenable(result)) {
+    return result.then(
+      (value) => {
+        dropSsrSlot(store.token);
+        return value;
+      },
+      (err) => {
+        dropSsrSlot(store.token);
+        throw err;
+      }
+    );
+  }
+  dropSsrSlot(store.token);
+  return result;
 }
-var storage, ssrSink2;
+function withSsrStoreOf(store, fn) {
+  return storage.run(store, fn);
+}
+function keepSsrSlot(token) {
+  if (!token) return;
+  liveSlots.set(token, (liveSlots.get(token) ?? 0) + 1);
+}
+function dropSsrSlot(token) {
+  if (!token) return;
+  const count = liveSlots.get(token);
+  if (count === void 0) return;
+  if (count <= 1) liveSlots.delete(token);
+  else liveSlots.set(token, count - 1);
+}
+function isSsrSlotLive(token) {
+  return liveSlots.has(token);
+}
+var TOKEN_KEY, IMPL_KEY, g2, impl, storage, liveSlots, ssrSink2;
 var init_ssr_store = __esm({
   "../compiler/src/ssr-store.ts"() {
     "use strict";
     init_index_server();
-    storage = new AsyncLocalStorage();
+    TOKEN_KEY = "__vsk_ssr_token";
+    IMPL_KEY = "__vsk_ssr_store_impl";
+    g2 = globalThis;
+    impl = g2[IMPL_KEY] ?? (g2[IMPL_KEY] = {
+      storage: new AsyncLocalStorage(),
+      liveSlots: /* @__PURE__ */ new Map(),
+      // Only the copy that created the implementation installs the token
+      // accessor; a later copy must not redefine it over the shared storage.
+      ownsAccessor: true
+    });
+    storage = impl.storage;
+    liveSlots = impl.liveSlots;
     ssrSink2 = {
       set: (key, value) => {
         const store = storage.getStore();
-        if (store) store[key] = value;
+        if (store) store.data[key] = value;
       },
       get: (key) => {
         const store = storage.getStore();
-        return store ? store[key] : void 0;
+        return store ? store.data[key] : void 0;
       },
-      snapshot: () => ({ ...storage.getStore() ?? {} }),
+      snapshot: () => ({ ...storage.getStore()?.data ?? {} }),
       clear: () => {
         const store = storage.getStore();
         if (store) {
-          for (const key of Object.keys(store)) delete store[key];
+          for (const key of Object.keys(store.data)) delete store.data[key];
         }
       }
     };
     setSsrSink(ssrSink2);
+    if (impl.ownsAccessor) {
+      Object.defineProperty(globalThis, TOKEN_KEY, {
+        configurable: true,
+        get() {
+          return storage.getStore()?.token;
+        },
+        set(value) {
+          const store = storage.getStore();
+          if (store) store.token = value;
+        }
+      });
+    }
+  }
+});
+
+// ../compiler/src/vsk-collision.ts
+var VskComponentOwners, reportedCollisions;
+var init_vsk_collision = __esm({
+  "../compiler/src/vsk-collision.ts"() {
+    "use strict";
+    VskComponentOwners = class {
+      owners = /* @__PURE__ */ new Map();
+      /** Records that `file` declares a component called `name`. */
+      claim(name, file) {
+        let set2 = this.owners.get(name);
+        if (!set2) {
+          set2 = /* @__PURE__ */ new Set();
+          this.owners.set(name, set2);
+        }
+        set2.add(file);
+      }
+      /** Names declared by more than one file, each with its declaring files. */
+      collisions() {
+        const out = [];
+        for (const [name, files] of this.owners) {
+          if (files.size > 1) out.push({ name, files: [...files] });
+        }
+        return out.sort((a, b) => a.name.localeCompare(b.name));
+      }
+      /**
+       * Warns once per colliding name. Returns the message per collision so a
+       * caller (or a test) can assert on the text without capturing stderr.
+       *
+       * Deduped by name for the life of the process: the SSR path compiles one
+       * file graph per `compileFile` call, so without this a single build would
+       * repeat the same warning once per entry page.
+       */
+      report(context) {
+        const collisions = this.collisions();
+        const fresh = [];
+        for (const { name, files } of collisions) {
+          if (reportedCollisions.has(name)) continue;
+          reportedCollisions.add(name);
+          fresh.push(`${name}: ${files.join(", ")}`);
+          console.warn(
+            `[vesk] ${context}: component "${name}" is declared in ${files.length} files and resolves to only one of them \u2014 ${files.join(", ")}. Which one wins depends on compile order, and the client and server registries pick differently, so this can render a different component in the browser than in the SSR HTML. Rename one of them.`
+          );
+        }
+        return fresh;
+      }
+    };
+    reportedCollisions = /* @__PURE__ */ new Set();
   }
 });
 
@@ -31660,9 +31920,12 @@ function scopedVesk(fn, fallback) {
   return fn.__veskScope || fallback;
 }
 function compileFile(source, options) {
-  return compileFileInternal(source, options?.sourcePath, /* @__PURE__ */ new Set());
+  const owners = new VskComponentOwners();
+  const result = compileFileInternal(source, options?.sourcePath, /* @__PURE__ */ new Set(), owners);
+  owners.report("SSR");
+  return result;
 }
-function compileFileInternal(source, sourcePath2, seenImportFiles) {
+function compileFileInternal(source, sourcePath2, seenImportFiles, owners) {
   if (sourcePath2) {
     const dir = dirname7(sourcePath2);
     source = inlineMdImportsFrom(source, sourcePath2, guessProjectRoots(dir));
@@ -31671,6 +31934,7 @@ function compileFileInternal(source, sourcePath2, seenImportFiles) {
   const ir = generateIR(ast, source, sourcePath2);
   const componentMap = buildComponentMap2(ir, true);
   const ownComponentNames = ir.components.map((c) => c.name);
+  if (sourcePath2 && owners) for (const n of ownComponentNames) owners.claim(n, sourcePath2);
   const __vesk = loadRuntimeImports(ir.imports);
   applyLocalModuleImports(__vesk, ir.imports, sourcePath2);
   if (sourcePath2) {
@@ -31687,7 +31951,7 @@ function compileFileInternal(source, sourcePath2, seenImportFiles) {
       } catch {
         continue;
       }
-      const sub = compileFileInternal(importedSrc, importPath, seenImportFiles);
+      const sub = compileFileInternal(importedSrc, importPath, seenImportFiles, owners);
       for (const [name, fn] of sub.componentMap) {
         if (!componentMap.has(name)) componentMap.set(name, fn);
       }
@@ -31716,29 +31980,32 @@ function render2(source, componentName, props = {}, registry = /* @__PURE__ */ n
   const targetComp = compiled.ir.components.find((c) => c.name === componentName);
   const isAsyncComp = !!(targetComp && (targetComp.isAsync || targetComp.ssrAwait));
   globalThis.__vsk_ssr = true;
-  if (!globalThis.__vsk_ssr_token) globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
-  const renderToken = globalThis.__vsk_ssr_token;
-  if (isAsyncComp) {
-    return withSsrStore(() => (async () => {
-      let bodyHtml2;
-      try {
-        bodyHtml2 = await renderFn(props, fullRegistry, scopedVesk(renderFn, __vesk));
-      } finally {
-        delete globalThis.__vsk_ssr;
-        await settleSsrPromises(renderToken);
-        clearSsrCells(renderToken);
-      }
-      return bodyHtml2;
-    })());
-  }
-  let bodyHtml;
-  try {
-    bodyHtml = withSsrStore(() => renderFn(props, fullRegistry, scopedVesk(renderFn, __vesk)));
-  } finally {
-    delete globalThis.__vsk_ssr;
-    clearSsrCells(renderToken);
-  }
-  return bodyHtml;
+  return withSsrStore(() => {
+    if (!globalThis.__vsk_ssr_token) globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
+    const renderToken = globalThis.__vsk_ssr_token;
+    keepSsrSlot(renderToken);
+    if (isAsyncComp) {
+      return (async () => {
+        let bodyHtml2;
+        try {
+          bodyHtml2 = await renderFn(props, fullRegistry, scopedVesk(renderFn, __vesk));
+        } finally {
+          delete globalThis.__vsk_ssr;
+          await settleSsrPromises(renderToken);
+          clearSsrCells(renderToken);
+        }
+        return bodyHtml2;
+      })();
+    }
+    let bodyHtml;
+    try {
+      bodyHtml = renderFn(props, fullRegistry, scopedVesk(renderFn, __vesk));
+    } finally {
+      delete globalThis.__vsk_ssr;
+      clearSsrCells(renderToken);
+    }
+    return bodyHtml;
+  });
 }
 function renderPage(source, componentName, props = {}, registry = /* @__PURE__ */ new Map(), options = {}) {
   resetVskState(!!options.hydrate, options.markerless !== false);
@@ -31762,9 +32029,10 @@ function renderPage(source, componentName, props = {}, registry = /* @__PURE__ *
     globalThis.__vsk_ssr = true;
     if (!globalThis.__vsk_ssr_token) globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
     const renderToken = globalThis.__vsk_ssr_token;
+    keepSsrSlot(renderToken);
     pruneSsrDataSlots();
     if (targetComp && (targetComp.isAsync || targetComp.ssrAwait)) {
-      return withSsrStore(() => (async () => {
+      return (async () => {
         let bodyHtml2;
         try {
           bodyHtml2 = await renderFn(ssrProps, fullRegistry, scopedVesk(renderFn, __vesk));
@@ -31778,22 +32046,22 @@ function renderPage(source, componentName, props = {}, registry = /* @__PURE__ *
           head: renderHeadHtml(targetComp, ssrProps),
           props: ssrProps
         };
-      })());
+      })();
     }
     let bodyHtml;
     try {
-      bodyHtml = withSsrStore(() => renderFn(ssrProps, fullRegistry, scopedVesk(renderFn, __vesk)));
+      bodyHtml = renderFn(ssrProps, fullRegistry, scopedVesk(renderFn, __vesk));
     } finally {
       delete globalThis.__vsk_ssr;
     }
     const headHtml = targetComp ? renderHeadHtml(targetComp, ssrProps) : "";
     const pending = globalThis[`__vsk_ssr_promises_${renderToken}`];
     if (pending && pending.length > 0) {
-      return withSsrStore(() => (async () => {
+      return (async () => {
         await settleSsrPromises(renderToken);
         clearSsrCells(renderToken);
         return { body: bodyHtml, head: headHtml, props: ssrProps };
-      })());
+      })();
     }
     clearSsrCells(renderToken);
     return { body: bodyHtml, head: headHtml, props: ssrProps };
@@ -31817,6 +32085,7 @@ function clearSsrCells(token) {
   if (!token) return;
   delete globalThis[`__vsk_ssr_promises_${token}`];
   delete globalThis[`__vsk_ssr_failures_${token}`];
+  dropSsrSlot(token);
   const cells = globalThis.__vsk_ssr_cells;
   if (!cells || !(cells instanceof Map)) return;
   for (const k of cells.keys()) {
@@ -31825,16 +32094,28 @@ function clearSsrCells(token) {
 }
 async function settleSsrPromises(token) {
   if (!token) return;
-  const pending = globalThis[`__vsk_ssr_promises_${token}`];
-  if (!pending || pending.length === 0) return;
-  await Promise.allSettled(pending);
+  const key = `__vsk_ssr_promises_${token}`;
+  for (let round = 0; round < 10; round++) {
+    const pending = globalThis[key];
+    if (!pending || pending.length === 0) return;
+    const before = pending.length;
+    await Promise.allSettled(pending.slice());
+    const after = globalThis[key];
+    if (!after || after.length <= before) return;
+  }
 }
 function pruneSsrDataSlots() {
-  const g2 = globalThis;
-  const keys = Object.keys(g2).filter((k) => typeof k === "string" && k.startsWith("__vsk_ssr_data_"));
-  if (keys.length <= 40) return;
-  keys.sort().slice(0, keys.length - 40).forEach((k) => {
-    delete g2[k];
+  const g4 = globalThis;
+  const prefix = "__vsk_ssr_data_";
+  const stale = [];
+  for (const k of Object.keys(g4)) {
+    if (typeof k !== "string" || !k.startsWith(prefix)) continue;
+    if (isSsrSlotLive(k.slice(prefix.length))) continue;
+    stale.push(k);
+  }
+  if (stale.length <= 40) return;
+  stale.sort().slice(0, stale.length - 40).forEach((k) => {
+    delete g4[k];
   });
 }
 async function applyHeadPlugins(headHtml, plugins, ctx2) {
@@ -31964,6 +32245,7 @@ async function renderFullPage(source, componentName, props = {}, registry = /* @
     globalThis.__vsk_ssr = true;
     if (!globalThis.__vsk_ssr_token) globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
     const renderToken = globalThis.__vsk_ssr_token;
+    keepSsrSlot(renderToken);
     pruneSsrDataSlots();
     globalThis.__vsk_ssr_data = {};
     try {
@@ -32040,12 +32322,15 @@ ${dataScriptBlock}${clientScript}</body>
     } finally {
       delete globalThis.__vsk_ssr;
       delete globalThis[`__vsk_ssr_data_${renderToken}`];
-      delete globalThis.__vsk_ssr_token;
+      dropSsrSlot(renderToken);
       pruneSsrDataSlots();
     }
   });
 }
 function renderPageStream(source, componentName, props = {}, registry = /* @__PURE__ */ new Map(), options = {}) {
+  const streamStore = adoptSsrStore();
+  keepSsrSlot(streamStore.token);
+  const streamToken = streamStore.token;
   async function* raw2() {
     const cached = options.cached || void 0;
     const ir = cached ? cached.ir : generateIR(parse4(source, options.sourcePath ? { filename: options.sourcePath } : {}), source, options.sourcePath);
@@ -32114,8 +32399,7 @@ function renderPageStream(source, componentName, props = {}, registry = /* @__PU
     yield '</head>\n<body>\n<div id="root">\n';
     globalThis.__vsk_ssr = true;
     globalThis.__vsk_ssr_data = {};
-    if (!globalThis.__vsk_ssr_token) globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
-    const renderToken = globalThis.__vsk_ssr_token;
+    const renderToken = streamToken;
     pruneSsrDataSlots();
     let bodyHtml;
     try {
@@ -32135,7 +32419,7 @@ function renderPageStream(source, componentName, props = {}, registry = /* @__PU
       console.error(`[render-trace] renderPageStream comp=${componentName} keys=${Object.keys(ssrData).join(",") || "\u2205"} slot=${Object.keys(slot).join(",") || "\u2205"} sink=${Object.keys(ssrSink2.snapshot()).join(",") || "\u2205"}`);
     }
     delete globalThis[`__vsk_ssr_data_${renderToken}`];
-    delete globalThis.__vsk_ssr_token;
+    dropSsrSlot(renderToken);
     pruneSsrDataSlots();
     const dataScripts = buildDataScripts(ssrProps, ssrData, options.externalDataScript);
     const dataScriptBlock = dataScripts.length > 0 ? "\n" + dataScripts.join("\n") : "";
@@ -32148,11 +32432,20 @@ function renderPageStream(source, componentName, props = {}, registry = /* @__PU
   }
   const gen = raw2();
   async function* scoped() {
-    let result;
-    do {
-      result = await withSsrStore(() => gen.next());
-      if (!result.done) yield result.value;
-    } while (!result.done);
+    try {
+      let result;
+      do {
+        result = await withSsrStoreOf(streamStore, () => gen.next());
+        if (!result.done) yield result.value;
+      } while (!result.done);
+    } finally {
+      dropSsrSlot(streamToken);
+      delete globalThis[`__vsk_ssr_data_${streamToken}`];
+      delete globalThis[`__vsk_ssr_promises_${streamToken}`];
+      delete globalThis[`__vsk_ssr_failures_${streamToken}`];
+      delete globalThis.__vsk_ssr_data;
+      pruneSsrDataSlots();
+    }
   }
   return scoped();
 }
@@ -32171,6 +32464,7 @@ var init_server_render = __esm({
     init_md_inline();
     init_ssr_store();
     init_module_imports();
+    init_vsk_collision();
   }
 });
 
@@ -33769,7 +34063,7 @@ ${serverStoreLine}
   // SSR already resolved. Entry is consumed on read (bound store).
   if (pathname === '/ssr-data.js') {
     const dataToken = url.searchParams.get('t') || '';
-    const dataStore = (globalThis.__vsk_ssr_data_store || {});
+    const dataStore = (globalThis.__vsk_ssr_payload_store || {});
     const payload = dataStore[dataToken];
     if (payload) delete dataStore[dataToken];
     const dataLines = [];
@@ -37334,19 +37628,34 @@ var init_errors2 = __esm({
           tip: isBuiltin ? `"${name}" is a Vesk built-in. Use it directly \u2014 no manual import needed.` : ""
         });
       }
-      static vskNamespaceTag(context = {}) {
-        return new _VeskError("Namespace imports are not supported for `.vsk` modules.", {
+      /**
+       * A `.vsk` namespace is resolved at the JSX-tag level: `<ns.Icon />` looks
+       * the component up in the registry by its exported name, exactly like
+       * `import { Icon }`, and no module object is ever built. The two forms that
+       * genuinely need a real module object are reported here.
+       *
+       * - `nested` — `<ns.Sub.Icon />`. A `.vsk` module's exports are flat
+       *   component names, so there is no object to walk into.
+       * - `value` — `ns.max` read as a value. Component tags resolve; plain value
+       *   reads do not, because nothing binds `ns` at runtime.
+       */
+      static vskNamespaceMember(context = {}) {
+        const nested = context.form === "nested";
+        return new _VeskError(nested ? "A `.vsk` namespace is flat, so `<ns.Sub.Icon />` cannot be resolved." : "A `.vsk` namespace resolves component tags only, so `ns.value` is not available.", {
           ...context,
           code: context.code || "V0410",
-          suggestions: [
-            "Import the component by name: import { MyIcon } from './icons.vsk'",
-            "Rename on import: import { MyIcon as Icon } from './icons.vsk'"
+          suggestions: nested ? [
+            "Import the component by name: import { Icon } from './icons.vsk'",
+            "Import from the module that owns Sub: import * as Sub from './sub.vsk'"
+          ] : [
+            "Import the value by name: import { MAX } from './constants.vsk'",
+            "Move the value into a .ts module and import it from there \u2014 those are real ES modules with live bindings."
           ],
           nextSteps: [
-            "A `.vsk` component is a registry entry keyed by its name, not a module namespace object, so `<ns.Icon />` cannot be resolved.",
-            "If you need a namespace object, import from a `.ts`/`.js` module instead \u2014 those are real ES modules."
+            "A `.vsk` tag resolves by component name in the global registry, not by module exports, so `import * as ns` + `<ns.Icon />` needs no module object.",
+            nested ? "Re-export with a flat name (`export { Icon }`) or import the component directly." : "Re-export the value under a flat name and import it directly, or keep the value in a .ts module."
           ],
-          tip: "A `.vsk` module exposes its components as named exports; use a named or renamed import rather than `import * as ns`."
+          tip: "`<ns.Icon />` works; only nested paths and value reads need a real module namespace."
         });
       }
       static classDecl(context = {}) {
@@ -37538,9 +37847,9 @@ function getJSXTagName2(el) {
   if (name.type === "JSXNamespacedName") return name.namespace.name + ":" + name.name.name;
   return null;
 }
-function emitJSXText(g2, text, start, end) {
+function emitJSXText(g4, text, start, end) {
   if (text.indexOf("<") === -1 && text.indexOf(">") === -1 && text.indexOf("&") === -1 && text.indexOf("{") === -1 && text.indexOf("}") === -1) {
-    g2.add(text, start, end);
+    g4.add(text, start, end);
     return;
   }
   let out = "";
@@ -37553,7 +37862,7 @@ function emitJSXText(g2, text, start, end) {
     else if (c === "}") out += "&#125;";
     else out += c;
   }
-  g2.add(out, start, end);
+  g4.add(out, start, end);
 }
 function collapseWithMap(value) {
   let out = "";
@@ -37710,31 +38019,31 @@ function stripCallTypeArgs(text) {
   }
   return text;
 }
-function emitTrackDeclStatement(g2, source, stmt, indent4, isLast, opts) {
+function emitTrackDeclStatement(g4, source, stmt, indent4, isLast, opts) {
   const fullText = stripTrailingSemicolons(source.slice(stmt.start, stmt.end).trimEnd());
   const text = fullText + (!fullText.endsWith("}") && !isLast ? ";" : "");
   const decls = stmt.declarations || [];
-  g2.add(indent4);
+  g4.add(indent4);
   let prevEnd = stmt.start;
   for (let di = 0; di < decls.length; di++) {
     const decl = decls[di];
     const id = decl.id;
     const isLazy = id && id.type === "ArrayPattern" && id.lazy === true && decl.init;
     if (!isLazy) {
-      g2.addRaw(source.slice(prevEnd, decl.start));
-      g2.add(source.slice(decl.start, decl.end), decl.start, decl.end);
+      g4.addRaw(source.slice(prevEnd, decl.start));
+      g4.add(source.slice(decl.start, decl.end), decl.start, decl.end);
       prevEnd = decl.end;
       continue;
     }
-    if (di > 0) g2.addRaw(source.slice(prevEnd, decl.start));
+    if (di > 0) g4.addRaw(source.slice(prevEnd, decl.start));
     const ch = text[decl.end - stmt.start] ?? " ";
     const elements = id.elements || [];
     const names = elements.map((el) => el ? el.name : null).filter((n) => typeof n === "string");
     const initText = source.slice(decl.init.start, decl.init.end);
     if (names.length === 0) {
-      g2.add("let _ = ");
-      g2.add(initText, decl.init.start, decl.init.end);
-      if (ch !== ";") g2.addRaw(";");
+      g4.add("let _ = ");
+      g4.add(initText, decl.init.start, decl.init.end);
+      if (ch !== ";") g4.addRaw(";");
       prevEnd = decl.end;
       continue;
     }
@@ -37745,133 +38054,133 @@ function emitTrackDeclStatement(g2, source, stmt, indent4, isLast, opts) {
     const firstRange = [elements[0].start, elements[0].end];
     const dropLastSemi = ch === ";";
     if (opts.typedCells) {
-      const cellName = g2.cellCount === 0 ? "__cell" : `__cell${g2.cellCount}`;
-      g2.cellCount++;
+      const cellName = g4.cellCount === 0 ? "__cell" : `__cell${g4.cellCount}`;
+      g4.cellCount++;
       if (annotation) {
-        g2.add(`const ${cellName}: Tracked<`);
-        g2.add(annotation, annStart, annEnd);
-        g2.add("> = ");
+        g4.add(`const ${cellName}: Tracked<`);
+        g4.add(annotation, annStart, annEnd);
+        g4.add("> = ");
       } else {
-        g2.add(`const ${cellName} = `);
+        g4.add(`const ${cellName} = `);
       }
       const cellInit = annotation ? stripCallTypeArgs(initText) : initText;
-      g2.add(cellInit, decl.init.start, decl.init.end);
-      g2.add(";");
-      g2.add(" let ");
-      g2.add(first, firstRange[0], firstRange[1], REACTIVE_DATA);
+      g4.add(cellInit, decl.init.start, decl.init.end);
+      g4.add(";");
+      g4.add(" let ");
+      g4.add(first, firstRange[0], firstRange[1], REACTIVE_DATA);
       if (annotation) {
-        g2.add(": ");
-        g2.add(annotation, annStart, annEnd);
+        g4.add(": ");
+        g4.add(annotation, annStart, annEnd);
       }
-      g2.add(` = ${cellName}.get();`);
+      g4.add(` = ${cellName}.get();`);
       for (let n = 1; n < names.length; n++) {
-        g2.add(" let ");
-        g2.add(names[n], elements[n].start, elements[n].end, REACTIVE_DATA);
-        g2.add(` = ${cellName};`);
+        g4.add(" let ");
+        g4.add(names[n], elements[n].start, elements[n].end, REACTIVE_DATA);
+        g4.add(` = ${cellName};`);
       }
-      if (dropLastSemi) g2.code = g2.code.slice(0, -1);
+      if (dropLastSemi) g4.code = g4.code.slice(0, -1);
     } else {
       if (annotation) {
-        g2.add("let ");
-        g2.add(first, firstRange[0], firstRange[1], REACTIVE_DATA);
-        g2.add(": ");
-        g2.add(annotation, annStart, annEnd);
-        g2.add(" = (");
-        g2.add(stripCallTypeArgs(initText), decl.init.start, decl.init.end);
-        g2.add(" as unknown as ");
-        g2.add(annotation, annStart, annEnd);
-        g2.add(");");
+        g4.add("let ");
+        g4.add(first, firstRange[0], firstRange[1], REACTIVE_DATA);
+        g4.add(": ");
+        g4.add(annotation, annStart, annEnd);
+        g4.add(" = (");
+        g4.add(stripCallTypeArgs(initText), decl.init.start, decl.init.end);
+        g4.add(" as unknown as ");
+        g4.add(annotation, annStart, annEnd);
+        g4.add(");");
       } else {
-        const cellName = g2.cellCount === 0 ? "__cell" : `__cell${g2.cellCount}`;
-        g2.cellCount++;
-        g2.add(`const ${cellName} = `);
-        g2.add(initText, decl.init.start, decl.init.end);
-        g2.add("; let ");
-        g2.add(first, firstRange[0], firstRange[1], REACTIVE_DATA);
-        g2.add(` = ${cellName}.get();`);
+        const cellName = g4.cellCount === 0 ? "__cell" : `__cell${g4.cellCount}`;
+        g4.cellCount++;
+        g4.add(`const ${cellName} = `);
+        g4.add(initText, decl.init.start, decl.init.end);
+        g4.add("; let ");
+        g4.add(first, firstRange[0], firstRange[1], REACTIVE_DATA);
+        g4.add(` = ${cellName}.get();`);
       }
       for (let n = 1; n < names.length; n++) {
-        g2.add(" let ");
-        g2.add(names[n], elements[n].start, elements[n].end, REACTIVE_DATA);
-        g2.add(": any = ");
-        g2.add(first, firstRange[0], firstRange[1]);
-        g2.add(";");
-        if (n === names.length - 1 && dropLastSemi) g2.code = g2.code.slice(0, -1);
+        g4.add(" let ");
+        g4.add(names[n], elements[n].start, elements[n].end, REACTIVE_DATA);
+        g4.add(": any = ");
+        g4.add(first, firstRange[0], firstRange[1]);
+        g4.add(";");
+        if (n === names.length - 1 && dropLastSemi) g4.code = g4.code.slice(0, -1);
       }
-      if (names.length === 1 && dropLastSemi) g2.code = g2.code.slice(0, -1);
+      if (names.length === 1 && dropLastSemi) g4.code = g4.code.slice(0, -1);
     }
     prevEnd = decl.end;
   }
-  if (!isLast) g2.addRaw(";");
+  if (!isLast) g4.addRaw(";");
 }
-function emitBlock(g2, source, body, indent4, opts) {
+function emitBlock(g4, source, body, indent4, opts) {
   const stmts = body && body.type === "BlockStatement" ? body.body : body ? Array.isArray(body) ? body : [body] : [];
-  g2.addRaw("{\n");
-  emitBody(g2, source, stmts, indent4 + "  ", opts);
-  g2.addRaw("\n");
-  g2.add(indent4);
-  g2.addRaw("}");
+  g4.addRaw("{\n");
+  emitBody(g4, source, stmts, indent4 + "  ", opts);
+  g4.addRaw("\n");
+  g4.add(indent4);
+  g4.addRaw("}");
 }
-function emitJSXAttr(g2, source, attr) {
+function emitJSXAttr(g4, source, attr) {
   if (attr.type === "JSXSpreadAttribute") {
-    g2.add(source.slice(attr.start, attr.end), attr.start, attr.end);
+    g4.add(source.slice(attr.start, attr.end), attr.start, attr.end);
     return;
   }
   const name = attr.name;
-  g2.add(source.slice(name.start, name.end), name.start, name.end);
+  g4.add(source.slice(name.start, name.end), name.start, name.end);
   const v = attr.value;
   if (!v) return;
-  g2.add(source.slice(name.end, v.start), name.end, v.start);
+  g4.add(source.slice(name.end, v.start), name.end, v.start);
   if (v.type === "JSXExpressionContainer") {
-    g2.add(source.slice(v.start, v.expression.start), v.start, v.expression.start);
-    g2.add(source.slice(v.expression.start, v.expression.end), v.expression.start, v.expression.end);
-    g2.add(source.slice(v.expression.end, v.end), v.expression.end, v.end);
+    g4.add(source.slice(v.start, v.expression.start), v.start, v.expression.start);
+    g4.add(source.slice(v.expression.start, v.expression.end), v.expression.start, v.expression.end);
+    g4.add(source.slice(v.expression.end, v.end), v.expression.end, v.end);
   } else {
-    g2.add(source.slice(v.start, v.end), v.start, v.end);
+    g4.add(source.slice(v.start, v.end), v.start, v.end);
   }
 }
-function emitJSXElement(g2, source, el, opts, hoist) {
+function emitJSXElement(g4, source, el, opts, hoist) {
   const op = el.openingElement;
   const name = op.name;
   let prev;
   if (name) {
-    g2.add(source.slice(op.start, name.start), op.start, name.start);
-    g2.add(source.slice(name.start, name.end), name.start, name.end);
+    g4.add(source.slice(op.start, name.start), op.start, name.start);
+    g4.add(source.slice(name.start, name.end), name.start, name.end);
     prev = name.end;
   } else {
     prev = op.start + 1;
   }
   for (const attr of op.attributes ?? []) {
-    g2.add(source.slice(prev, attr.start), prev, attr.start);
-    emitJSXAttr(g2, source, attr);
+    g4.add(source.slice(prev, attr.start), prev, attr.start);
+    emitJSXAttr(g4, source, attr);
     prev = attr.end;
   }
   const tail = source.slice(prev, op.end);
   if (op.selfClosing && !tail.includes("/")) {
     const gt = tail.lastIndexOf(">");
     const head = gt === -1 ? tail : tail.slice(0, gt);
-    if (head) g2.add(head, prev, prev + head.length);
-    g2.addRaw("/>");
+    if (head) g4.add(head, prev, prev + head.length);
+    g4.addRaw("/>");
   } else {
-    g2.add(tail, prev, op.end);
+    g4.add(tail, prev, op.end);
   }
   if (op.selfClosing) return;
-  emitJSXChildren(g2, source, el.children ?? [], opts, hoist);
+  emitJSXChildren(g4, source, el.children ?? [], opts, hoist);
   if (el.closingElement) {
-    g2.add(source.slice(el.closingElement.start, el.closingElement.end), el.closingElement.start, el.closingElement.end);
+    g4.add(source.slice(el.closingElement.start, el.closingElement.end), el.closingElement.start, el.closingElement.end);
   }
 }
-function emitJSXExprBody(g2, source, expr, opts) {
-  if (expr.type === "JSXElement") return emitJSXElement(g2, source, expr, opts);
-  if (expr.type === "JSXFragment") return emitJSXFragment(g2, source, expr, opts);
-  g2.add(source.slice(expr.start, expr.end), expr.start, expr.end);
+function emitJSXExprBody(g4, source, expr, opts) {
+  if (expr.type === "JSXElement") return emitJSXElement(g4, source, expr, opts);
+  if (expr.type === "JSXFragment") return emitJSXFragment(g4, source, expr, opts);
+  g4.add(source.slice(expr.start, expr.end), expr.start, expr.end);
 }
-function emitJSXFragment(g2, source, frag, opts, hoist) {
-  g2.addRaw("<>");
-  emitJSXChildren(g2, source, frag.children ?? [], opts, hoist);
-  g2.addRaw("</>");
+function emitJSXFragment(g4, source, frag, opts, hoist) {
+  g4.addRaw("<>");
+  emitJSXChildren(g4, source, frag.children ?? [], opts, hoist);
+  g4.addRaw("</>");
 }
-function emitForClauseMap(g2, source, child, text, map, clauseStart, bodyEmit, emptyEmit) {
+function emitForClauseMap(g4, source, child, text, map, clauseStart, bodyEmit, emptyEmit) {
   const clauseEnd = findBalancedEnd(text, clauseStart - 1);
   const clause = text.slice(clauseStart, clauseEnd);
   const ofIdx = findTopLevelSep(clause, "of");
@@ -37888,38 +38197,38 @@ function emitForClauseMap(g2, source, child, text, map, clauseStart, bodyEmit, e
   const itemVar = stripDeclKeyword(lhs).trim();
   if (ofIdx !== -1) {
     if (emptyEmit) {
-      g2.addRaw("{ (() => { const _v = ");
-      g2.add(arrExpr, arrStart, arrEnd);
-      g2.addRaw("; return _v.length === 0 ? (");
+      g4.addRaw("{ (() => { const _v = ");
+      g4.add(arrExpr, arrStart, arrEnd);
+      g4.addRaw("; return _v.length === 0 ? (");
       emptyEmit();
-      g2.addRaw(") : _v.map((");
-      g2.addRaw(itemVar);
-      g2.addRaw(": (typeof _v)[number]) => (");
+      g4.addRaw(") : _v.map((");
+      g4.addRaw(itemVar);
+      g4.addRaw(": (typeof _v)[number]) => (");
       bodyEmit();
-      g2.addRaw(")); })() }");
+      g4.addRaw(")); })() }");
     } else {
-      g2.addRaw("{ ");
-      g2.add(arrExpr, arrStart, arrEnd);
-      g2.addRaw(".map((");
-      g2.addRaw(itemVar);
-      g2.addRaw(": (typeof ");
-      g2.add(arrExpr, arrStart, arrEnd);
-      g2.addRaw(")[number]) => (");
+      g4.addRaw("{ ");
+      g4.add(arrExpr, arrStart, arrEnd);
+      g4.addRaw(".map((");
+      g4.addRaw(itemVar);
+      g4.addRaw(": (typeof ");
+      g4.add(arrExpr, arrStart, arrEnd);
+      g4.addRaw(")[number]) => (");
       bodyEmit();
-      g2.addRaw(")) }");
+      g4.addRaw(")) }");
     }
   } else {
-    g2.addRaw("{ Object.keys(");
-    g2.add(arrExpr, arrStart, arrEnd);
-    g2.addRaw(").map((");
-    g2.addRaw(itemVar);
-    g2.addRaw(") => (");
+    g4.addRaw("{ Object.keys(");
+    g4.add(arrExpr, arrStart, arrEnd);
+    g4.addRaw(").map((");
+    g4.addRaw(itemVar);
+    g4.addRaw(") => (");
     bodyEmit();
-    g2.addRaw(")) }");
+    g4.addRaw(")) }");
   }
   return true;
 }
-function emitJSXChildren(g2, source, children, opts, hoist) {
+function emitJSXChildren(g4, source, children, opts, hoist) {
   let i = 0;
   let forPending = false;
   while (i < children.length) {
@@ -37945,46 +38254,46 @@ function emitJSXChildren(g2, source, children, opts, hoist) {
           const emptyContainer = children[i + 3];
           if (emptyTextNode && emptyTextNode.type === "JSXText" && ["#empty", "empty"].includes(emptyTextNode.value.trim()) && emptyContainer && emptyContainer.type === "JSXExpressionContainer" && emptyContainer.expression.type !== "JSXEmptyExpression") {
             consumed = 4;
-            emptyEmit = () => emitJSXExprBody(g2, source, emptyContainer.expression, opts);
+            emptyEmit = () => emitJSXExprBody(g4, source, emptyContainer.expression, opts);
           }
           let matched = false;
           if (nextChild.type === "JSXExpressionContainer") {
             const exprNode = nextChild.expression;
             if (exprNode.type === "JSXEmptyExpression") {
-              g2.add(text, child.start, child.end);
+              g4.add(text, child.start, child.end);
               i++;
               continue;
             }
             matched = emitForClauseMap(
-              g2,
+              g4,
               source,
               child,
               text,
               map,
               clauseStartCollapsed,
-              () => emitJSXExprBody(g2, source, exprNode, opts),
+              () => emitJSXExprBody(g4, source, exprNode, opts),
               emptyEmit
             );
           } else if (nextChild.type === "JSXFragment") {
             matched = emitForClauseMap(
-              g2,
+              g4,
               source,
               child,
               text,
               map,
               clauseStartCollapsed,
-              () => emitJSXFragment(g2, source, nextChild, opts),
+              () => emitJSXFragment(g4, source, nextChild, opts),
               emptyEmit
             );
           } else {
             matched = emitForClauseMap(
-              g2,
+              g4,
               source,
               child,
               text,
               map,
               clauseStartCollapsed,
-              () => emitJSXElement(g2, source, nextChild, opts),
+              () => emitJSXElement(g4, source, nextChild, opts),
               emptyEmit
             );
           }
@@ -38001,184 +38310,184 @@ function emitJSXChildren(g2, source, children, opts, hoist) {
         continue;
       }
       forPending = false;
-      emitJSXText(g2, text, child.start, child.end);
+      emitJSXText(g4, text, child.start, child.end);
       i++;
     } else if (child.type === "JSXExpressionContainer") {
       if (child.expression.type === "JSXEmptyExpression") {
         i++;
         continue;
       }
-      g2.addRaw("{");
-      g2.add(source.slice(child.expression.start, child.expression.end), child.expression.start, child.expression.end);
-      g2.addRaw("}");
+      g4.addRaw("{");
+      g4.add(source.slice(child.expression.start, child.expression.end), child.expression.start, child.expression.end);
+      g4.addRaw("}");
       i++;
     } else if (child.type === "JSXElement") {
       if (getJSXTagName2(child) === "style") {
         const openEnd = child.openingElement?.end ?? child.start;
         const closeStart = child.closingElement?.start ?? child.end;
-        g2.recordStyle(child.start, child.end, source.slice(openEnd, closeStart));
+        g4.recordStyle(child.start, child.end, source.slice(openEnd, closeStart));
         i++;
         continue;
       }
-      emitJSXElement(g2, source, child, opts, hoist);
+      emitJSXElement(g4, source, child, opts, hoist);
       i++;
     } else if (child.type === "JSXFragment") {
-      emitJSXFragment(g2, source, child, opts, hoist);
+      emitJSXFragment(g4, source, child, opts, hoist);
       i++;
     } else if (child.type === "IfStatement" || child.type === "ForOfStatement" || child.type === "ForStatement" || child.type === "ForInStatement" || child.type === "WhileStatement" || child.type === "DoWhileStatement" || child.type === "SwitchStatement" || child.type === "TryStatement" || child.type === "VariableDeclaration" || child.type === "ExpressionStatement") {
       if (hoist && hoist.set.has(child)) {
         i++;
         continue;
       }
-      g2.addRaw("{(() => { ");
-      emitBody(g2, source, [child], "", opts);
-      g2.addRaw(" })()}");
+      g4.addRaw("{(() => { ");
+      emitBody(g4, source, [child], "", opts);
+      g4.addRaw(" })()}");
       i++;
     } else {
       i++;
     }
   }
 }
-function emitIf(g2, source, stmt, indent4, opts) {
-  g2.add(indent4);
-  g2.addRaw("if (");
-  g2.add(source.slice(stmt.test.start, stmt.test.end), stmt.test.start, stmt.test.end);
-  g2.addRaw(") ");
-  emitBlock(g2, source, stmt.consequent, indent4, opts);
+function emitIf(g4, source, stmt, indent4, opts) {
+  g4.add(indent4);
+  g4.addRaw("if (");
+  g4.add(source.slice(stmt.test.start, stmt.test.end), stmt.test.start, stmt.test.end);
+  g4.addRaw(") ");
+  emitBlock(g4, source, stmt.consequent, indent4, opts);
   if (stmt.alternate) {
-    g2.addRaw(" else ");
-    emitBlock(g2, source, stmt.alternate, indent4, opts);
+    g4.addRaw(" else ");
+    emitBlock(g4, source, stmt.alternate, indent4, opts);
   }
 }
-function emitLoopVariable(g2, source, left) {
+function emitLoopVariable(g4, source, left) {
   if (left && left.type === "Identifier") {
-    g2.addRaw("const ");
-    g2.add(source.slice(left.start, left.end), left.start, left.end);
+    g4.addRaw("const ");
+    g4.add(source.slice(left.start, left.end), left.start, left.end);
     return;
   }
-  g2.add(source.slice(left.start, left.end), left.start, left.end);
-}
-function emitForOf(g2, source, stmt, indent4, opts) {
-  g2.add(indent4);
-  g2.addRaw("for (");
-  emitLoopVariable(g2, source, stmt.left);
-  g2.addRaw(" of ");
-  g2.add(source.slice(stmt.right.start, stmt.right.end), stmt.right.start, stmt.right.end);
-  g2.addRaw(") ");
-  emitBlock(g2, source, stmt.body, indent4, opts);
-}
-function emitForIn(g2, source, stmt, indent4, opts) {
-  g2.add(indent4);
-  g2.addRaw("for (");
-  emitLoopVariable(g2, source, stmt.left);
-  g2.addRaw(" in ");
-  g2.add(source.slice(stmt.right.start, stmt.right.end), stmt.right.start, stmt.right.end);
-  g2.addRaw(") ");
-  emitBlock(g2, source, stmt.body, indent4, opts);
-}
-function emitFor(g2, source, stmt, indent4, opts) {
-  g2.add(indent4);
-  g2.addRaw("for (");
-  if (stmt.init) g2.add(source.slice(stmt.init.start, stmt.init.end), stmt.init.start, stmt.init.end);
-  g2.addRaw("; ");
-  if (stmt.test) g2.add(source.slice(stmt.test.start, stmt.test.end), stmt.test.start, stmt.test.end);
-  g2.addRaw("; ");
-  if (stmt.update) g2.add(source.slice(stmt.update.start, stmt.update.end), stmt.update.start, stmt.update.end);
-  g2.addRaw(") ");
-  emitBlock(g2, source, stmt.body, indent4, opts);
-}
-function emitWhile(g2, source, stmt, indent4, opts) {
-  g2.add(indent4);
-  g2.addRaw("while (");
-  g2.add(source.slice(stmt.test.start, stmt.test.end), stmt.test.start, stmt.test.end);
-  g2.addRaw(") ");
-  emitBlock(g2, source, stmt.body, indent4, opts);
-}
-function emitDoWhile(g2, source, stmt, indent4, opts) {
-  g2.add(indent4);
-  g2.addRaw("do ");
-  emitBlock(g2, source, stmt.body, indent4, opts);
-  g2.addRaw(" while (");
-  g2.add(source.slice(stmt.test.start, stmt.test.end), stmt.test.start, stmt.test.end);
-  g2.addRaw(");");
-}
-function emitSwitch(g2, source, stmt, indent4, opts) {
-  g2.add(indent4);
-  g2.addRaw("switch (");
-  g2.add(source.slice(stmt.discriminant.start, stmt.discriminant.end), stmt.discriminant.start, stmt.discriminant.end);
-  g2.addRaw(") {");
+  g4.add(source.slice(left.start, left.end), left.start, left.end);
+}
+function emitForOf(g4, source, stmt, indent4, opts) {
+  g4.add(indent4);
+  g4.addRaw("for (");
+  emitLoopVariable(g4, source, stmt.left);
+  g4.addRaw(" of ");
+  g4.add(source.slice(stmt.right.start, stmt.right.end), stmt.right.start, stmt.right.end);
+  g4.addRaw(") ");
+  emitBlock(g4, source, stmt.body, indent4, opts);
+}
+function emitForIn(g4, source, stmt, indent4, opts) {
+  g4.add(indent4);
+  g4.addRaw("for (");
+  emitLoopVariable(g4, source, stmt.left);
+  g4.addRaw(" in ");
+  g4.add(source.slice(stmt.right.start, stmt.right.end), stmt.right.start, stmt.right.end);
+  g4.addRaw(") ");
+  emitBlock(g4, source, stmt.body, indent4, opts);
+}
+function emitFor(g4, source, stmt, indent4, opts) {
+  g4.add(indent4);
+  g4.addRaw("for (");
+  if (stmt.init) g4.add(source.slice(stmt.init.start, stmt.init.end), stmt.init.start, stmt.init.end);
+  g4.addRaw("; ");
+  if (stmt.test) g4.add(source.slice(stmt.test.start, stmt.test.end), stmt.test.start, stmt.test.end);
+  g4.addRaw("; ");
+  if (stmt.update) g4.add(source.slice(stmt.update.start, stmt.update.end), stmt.update.start, stmt.update.end);
+  g4.addRaw(") ");
+  emitBlock(g4, source, stmt.body, indent4, opts);
+}
+function emitWhile(g4, source, stmt, indent4, opts) {
+  g4.add(indent4);
+  g4.addRaw("while (");
+  g4.add(source.slice(stmt.test.start, stmt.test.end), stmt.test.start, stmt.test.end);
+  g4.addRaw(") ");
+  emitBlock(g4, source, stmt.body, indent4, opts);
+}
+function emitDoWhile(g4, source, stmt, indent4, opts) {
+  g4.add(indent4);
+  g4.addRaw("do ");
+  emitBlock(g4, source, stmt.body, indent4, opts);
+  g4.addRaw(" while (");
+  g4.add(source.slice(stmt.test.start, stmt.test.end), stmt.test.start, stmt.test.end);
+  g4.addRaw(");");
+}
+function emitSwitch(g4, source, stmt, indent4, opts) {
+  g4.add(indent4);
+  g4.addRaw("switch (");
+  g4.add(source.slice(stmt.discriminant.start, stmt.discriminant.end), stmt.discriminant.start, stmt.discriminant.end);
+  g4.addRaw(") {");
   let firstCase = true;
   for (const c of stmt.cases ?? []) {
-    g2.addRaw(firstCase ? "\n" : "\n");
+    g4.addRaw(firstCase ? "\n" : "\n");
     firstCase = false;
-    g2.add(indent4);
-    g2.addRaw("  ");
+    g4.add(indent4);
+    g4.addRaw("  ");
     if (c.test) {
-      g2.addRaw("case ");
-      g2.add(source.slice(c.test.start, c.test.end), c.test.start, c.test.end);
-      g2.addRaw(":");
+      g4.addRaw("case ");
+      g4.add(source.slice(c.test.start, c.test.end), c.test.start, c.test.end);
+      g4.addRaw(":");
     } else {
-      g2.addRaw("default:");
+      g4.addRaw("default:");
     }
-    const before = g2.code.length;
-    emitBody(g2, source, c.consequent, indent4 + "    ", opts);
-    if (g2.code.length > before) g2.addRaw("\n");
+    const before = g4.code.length;
+    emitBody(g4, source, c.consequent, indent4 + "    ", opts);
+    if (g4.code.length > before) g4.addRaw("\n");
   }
-  g2.addRaw("\n");
-  g2.add(indent4);
-  g2.addRaw("}");
+  g4.addRaw("\n");
+  g4.add(indent4);
+  g4.addRaw("}");
 }
-function emitTry(g2, source, stmt, indent4, opts) {
-  g2.add(indent4);
-  g2.addRaw("try ");
-  emitBlock(g2, source, stmt.block, indent4, opts);
+function emitTry(g4, source, stmt, indent4, opts) {
+  g4.add(indent4);
+  g4.addRaw("try ");
+  emitBlock(g4, source, stmt.block, indent4, opts);
   if (stmt.handler) {
-    g2.addRaw(" catch");
+    g4.addRaw(" catch");
     if (stmt.handler.param) {
-      g2.addRaw(" (");
-      g2.add(source.slice(stmt.handler.param.start, stmt.handler.param.end), stmt.handler.param.start, stmt.handler.param.end);
-      g2.addRaw(")");
+      g4.addRaw(" (");
+      g4.add(source.slice(stmt.handler.param.start, stmt.handler.param.end), stmt.handler.param.start, stmt.handler.param.end);
+      g4.addRaw(")");
     }
-    g2.addRaw(" ");
-    emitBlock(g2, source, stmt.handler.body, indent4, opts);
+    g4.addRaw(" ");
+    emitBlock(g4, source, stmt.handler.body, indent4, opts);
   }
   if (stmt.finalizer) {
-    g2.addRaw(" finally ");
-    emitBlock(g2, source, stmt.finalizer, indent4, opts);
+    g4.addRaw(" finally ");
+    emitBlock(g4, source, stmt.finalizer, indent4, opts);
   }
 }
-function emitPlainStatement(g2, source, stmt, indent4, isLast) {
+function emitPlainStatement(g4, source, stmt, indent4, isLast) {
   let text = stripTrailingSemicolons(source.slice(stmt.start, stmt.end).trimEnd());
   if (text === "") return;
-  g2.add(indent4);
-  g2.add(text, stmt.start, stmt.end);
-  if (!text.endsWith("}") && !isLast) g2.addRaw(";");
+  g4.add(indent4);
+  g4.add(text, stmt.start, stmt.end);
+  if (!text.endsWith("}") && !isLast) g4.addRaw(";");
 }
-function emitStatement(g2, source, stmt, indent4, isLast, opts, hoist) {
+function emitStatement(g4, source, stmt, indent4, isLast, opts, hoist) {
   switch (stmt.type) {
     case "JSXElement":
       if (getJSXTagName2(stmt) === "style") {
         const openEnd = stmt.openingElement?.end ?? stmt.start;
         const closeStart = stmt.closingElement?.start ?? stmt.end;
-        g2.recordStyle(stmt.start, stmt.end, source.slice(openEnd, closeStart));
+        g4.recordStyle(stmt.start, stmt.end, source.slice(openEnd, closeStart));
         return;
       }
-      g2.add(indent4);
-      emitJSXElement(g2, source, stmt, opts, hoist);
-      if (!isLast) g2.addRaw(";");
+      g4.add(indent4);
+      emitJSXElement(g4, source, stmt, opts, hoist);
+      if (!isLast) g4.addRaw(";");
       return;
     case "JSXFragment":
-      g2.add(indent4);
-      emitJSXFragment(g2, source, stmt, opts, hoist);
-      if (!isLast) g2.addRaw(";");
+      g4.add(indent4);
+      emitJSXFragment(g4, source, stmt, opts, hoist);
+      if (!isLast) g4.addRaw(";");
       return;
     case "JSXExpressionContainer": {
       if (stmt.expression.type === "JSXEmptyExpression") return;
-      g2.add(indent4);
-      g2.addRaw("{");
-      g2.add(source.slice(stmt.expression.start, stmt.expression.end), stmt.expression.start, stmt.expression.end);
-      g2.addRaw("}");
-      if (!isLast) g2.addRaw(";");
+      g4.add(indent4);
+      g4.addRaw("{");
+      g4.add(source.slice(stmt.expression.start, stmt.expression.end), stmt.expression.start, stmt.expression.end);
+      g4.addRaw("}");
+      if (!isLast) g4.addRaw(";");
       return;
     }
     case "VeskBlock": {
@@ -38186,10 +38495,10 @@ function emitStatement(g2, source, stmt, indent4, isLast, opts, hoist) {
       const innerStmts = stmt.body ?? [];
       let firstLine = true;
       for (let i = 0; i < innerStmts.length; i++) {
-        const before = g2.code.length;
-        emitStatement(g2, source, innerStmts[i], indent4, isLast && i === innerStmts.length - 1, opts, hoist);
-        if (g2.code.length > before) {
-          if (!firstLine) g2.addRaw("\n");
+        const before = g4.code.length;
+        emitStatement(g4, source, innerStmts[i], indent4, isLast && i === innerStmts.length - 1, opts, hoist);
+        if (g4.code.length > before) {
+          if (!firstLine) g4.addRaw("\n");
           firstLine = false;
         }
       }
@@ -38197,38 +38506,38 @@ function emitStatement(g2, source, stmt, indent4, isLast, opts, hoist) {
     }
     case "VariableDeclaration":
       if (isTrackDeclStatement(stmt)) {
-        emitTrackDeclStatement(g2, source, stmt, indent4, isLast, opts);
+        emitTrackDeclStatement(g4, source, stmt, indent4, isLast, opts);
         return;
       }
-      return emitPlainStatement(g2, source, stmt, indent4, isLast);
+      return emitPlainStatement(g4, source, stmt, indent4, isLast);
     case "IfStatement":
-      return emitIf(g2, source, stmt, indent4, opts);
+      return emitIf(g4, source, stmt, indent4, opts);
     case "ForOfStatement":
-      return emitForOf(g2, source, stmt, indent4, opts);
+      return emitForOf(g4, source, stmt, indent4, opts);
     case "ForInStatement":
-      return emitForIn(g2, source, stmt, indent4, opts);
+      return emitForIn(g4, source, stmt, indent4, opts);
     case "ForStatement":
-      return emitFor(g2, source, stmt, indent4, opts);
+      return emitFor(g4, source, stmt, indent4, opts);
     case "WhileStatement":
-      return emitWhile(g2, source, stmt, indent4, opts);
+      return emitWhile(g4, source, stmt, indent4, opts);
     case "DoWhileStatement":
-      return emitDoWhile(g2, source, stmt, indent4, opts);
+      return emitDoWhile(g4, source, stmt, indent4, opts);
     case "SwitchStatement":
-      return emitSwitch(g2, source, stmt, indent4, opts);
+      return emitSwitch(g4, source, stmt, indent4, opts);
     case "TryStatement":
-      return emitTry(g2, source, stmt, indent4, opts);
+      return emitTry(g4, source, stmt, indent4, opts);
     case "LabeledStatement": {
-      g2.add(indent4);
-      g2.add(stmt.label.name, stmt.label.start, stmt.label.end);
-      g2.addRaw(":\n");
-      emitStatement(g2, source, stmt.body, indent4, isLast, opts);
+      g4.add(indent4);
+      g4.add(stmt.label.name, stmt.label.start, stmt.label.end);
+      g4.addRaw(":\n");
+      emitStatement(g4, source, stmt.body, indent4, isLast, opts);
       return;
     }
     default:
-      return emitPlainStatement(g2, source, stmt, indent4, isLast);
+      return emitPlainStatement(g4, source, stmt, indent4, isLast);
   }
 }
-function emitBody(g2, source, stmts, indent4, opts, hoist) {
+function emitBody(g4, source, stmts, indent4, opts, hoist) {
   let firstLine = true;
   let i = 0;
   while (i < stmts.length) {
@@ -38236,34 +38545,34 @@ function emitBody(g2, source, stmts, indent4, opts, hoist) {
     const isLast = i === stmts.length - 1;
     if (stmt.type === "ForOfStatement" && stmts[i + 1] && stmts[i + 1].type === "VeskBlock" && stmts[i + 1].tag === "empty") {
       const empty2 = stmts[i + 1];
-      if (!firstLine) g2.addRaw("\n");
+      if (!firstLine) g4.addRaw("\n");
       firstLine = false;
-      emitForOf(g2, source, stmt, indent4, opts);
+      emitForOf(g4, source, stmt, indent4, opts);
       const inner = empty2.body ?? [];
       if (inner.length > 0) {
-        g2.addRaw("\n");
-        g2.add(indent4);
-        g2.add(source.slice(stmt.right.start, stmt.right.end), stmt.right.start, stmt.right.end);
-        g2.addRaw(".length === 0 && (() => {");
-        g2.addRaw("\n");
-        emitBody(g2, source, inner, indent4 + "  ", opts);
-        g2.addRaw("\n");
-        g2.add(indent4);
-        g2.addRaw("})();");
+        g4.addRaw("\n");
+        g4.add(indent4);
+        g4.add(source.slice(stmt.right.start, stmt.right.end), stmt.right.start, stmt.right.end);
+        g4.addRaw(".length === 0 && (() => {");
+        g4.addRaw("\n");
+        emitBody(g4, source, inner, indent4 + "  ", opts);
+        g4.addRaw("\n");
+        g4.add(indent4);
+        g4.addRaw("})();");
       }
       i += 2;
       continue;
     }
-    const before = g2.code.length;
-    emitStatement(g2, source, stmt, indent4, isLast, opts, hoist);
-    if (g2.code.length > before) {
-      if (!firstLine) g2.addRaw("\n");
+    const before = g4.code.length;
+    emitStatement(g4, source, stmt, indent4, isLast, opts, hoist);
+    if (g4.code.length > before) {
+      if (!firstLine) g4.addRaw("\n");
       firstLine = false;
     }
     i++;
   }
 }
-function emitChunkMapped(g2, source, start, end) {
+function emitChunkMapped(g4, source, start, end) {
   if (end <= start) return;
   let pos = start;
   let i = start;
@@ -38275,8 +38584,8 @@ function emitChunkMapped(g2, source, start, end) {
         if (openEnd !== -1 && openEnd <= end) {
           const closeIdx = source.indexOf("</style>", openEnd);
           if (closeIdx !== -1 && closeIdx + 8 <= end) {
-            g2.add(source.slice(pos, i), pos, i);
-            g2.recordStyle(i, closeIdx + 8, source.slice(openEnd, closeIdx));
+            g4.add(source.slice(pos, i), pos, i);
+            g4.recordStyle(i, closeIdx + 8, source.slice(openEnd, closeIdx));
             pos = closeIdx + 8;
             i = closeIdx + 8;
             continue;
@@ -38286,20 +38595,20 @@ function emitChunkMapped(g2, source, start, end) {
     }
     i++;
   }
-  g2.add(source.slice(pos, end), pos, end);
+  g4.add(source.slice(pos, end), pos, end);
 }
-function emitReturn(g2, source, stmt, opts) {
-  g2.add(source.slice(stmt.start, stmt.start + 6), stmt.start, stmt.start + 6);
+function emitReturn(g4, source, stmt, opts) {
+  g4.add(source.slice(stmt.start, stmt.start + 6), stmt.start, stmt.start + 6);
   const arg = stmt.argument;
   if (!arg) {
-    emitChunkMapped(g2, source, stmt.start + 6, stmt.end);
+    emitChunkMapped(g4, source, stmt.start + 6, stmt.end);
     return;
   }
-  emitChunkMapped(g2, source, stmt.start + 6, arg.start);
-  if (arg.type === "JSXElement") emitJSXElement(g2, source, arg, opts);
-  else if (arg.type === "JSXFragment") emitJSXFragment(g2, source, arg, opts);
-  else emitChunkMapped(g2, source, arg.start, arg.end);
-  emitChunkMapped(g2, source, arg.end, stmt.end);
+  emitChunkMapped(g4, source, stmt.start + 6, arg.start);
+  if (arg.type === "JSXElement") emitJSXElement(g4, source, arg, opts);
+  else if (arg.type === "JSXFragment") emitJSXFragment(g4, source, arg, opts);
+  else emitChunkMapped(g4, source, arg.start, arg.end);
+  emitChunkMapped(g4, source, arg.end, stmt.end);
 }
 function collectHoistEligible(children, set2, list) {
   for (const child of children ?? []) {
@@ -38319,7 +38628,7 @@ function collectHoistEligible(children, set2, list) {
     }
   }
 }
-function emitBodyCore(g2, source, stmts, opts) {
+function emitBodyCore(g4, source, stmts, opts) {
   const hoistSet = /* @__PURE__ */ new Set();
   const byRoot = /* @__PURE__ */ new Map();
   const collectRoot = (root3) => {
@@ -38370,107 +38679,107 @@ function emitBodyCore(g2, source, stmts, opts) {
         byRoot.delete(u.node);
         const n = list.length;
         for (let k = 0; k < n; k++) {
-          const before2 = g2.code.length;
-          emitStatement(g2, source, list[k], "", false, opts, ctx2);
-          if (g2.code.length > before2) g2.addRaw("\n");
+          const before2 = g4.code.length;
+          emitStatement(g4, source, list[k], "", false, opts, ctx2);
+          if (g4.code.length > before2) g4.addRaw("\n");
         }
       }
     }
     if (u.empty !== void 0) {
-      emitForOf(g2, source, u.node, "", opts);
+      emitForOf(g4, source, u.node, "", opts);
       const inner = u.empty.body ?? [];
       if (inner.length > 0) {
-        g2.addRaw("\n");
-        g2.add("");
-        g2.add(
+        g4.addRaw("\n");
+        g4.add("");
+        g4.add(
           source.slice(u.node.right.start, u.node.right.end),
           u.node.right.start,
           u.node.right.end
         );
-        g2.addRaw(".length === 0 && (() => {");
-        g2.addRaw("\n");
-        emitBody(g2, source, inner, "  ", opts);
-        g2.addRaw("\n");
-        g2.add("");
-        g2.addRaw("})();");
+        g4.addRaw(".length === 0 && (() => {");
+        g4.addRaw("\n");
+        emitBody(g4, source, inner, "  ", opts);
+        g4.addRaw("\n");
+        g4.add("");
+        g4.addRaw("})();");
       }
       return;
     }
-    const before = g2.code.length;
-    emitStatement(g2, source, u.node, "", isLast, opts, ctx2);
-    if (g2.code.length > before && !isLast) g2.addRaw("\n");
+    const before = g4.code.length;
+    emitStatement(g4, source, u.node, "", isLast, opts, ctx2);
+    if (g4.code.length > before && !isLast) g4.addRaw("\n");
   };
   for (let i = 0; i < units.length; i++) {
     emitUnit(units[i], i === units.length - 1);
   }
 }
-function emitExpressionBody(g2, source, coreStart, coreEnd, stmts, opts) {
+function emitExpressionBody(g4, source, coreStart, coreEnd, stmts, opts) {
   let pos = coreStart;
   for (const stmt of stmts) {
     if (!stmt) continue;
-    emitChunkMapped(g2, source, pos, stmt.start);
+    emitChunkMapped(g4, source, pos, stmt.start);
     pos = stmt.start;
     if (isTrackDeclStatement(stmt)) {
-      emitTrackDeclStatement(g2, source, stmt, "", true, opts);
+      emitTrackDeclStatement(g4, source, stmt, "", true, opts);
     } else if (stmt.type === "ReturnStatement") {
-      emitReturn(g2, source, stmt, opts);
+      emitReturn(g4, source, stmt, opts);
     } else {
-      emitChunkMapped(g2, source, stmt.start, stmt.end);
+      emitChunkMapped(g4, source, stmt.start, stmt.end);
     }
     pos = stmt.end;
   }
-  emitChunkMapped(g2, source, pos, coreEnd);
+  emitChunkMapped(g4, source, pos, coreEnd);
 }
-function emitRestMapped(g2, text, base, end) {
+function emitRestMapped(g4, text, base, end) {
   let i = 0;
   while (i < text.length && !isIdentStart(text[i])) i++;
   if (i >= text.length) {
-    g2.add(text, base, end);
+    g4.add(text, base, end);
     return;
   }
   let j = i + 1;
   while (j < text.length && isIdentChar(text[j])) j++;
-  g2.add(text.slice(0, i), base, base + i);
-  g2.add(text.slice(i, j), base + i, base + j);
-  g2.add(text.slice(j), base + j, end);
+  g4.add(text.slice(0, i), base, base + i);
+  g4.add(text.slice(i, j), base + i, base + j);
+  g4.add(text.slice(j), base + j, end);
 }
-function emitComponentHeader(g2, source, start, bodyStart) {
+function emitComponentHeader(g4, source, start, bodyStart) {
   const h = source.slice(start, bodyStart);
   const k = findFirstKeyword(h, "component");
   if (k === -1) {
     const { text, end: end2 } = stripTrailingClientRange(h);
     if (!text.includes("(")) {
       const trimmed = text.trimEnd();
-      g2.add(trimmed, start, start + end2 - (text.length - trimmed.length));
-      g2.addRaw("() ");
+      g4.add(trimmed, start, start + end2 - (text.length - trimmed.length));
+      g4.addRaw("() ");
     } else {
-      g2.add(text, start, start + end2);
+      g4.add(text, start, start + end2);
     }
     return;
   }
-  g2.add(h.slice(0, k), start, start + k);
-  g2.add("function", start + k, start + k + "component".length);
+  g4.add(h.slice(0, k), start, start + k);
+  g4.add("function", start + k, start + k + "component".length);
   const restBase = start + k + "component".length;
   const { text: rest, end } = stripTrailingClientRange(h.slice(k + "component".length));
   const transformed = h.slice(0, k) + "function" + rest;
   if (!transformed.includes("(")) {
     const trimmed = rest.trimEnd();
-    emitRestMapped(g2, trimmed, restBase, restBase + end - (rest.length - trimmed.length));
-    g2.addRaw("() ");
+    emitRestMapped(g4, trimmed, restBase, restBase + end - (rest.length - trimmed.length));
+    g4.addRaw("() ");
   } else {
-    emitRestMapped(g2, rest, restBase, restBase + end);
+    emitRestMapped(g4, rest, restBase, restBase + end);
   }
 }
-function emitComponent(g2, source, node, start, opts) {
+function emitComponent(g4, source, node, start, opts) {
   const body = node.body;
   if (!body || body.start == null || body.end == null) return;
-  emitComponentHeader(g2, source, start, body.start);
+  emitComponentHeader(g4, source, start, body.start);
   const statementMode = isStatementMode2(node);
   const stmts = body.body ?? [];
   if (statementMode) {
-    g2.addRaw("{ ");
-    emitBodyCore(g2, source, stmts, opts);
-    g2.addRaw(" }");
+    g4.addRaw("{ ");
+    emitBodyCore(g4, source, stmts, opts);
+    g4.addRaw(" }");
   } else {
     const raw2 = source.slice(body.start, body.end);
     const rawLen = raw2.length;
@@ -38490,9 +38799,9 @@ function emitComponent(g2, source, node, start, opts) {
     }
     while (coreStart < coreEnd && isWhitespaceChar(source[coreStart])) coreStart++;
     while (coreEnd > coreStart && isWhitespaceChar(source[coreEnd - 1])) coreEnd--;
-    if (hasBraces) g2.addRaw("{ ");
-    emitExpressionBody(g2, source, coreStart, coreEnd, stmts, opts);
-    if (hasBraces) g2.addRaw(" }");
+    if (hasBraces) g4.addRaw("{ ");
+    emitExpressionBody(g4, source, coreStart, coreEnd, stmts, opts);
+    if (hasBraces) g4.addRaw(" }");
   }
 }
 function isModuleAst(ast) {
@@ -38522,26 +38831,26 @@ function compileVskCodegen(source, opts = {}) {
     };
   }
   const clean = blankForClauses(source, ast);
-  const g2 = new VskGen();
+  const g4 = new VskGen();
   const components = getComponents(ast).sort((a, b) => a.start - b.start);
   let pos = 0;
   for (const { node, start } of components) {
     const body = node.body;
     if (!body || body.start == null || body.end == null) continue;
-    g2.add(clean.slice(pos, start), pos, start);
-    emitComponent(g2, clean, node, start, opts);
+    g4.add(clean.slice(pos, start), pos, start);
+    emitComponent(g4, clean, node, start, opts);
     pos = body.end;
   }
-  g2.add(clean.slice(pos), pos, source.length);
-  let code = g2.code;
+  g4.add(clean.slice(pos), pos, source.length);
+  let code = g4.code;
   if (isModuleAst(ast) && containsIdentifier(code, "Head") && !isIdentifierImported(code, "Head")) {
-    g2.prepend("declare const Head: (props: { children?: Component }) => Component;\n");
-    code = g2.code;
+    g4.prepend("declare const Head: (props: { children?: Component }) => Component;\n");
+    code = g4.code;
   }
   if (!isModuleAst(ast)) {
     code += "\nexport {};\n";
   }
-  return { code, mappings: g2.mappings, styleRegions: g2.styleRegions, errors: [] };
+  return { code, mappings: g4.mappings, styleRegions: g4.styleRegions, errors: [] };
 }
 function isTypeDecl(stmt) {
   return stmt.type === "TSInterfaceDeclaration" || stmt.type === "TSTypeAliasDeclaration" || stmt.type === "ExportNamedDeclaration" && (stmt.declaration?.type === "TSInterfaceDeclaration" || stmt.declaration?.type === "TSTypeAliasDeclaration");
@@ -40154,7 +40463,7 @@ async function bundleRuntime(appDir, outDir) {
   const runtimeRoot = findRuntimeSrc(appDir);
   const entryFile = resolve3(outDir, "server", `.runtime-entry-${buildId++}.mjs`);
   const entryContent = [
-    `import { renderPage, renderFullPage, renderPageStream, compileFile, setRuntimeModule, setVskHydrate, hydratePrecompile, assertSameOrigin } from ${JSON.stringify(resolve3(compilerRoot, "server-codegen.js"))};`,
+    `import { renderPage, renderFullPage, renderPageStream, compileFile, setRuntimeModule, setVskHydrate, hydratePrecompile, assertSameOrigin, withSsrStore } from ${JSON.stringify(resolve3(compilerRoot, "server-codegen.js"))};`,
     `import { parseCookies } from ${JSON.stringify(resolve3(compilerRoot, "server-cookies.js"))};`,
     `import * as __veskRuntime from ${JSON.stringify(resolve3(runtimeRoot, "index-server.js"))};`,
     "",
@@ -40193,7 +40502,7 @@ async function bundleRuntime(appDir, outDir) {
     "}",
     "",
     "export { renderPage, renderFullPage, renderPageStream, compileFile, setVskHydrate, hydratePrecompile, parseCookies, assertSameOrigin };",
-    'export { withSsrStore } from "@vesk/compiler/src/ssr-store";',
+    "export { withSsrStore };",
     "",
     "// Deliver hydration data as an origin-served script so strict CSP (no unsafe-inline)",
     "// does not block it. The prod server serves /ssr-data.js from the global store.",
@@ -40205,7 +40514,11 @@ async function bundleRuntime(appDir, outDir) {
     "  let tk = '';",
     "  for (const b of bytes) tk += b.toString(16).padStart(2, '0');",
     "  const token = tk;",
-    "  const store = (globalThis.__vsk_ssr_data_store ||= {});",
+    "  // Named __vsk_ssr_payload_store, NOT __vsk_ssr_data_*: the compiler keys",
+    "  // per-request slots `__vsk_ssr_data_<token>` and pruneSsrDataSlots()",
+    "  // reaps that prefix. Sharing it let the reaper wipe every pending",
+    "  // /ssr-data.js payload, so a served page's hydration script 404'd.",
+    "  const store = (globalThis.__vsk_ssr_payload_store ||= {});",
     "  store[token] = payload;",
     "  // Bound the store: if the browser never fetches /ssr-data.js the entry",
     "  // would otherwise linger forever. Evict the oldest entry past 100.",
@@ -40429,6 +40742,7 @@ function precompileFileInternal(source, sourcePath2, seenImportFiles) {
 
 // ../compiler/src/server-codegen.ts
 init_server_render();
+init_ssr_store();
 
 // ../adapter/src/css.ts
 import { readFileSync as readFileSync6, existsSync as existsSync7 } from "node:fs";
@@ -40688,54 +41002,67 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
   let dataCode;
   const exposeErr = "process.env.NODE_ENV !== 'production'";
   const dataNavCleanup = [
-    "  } finally {",
-    "    const __dnToken = globalThis.__vsk_ssr_token;",
-    "    delete globalThis.__vsk_ssr;",
-    "    if (__dnToken) delete globalThis[`__vsk_ssr_data_${__dnToken}`];",
-    "    delete globalThis.__vsk_ssr_token;",
-    "    delete globalThis.__vsk_ssr_data;",
-    "  }"
+    "    } finally {",
+    "      const __dnToken = globalThis.__vsk_ssr_token;",
+    "      delete globalThis.__vsk_ssr;",
+    "      if (__dnToken) delete globalThis[`__vsk_ssr_data_${__dnToken}`];",
+    // NOT `delete globalThis.__vsk_ssr_token`: that global is a
+    // configurable AsyncLocalStorage accessor (ssr-store.ts), so `delete`
+    // removes the property definition and the process silently reverts to a
+    // process-global token — the cross-request data-slot race, for good. The
+    // token dies with the withSsrStore scope wrapped around this block instead.
+    "      delete globalThis.__vsk_ssr_data;",
+    "    }"
+  ];
+  const dataNavWrap = (body) => [
+    "  return withSsrStore(async () => {",
+    ...body.map((l) => l ? "  " + l : l),
+    "  });"
   ];
   if (layoutDecls.length > 0) {
     dataCode = [
       "  if (request.headers.get('x-vesk-data') === '1') {",
-      "    try {",
-      "      let dataPage;",
-      "      try {",
-      "        dataPage = await renderPage('', _pageComp, { params }, __componentRegistry, { hydrate: true, cached: _pageCompiled });",
-      "      } catch (err) {",
-      "        if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
-      "        const message = err && typeof err === 'object' && 'message' in err ? String(err.message) : String(err);",
-      `        return new Response(JSON.stringify({ error: ${exposeErr} ? message : 'Internal Server Error' }), { status: 500, headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' } });`,
-      "      }",
-      "      let _dataHead = dataPage.head || '';",
-      "      for (let _i = _layoutCompList.length - 1; _i >= 0; _i--) {",
-      "        const _dl = await renderPage('', _layoutCompList[_i], { params, children: '' }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[_i] });",
-      "        _dataHead = (_dl.head || '') + _dataHead;",
-      "      }",
-      "      return new Response(JSON.stringify({ path: url.pathname, params, props: dataPage.props || { params }, head: _dataHead }), {",
-      "        headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' },",
-      "      });",
-      ...dataNavCleanup,
+      ...dataNavWrap([
+        "    try {",
+        "      let dataPage;",
+        "      try {",
+        "        dataPage = await renderPage('', _pageComp, { params }, __componentRegistry, { hydrate: true, cached: _pageCompiled });",
+        "      } catch (err) {",
+        "        if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
+        "        const message = err && typeof err === 'object' && 'message' in err ? String(err.message) : String(err);",
+        `        return new Response(JSON.stringify({ error: ${exposeErr} ? message : 'Internal Server Error' }), { status: 500, headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' } });`,
+        "      }",
+        "      let _dataHead = dataPage.head || '';",
+        "      for (let _i = _layoutCompList.length - 1; _i >= 0; _i--) {",
+        "        const _dl = await renderPage('', _layoutCompList[_i], { params, children: '' }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[_i] });",
+        "        _dataHead = (_dl.head || '') + _dataHead;",
+        "      }",
+        "      return new Response(JSON.stringify({ path: url.pathname, params, props: dataPage.props || { params }, head: _dataHead }), {",
+        "        headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' },",
+        "      });",
+        ...dataNavCleanup
+      ]),
       "  }",
       "  return __renderHtml(params, url.href);"
     ].join("\n");
   } else {
     dataCode = [
       "  if (request.headers.get('x-vesk-data') === '1') {",
-      "    try {",
-      "      let dataPage;",
-      "      try {",
-      "        dataPage = await renderPage('', _comp, { params }, __componentRegistry, { hydrate: true, cached: _compiled });",
-      "      } catch (err) {",
-      "        if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
-      "        const message = err && typeof err === 'object' && 'message' in err ? String(err.message) : String(err);",
-      `        return new Response(JSON.stringify({ error: ${exposeErr} ? message : 'Internal Server Error' }), { status: 500, headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' } });`,
-      "      }",
-      "      return new Response(JSON.stringify({ path: url.pathname, params, props: dataPage.props || { params }, head: dataPage.head || '' }), {",
-      "        headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' },",
-      "      });",
-      ...dataNavCleanup,
+      ...dataNavWrap([
+        "    try {",
+        "      let dataPage;",
+        "      try {",
+        "        dataPage = await renderPage('', _comp, { params }, __componentRegistry, { hydrate: true, cached: _compiled });",
+        "      } catch (err) {",
+        "        if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
+        "        const message = err && typeof err === 'object' && 'message' in err ? String(err.message) : String(err);",
+        `        return new Response(JSON.stringify({ error: ${exposeErr} ? message : 'Internal Server Error' }), { status: 500, headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' } });`,
+        "      }",
+        "      return new Response(JSON.stringify({ path: url.pathname, params, props: dataPage.props || { params }, head: dataPage.head || '' }), {",
+        "        headers: { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', Vary: 'x-vesk-data' },",
+        "      });",
+        ...dataNavCleanup
+      ]),
       "  }",
       "  return __renderHtml(params, url.href);"
     ].join("\n");
@@ -41425,6 +41752,7 @@ init_esbuild_fallback();
 init_strip_ts();
 init_parser();
 init_client_codegen();
+init_vsk_collision();
 import { readFileSync as readFileSync11, existsSync as existsSync11, writeFileSync as writeFileSync4, unlinkSync as unlinkSync3, statSync as statSync3, rmSync, mkdtempSync, mkdirSync as mkdirSync3 } from "node:fs";
 import { resolve as resolve10, join as join7, dirname as dirname8, relative as relative2, sep } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
@@ -41697,11 +42025,11 @@ var ChunkImports = class {
     const lines = [];
     const sources = [...this.bySource.keys()].sort();
     for (const src2 of sources) {
-      const g2 = this.bySource.get(src2);
+      const g4 = this.bySource.get(src2);
       const parts = [];
-      if (g2.default) parts.push(`import ${g2.default.local} from ${JSON.stringify(src2)}`);
-      if (g2.namespace) parts.push(`import * as ${g2.namespace.local} from ${JSON.stringify(src2)}`);
-      const named = [...g2.named.values()].sort((a, b) => a.imported < b.imported ? -1 : 1);
+      if (g4.default) parts.push(`import ${g4.default.local} from ${JSON.stringify(src2)}`);
+      if (g4.namespace) parts.push(`import * as ${g4.namespace.local} from ${JSON.stringify(src2)}`);
+      const named = [...g4.named.values()].sort((a, b) => a.imported < b.imported ? -1 : 1);
       if (named.length > 0) {
         const specs = named.map((sp) => sp.imported === sp.local ? sp.local : `${sp.imported} as ${sp.local}`).join(", ");
         parts.push(`import { ${specs} } from ${JSON.stringify(src2)}`);
@@ -41900,7 +42228,8 @@ async function generateClientBundle(routeTree, appDir, componentMap, options) {
     }
     const namesBefore = cache2 ? new Set(runtimeImportNames) : null;
     const importedPaths = resolveVskImports(filePath, (p, n) => compileFile2(p, n, output, imports));
-    const { comp: rawComp, hyd: rawHyd, name: actualName, aliases, reexportPaths } = compileClientBoth(src2, null, filePath);
+    const { comp: rawComp, hyd: rawHyd, name: actualName, aliases, reexportPaths, componentNames } = compileClientBoth(src2, null, filePath);
+    for (const cn of componentNames || []) componentOwners.claim(cn, filePath);
     const compWithImports = rawComp ? stripExports(stripVskImports(stripRuntimeImport(rawComp))) : "";
     const hydWithImports = rawHyd ? stripExports(stripVskImports(stripRuntimeImport(rawHyd))) : "";
     const compSpecs = [];
@@ -41950,6 +42279,7 @@ async function generateClientBundle(routeTree, appDir, componentMap, options) {
   }
   const codeSplit = !!options?.codeSplit;
   const transformPlugins = options?.plugins || [];
+  const componentOwners = new VskComponentOwners();
   async function applyTransformPlugins(code, filePath) {
     if (transformPlugins.length === 0) return code;
     let out = code;
@@ -42088,6 +42418,7 @@ ${entry.code}
     for (const chunk of chunks) {
       transformedChunks.push({ ...chunk, code: await applyTransformPlugins(chunk.code, chunk.name) });
     }
+    componentOwners.report("client bundle");
     return { main: await applyTransformPlugins(main, "client.js"), chunks: transformedChunks, cachedFileHits, compiledFiles, mainFromCache, editedSources, editedNames };
   } else {
     let compileFileMono2 = function(filePath, resolvedName) {
@@ -42095,6 +42426,7 @@ ${entry.code}
       seen.add(filePath);
       const src2 = readFileSync11(filePath, "utf-8");
       resolveVskImports(filePath, (p, n) => compileFileMono2(p, n || ""));
+      for (const cn of vskComponentNames(src2, filePath)) componentOwners.claim(cn, filePath);
       const monoAlloc = nameAllocFor(filePath);
       const compCode = compileClient(src2, null, { forceClient: true, sourcePath: filePath, nameAllocator: monoAlloc });
       const hydCode = compileClient(src2, null, { hydrate: true, forceClient: true, includeTopLevel: false, sourcePath: filePath, nameAllocator: monoAlloc });
@@ -42144,6 +42476,7 @@ ${entry.code}
       aliasLines,
       hydratorAliasLines
     }, !!options?.hmr, !!options?.importRuntime, runtimeImportNames, options?.routeDataCache);
+    componentOwners.report("client bundle");
     return { main: await applyTransformPlugins(main, "client.js"), chunks: [] };
   }
 }
@@ -42743,7 +43076,7 @@ async function startProdServer(outDir, options) {
     }
     if (url.pathname === "/ssr-data.js") {
       const token = url.searchParams.get("t") || "";
-      const store = globalThis.__vsk_ssr_data_store;
+      const store = globalThis.__vsk_ssr_payload_store;
       const payload = store?.[token];
       if (payload) delete store[token];
       const lines = [];
@@ -43558,37 +43891,120 @@ init_server_utils();
 init_server_head();
 init_server_jsgen();
 init_server_render();
+init_ssr_store();
 
 // ../compiler/dist/ssr-store.js
 init_index_server();
 import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
-var storage2 = new AsyncLocalStorage2();
+var TOKEN_KEY2 = "__vsk_ssr_token";
+var IMPL_KEY2 = "__vsk_ssr_store_impl";
+var g3 = globalThis;
+var impl2 = g3[IMPL_KEY2] ?? (g3[IMPL_KEY2] = {
+  storage: new AsyncLocalStorage2(),
+  liveSlots: /* @__PURE__ */ new Map(),
+  // Only the copy that created the implementation installs the token
+  // accessor; a later copy must not redefine it over the shared storage.
+  ownsAccessor: true
+});
+var storage2 = impl2.storage;
+var liveSlots2 = impl2.liveSlots;
+function newSsrToken2() {
+  return Math.random().toString(36).slice(2);
+}
+function createSsrStore3() {
+  return { token: newSsrToken2(), data: {} };
+}
+function isThenable2(value) {
+  return typeof value?.then === "function";
+}
 function withSsrStore2(fn) {
   const existing = storage2.getStore();
   if (existing)
     return fn();
-  return storage2.run({}, fn);
+  const store = createSsrStore3();
+  keepSsrSlot2(store.token);
+  let result;
+  try {
+    result = storage2.run(store, fn);
+  } catch (err) {
+    dropSsrSlot2(store.token);
+    throw err;
+  }
+  if (isThenable2(result)) {
+    return result.then((value) => {
+      dropSsrSlot2(store.token);
+      return value;
+    }, (err) => {
+      dropSsrSlot2(store.token);
+      throw err;
+    });
+  }
+  dropSsrSlot2(store.token);
+  return result;
+}
+function withSsrStoreOf2(store, fn) {
+  return storage2.run(store, fn);
+}
+function resetSsrToken2() {
+  const store = storage2.getStore();
+  const token = newSsrToken2();
+  if (store) {
+    if (store.token)
+      liveSlots2.delete(store.token);
+    store.token = token;
+  }
+  liveSlots2.set(token, 1);
+  return token;
+}
+function keepSsrSlot2(token) {
+  if (!token)
+    return;
+  liveSlots2.set(token, (liveSlots2.get(token) ?? 0) + 1);
+}
+function dropSsrSlot2(token) {
+  if (!token)
+    return;
+  const count = liveSlots2.get(token);
+  if (count === void 0)
+    return;
+  if (count <= 1)
+    liveSlots2.delete(token);
+  else
+    liveSlots2.set(token, count - 1);
 }
 var ssrSink3 = {
   set: (key, value) => {
     const store = storage2.getStore();
     if (store)
-      store[key] = value;
+      store.data[key] = value;
   },
   get: (key) => {
     const store = storage2.getStore();
-    return store ? store[key] : void 0;
+    return store ? store.data[key] : void 0;
   },
-  snapshot: () => ({ ...storage2.getStore() ?? {} }),
+  snapshot: () => ({ ...storage2.getStore()?.data ?? {} }),
   clear: () => {
     const store = storage2.getStore();
     if (store) {
-      for (const key of Object.keys(store))
-        delete store[key];
+      for (const key of Object.keys(store.data))
+        delete store.data[key];
     }
   }
 };
 setSsrSink(ssrSink3);
+if (impl2.ownsAccessor) {
+  Object.defineProperty(globalThis, TOKEN_KEY2, {
+    configurable: true,
+    get() {
+      return storage2.getStore()?.token;
+    },
+    set(value) {
+      const store = storage2.getStore();
+      if (store)
+        store.token = value;
+    }
+  });
+}
 
 // ../compiler/dist/client-codegen.js
 init_ir();
@@ -45890,13 +46306,17 @@ function compileClientBoth2(source, _componentName, sourcePath2, opts) {
   const aliases = vskRegistryAliases(ir.imports, ir.exportAliases);
   const reexportPaths = sourcePath2 ? collectVskReexportPaths(ir.reexportSources, sourcePath2) : [];
   if (opts?.skipHyd)
-    return { comp, hyd: "", name, aliases, reexportPaths };
+    return { comp, hyd: "", name, aliases, reexportPaths, componentNames: ir.components.map((c) => c.name) };
   return {
     comp,
     hyd: emitClientFromIR2(irHyd, { forceClient: true, hydrate: true, includeTopLevel: false, nameAllocator: alloc, markerless: opts?.markerless !== false }),
     name,
     aliases,
-    reexportPaths
+    reexportPaths,
+    // Every component NAME this file registers, not just the resolved one —
+    // the bundle needs the full list to spot same-name declarations across
+    // files (see findVskComponentCollisions).
+    componentNames: ir.components.map((c) => c.name)
   };
 }
 
@@ -47095,6 +47515,7 @@ async function build3(options) {
 init_strip_ts();
 init_parser();
 init_client_codegen();
+init_vsk_collision();
 init_vsk_imports();
 init_md_inline();
 init_module_imports();
@@ -47390,13 +47811,13 @@ var ChunkImports2 = class {
     const lines = [];
     const sources = [...this.bySource.keys()].sort();
     for (const src2 of sources) {
-      const g2 = this.bySource.get(src2);
+      const g4 = this.bySource.get(src2);
       const parts = [];
-      if (g2.default)
-        parts.push(`import ${g2.default.local} from ${JSON.stringify(src2)}`);
-      if (g2.namespace)
-        parts.push(`import * as ${g2.namespace.local} from ${JSON.stringify(src2)}`);
-      const named = [...g2.named.values()].sort((a, b) => a.imported < b.imported ? -1 : 1);
+      if (g4.default)
+        parts.push(`import ${g4.default.local} from ${JSON.stringify(src2)}`);
+      if (g4.namespace)
+        parts.push(`import * as ${g4.namespace.local} from ${JSON.stringify(src2)}`);
+      const named = [...g4.named.values()].sort((a, b) => a.imported < b.imported ? -1 : 1);
       if (named.length > 0) {
         const specs = named.map((sp) => sp.imported === sp.local ? sp.local : `${sp.imported} as ${sp.local}`).join(", ");
         parts.push(`import { ${specs} } from ${JSON.stringify(src2)}`);
@@ -47612,7 +48033,9 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options) {
     }
     const namesBefore = cache2 ? new Set(runtimeImportNames) : null;
     const importedPaths = resolveVskImports(filePath, (p, n) => compileFile2(p, n, output, imports));
-    const { comp: rawComp, hyd: rawHyd, name: actualName, aliases, reexportPaths } = compileClientBoth(src2, null, filePath);
+    const { comp: rawComp, hyd: rawHyd, name: actualName, aliases, reexportPaths, componentNames } = compileClientBoth(src2, null, filePath);
+    for (const cn of componentNames || [])
+      componentOwners.claim(cn, filePath);
     const compWithImports = rawComp ? stripExports(stripVskImports(stripRuntimeImport(rawComp))) : "";
     const hydWithImports = rawHyd ? stripExports(stripVskImports(stripRuntimeImport(rawHyd))) : "";
     const compSpecs = [];
@@ -47666,6 +48089,7 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options) {
   }
   const codeSplit = !!options?.codeSplit;
   const transformPlugins = options?.plugins || [];
+  const componentOwners = new VskComponentOwners();
   async function applyTransformPlugins(code, filePath) {
     if (transformPlugins.length === 0)
       return code;
@@ -47811,6 +48235,7 @@ ${entry.code}
     for (const chunk of chunks) {
       transformedChunks.push({ ...chunk, code: await applyTransformPlugins(chunk.code, chunk.name) });
     }
+    componentOwners.report("client bundle");
     return { main: await applyTransformPlugins(main, "client.js"), chunks: transformedChunks, cachedFileHits, compiledFiles, mainFromCache, editedSources, editedNames };
   } else {
     let compileFileMono2 = function(filePath, resolvedName) {
@@ -47819,6 +48244,8 @@ ${entry.code}
       seen.add(filePath);
       const src2 = readFileSync24(filePath, "utf-8");
       resolveVskImports(filePath, (p, n) => compileFileMono2(p, n || ""));
+      for (const cn of vskComponentNames(src2, filePath))
+        componentOwners.claim(cn, filePath);
       const monoAlloc = nameAllocFor(filePath);
       const compCode = compileClient(src2, null, { forceClient: true, sourcePath: filePath, nameAllocator: monoAlloc });
       const hydCode = compileClient(src2, null, { hydrate: true, forceClient: true, includeTopLevel: false, sourcePath: filePath, nameAllocator: monoAlloc });
@@ -47878,6 +48305,7 @@ ${entry.code}
       aliasLines,
       hydratorAliasLines
     }, !!options?.hmr, !!options?.importRuntime, runtimeImportNames, options?.routeDataCache);
+    componentOwners.report("client bundle");
     return { main: await applyTransformPlugins(main, "client.js"), chunks: [] };
   }
 }
@@ -53833,10 +54261,10 @@ function parseCookies3(str3) {
 // ../runtime/dist/action.js
 var registryKey2 = "__vesk_actions";
 function getActionRegistry2() {
-  const g2 = globalThis;
-  if (!g2[registryKey2])
-    g2[registryKey2] = {};
-  return g2[registryKey2];
+  const g4 = globalThis;
+  if (!g4[registryKey2])
+    g4[registryKey2] = {};
+  return g4[registryKey2];
 }
 function getAction2(id) {
   return getActionRegistry2()[id] || null;
@@ -54412,8 +54840,41 @@ var ROUTE_STRUCTURAL_VSK = /* @__PURE__ */ new Set([
   "offline.vsk",
   "network.vsk"
 ]);
-var HMR_SKIP_DIRS = /* @__PURE__ */ new Set(["node_modules", ".vesk", "tarballs", ".git"]);
-var HMR_SKIP_MARKERS = ["node_modules/", ".vesk/", "tmp-vesk-chunk-"];
+var HMR_SKIP_DIRS = /* @__PURE__ */ new Set([
+  "node_modules",
+  ".vesk",
+  "tarballs",
+  ".git",
+  "dist",
+  "build",
+  "coverage",
+  "out",
+  ".next",
+  ".nuxt",
+  ".output",
+  ".svelte-kit",
+  ".turbo",
+  ".cache",
+  ".vercel",
+  ".netlify"
+]);
+var HMR_SKIP_MARKERS = [
+  "node_modules/",
+  ".vesk/",
+  "tmp-vesk-chunk-",
+  "/dist/",
+  "/build/",
+  "/coverage/",
+  "/out/",
+  "/.next/",
+  "/.nuxt/",
+  "/.output/",
+  "/.svelte-kit/",
+  "/.turbo/",
+  "/.cache/",
+  "/.vercel/",
+  "/.netlify/"
+];
 var HMR_SCRIPT_EXTS = [".mts", ".ts", ".tsx", ".mjs", ".js", ".cjs"];
 var HMR_CONFIG_NAMES = /* @__PURE__ */ new Set([
   "vesk.config.ts",
@@ -54459,9 +54920,9 @@ function storeDataScript(payload) {
   return "/_vesk/ssr-data.js?t=" + token;
 }
 function currentSsrData() {
-  const g2 = globalThis;
-  const token = g2.__vsk_ssr_token;
-  const slot = (token ? g2[`__vsk_ssr_data_${token}`] : void 0) || {};
+  const g4 = globalThis;
+  const token = g4.__vsk_ssr_token;
+  const slot = (token ? g4[`__vsk_ssr_data_${token}`] : void 0) || {};
   return { ...ssrSink3.snapshot() || {}, ...slot };
 }
 function countPages(nodes) {
@@ -54554,9 +55015,9 @@ async function startDevServer(port, projectDir, config, host) {
     }
   }
   function eventsStore() {
-    const g2 = globalThis;
-    if (!g2.__vesk_server_ctx) g2.__vesk_server_ctx = {};
-    return g2.__vesk_server_ctx;
+    const g4 = globalThis;
+    if (!g4.__vesk_server_ctx) g4.__vesk_server_ctx = {};
+    return g4.__vesk_server_ctx;
   }
   function makeEventCtx(overrides) {
     const store = eventsStore();
@@ -54960,6 +55421,7 @@ async function startDevServer(port, projectDir, config, host) {
             const treeChanged = needsRescan && prevTree !== stripAnnots(routeTree);
             const isOutsideApp = !fullPath.startsWith(appDirPath + "/") && fullPath !== appDirPath;
             const fileDeleted = eventType === "rename" && !fileExists;
+            if (isOutsideApp) ssrCompileCache.clear();
             const cssPromise = rebuildTailwindCss();
             let bundleError = null;
             let hotEditedSource = null;
@@ -55104,6 +55566,7 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
           const t0 = Date.now();
           try {
             bcast({ type: "compiling" });
+            ssrCompileCache.clear();
             await fullRebuild();
             LOG.info(`${kind === "config" ? "config" : "script"} changed, full rebuild + reload (${filename}) \u2014 ${Date.now() - t0}ms`);
           } catch (e) {
@@ -55411,11 +55874,11 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
     const forData = req.headers["x-vesk-data"] === "1";
     async function renderSSR() {
       const ssg2 = globalThis;
-      const freshToken = Math.random().toString(36).slice(2);
-      ssg2.__vsk_ssr_token = freshToken;
       ssg2.__vsk_ssr_data = {};
+      let freshToken;
       try {
         return await withSsrStore2(async () => {
+          freshToken = resetSsrToken2();
           const chain = cleanChain;
           let body = "";
           let head = "";
@@ -55490,17 +55953,16 @@ ${prettifyHtml(body)}
           return { html, props: props || { params: matched.params }, head };
         });
       } finally {
-        delete ssg2[`__vsk_ssr_data_${freshToken}`];
-        delete ssg2[`__vsk_ssr_promises_${freshToken}`];
-        delete ssg2[`__vsk_ssr_failures_${freshToken}`];
-        if (ssg2.__vsk_ssr_token === freshToken) delete ssg2.__vsk_ssr_token;
+        const token = freshToken;
+        dropSsrSlot2(token);
+        delete ssg2[`__vsk_ssr_data_${token}`];
+        delete ssg2[`__vsk_ssr_promises_${token}`];
+        delete ssg2[`__vsk_ssr_failures_${token}`];
         delete ssg2.__vsk_ssr_data;
       }
     }
     function renderSSRStream() {
       const sst = globalThis;
-      const streamToken = Math.random().toString(36).slice(2);
-      sst.__vsk_ssr_token = streamToken;
       sst.__vsk_ssr_data = {};
       async function* raw2() {
         const chain = cleanChain;
@@ -55564,18 +56026,22 @@ ${prettifyHtml(body)}
         yield '	<script type="module" src="/_vesk/client.js"></script>\n</body>\n</html>';
       }
       const gen = raw2();
+      const streamStore = createSsrStore3();
       async function* scoped() {
         try {
           let result;
           do {
-            result = await withSsrStore2(() => gen.next());
+            result = await withSsrStoreOf2(streamStore, () => gen.next());
             if (!result.done) yield result.value;
           } while (!result.done);
         } finally {
-          delete sst[`__vsk_ssr_data_${streamToken}`];
-          delete sst[`__vsk_ssr_promises_${streamToken}`];
-          delete sst[`__vsk_ssr_failures_${streamToken}`];
-          if (sst.__vsk_ssr_token === streamToken) delete sst.__vsk_ssr_token;
+          const token = streamStore.token;
+          dropSsrSlot2(token);
+          if (token) {
+            delete sst[`__vsk_ssr_data_${token}`];
+            delete sst[`__vsk_ssr_promises_${token}`];
+            delete sst[`__vsk_ssr_failures_${token}`];
+          }
           delete sst.__vsk_ssr_data;
         }
       }
@@ -55794,7 +56260,6 @@ ${prettifyHtml(body)}
     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)`);
-    LOG.info("hmr enabled \u2014 edit app/ to hot reload");
   });
   updateSourceMapping();
   const hmrClients = /* @__PURE__ */ new Set();