@vesk/vesk-cli 0.2.43 → 0.2.44

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."
           }
         );
       }
@@ -2017,6 +2032,16 @@ function startRequest(handle2, skipCache) {
         if (getInflight().get(key) === prom2) getInflight().delete(key);
       });
     } else {
+      const ownerToken = g().__vsk_ssr_token || void 0;
+      if (ownerToken) {
+        prom2.then(
+          (data2) => {
+            setSsrData(key, data2, ownerToken);
+          },
+          () => {
+          }
+        );
+      }
       attachSettle(handle2, prom2);
     }
     trackSsrPromise(prom2);
@@ -20181,17 +20206,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 +20332,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 +20695,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) {
@@ -30999,15 +31137,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 +31754,148 @@ 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;
+}
+function withSsrStoreOf(store, fn) {
+  return storage.run(store, fn);
+}
+function keepSsrSlot(token) {
+  if (!token) return;
+  liveSlots.set(token, (liveSlots.get(token) ?? 0) + 1);
 }
-var storage, ssrSink2;
+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, storage, liveSlots, ssrSink2;
 var init_ssr_store = __esm({
   "../compiler/src/ssr-store.ts"() {
     "use strict";
     init_index_server();
+    TOKEN_KEY = "__vsk_ssr_token";
     storage = new AsyncLocalStorage();
+    liveSlots = /* @__PURE__ */ new Map();
     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);
+    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 +31919,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 +31933,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 +31950,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 +31979,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 +32028,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 +32045,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 +32084,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,15 +32093,27 @@ 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) => {
+  const prefix = "__vsk_ssr_data_";
+  const stale = [];
+  for (const k of Object.keys(g2)) {
+    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 g2[k];
   });
 }
@@ -31964,6 +32244,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 +32321,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 +32398,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 +32418,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 +32431,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 +32463,7 @@ var init_server_render = __esm({
     init_md_inline();
     init_ssr_store();
     init_module_imports();
+    init_vsk_collision();
   }
 });
 
@@ -37334,19 +37627,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 = {}) {
@@ -40688,54 +40996,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 +41746,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";
@@ -41900,7 +42222,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 +42273,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 +42412,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 +42420,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 +42470,7 @@ ${entry.code}
       aliasLines,
       hydratorAliasLines
     }, !!options?.hmr, !!options?.importRuntime, runtimeImportNames, options?.routeDataCache);
+    componentOwners.report("client bundle");
     return { main: await applyTransformPlugins(main, "client.js"), chunks: [] };
   }
 }
@@ -43562,33 +43889,104 @@ init_server_render();
 // ../compiler/dist/ssr-store.js
 init_index_server();
 import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
+var TOKEN_KEY2 = "__vsk_ssr_token";
 var storage2 = new AsyncLocalStorage2();
+var liveSlots2 = /* @__PURE__ */ new Map();
+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 resetSsrToken() {
+  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);
+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 +46288,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 +47497,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();
@@ -47612,7 +48015,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 +48071,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 +48217,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 +48226,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 +48287,7 @@ ${entry.code}
       aliasLines,
       hydratorAliasLines
     }, !!options?.hmr, !!options?.importRuntime, runtimeImportNames, options?.routeDataCache);
+    componentOwners.report("client bundle");
     return { main: await applyTransformPlugins(main, "client.js"), chunks: [] };
   }
 }
@@ -54412,8 +54822,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",
@@ -54960,6 +55403,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 +55548,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 +55856,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 = resetSsrToken();
           const chain = cleanChain;
           let body = "";
           let head = "";
@@ -55490,17 +55935,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 +56008,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 +56242,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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/vesk-cli",
-  "version": "0.2.43",
+  "version": "0.2.44",
   "type": "module",
   "description": "Vesk — compiler-first framework for the post-VDOM web. vesk dev, vesk build.",
   "bin": {
@@ -8,10 +8,10 @@
   },
   "main": "./dist/cli.js",
   "dependencies": {
-    "@vesk/adapter": "^0.2.43",
-    "@vesk/compiler": "^0.2.43",
-    "@vesk/plugin-tailwind": "^0.2.43",
-    "@vesk/runtime": "^0.2.43",
+    "@vesk/adapter": "^0.2.44",
+    "@vesk/compiler": "^0.2.44",
+    "@vesk/plugin-tailwind": "^0.2.44",
+    "@vesk/runtime": "^0.2.44",
     "esrap": "^2.3.0",
     "typescript": "^5.8.0",
     "ws": "^8.18.0",