@vesk/vesk-cli 0.2.42 → 0.2.44

package/dist/cli.js

@@ -184,6 +184,39 @@ var init_errors = __esm({
           tip: isBuiltin ? `"${name}" is a Vesk built-in. Use it directly \u2014 no manual import needed.` : ""
         });
       }
+      /**
+       * 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: 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` 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: "`<ns.Icon />` works; only nested paths and value reads need a real module namespace."
+          }
+        );
+      }
       static classDecl(context = {}) {
         return new _VeskError(
           "class declarations are not supported inside Vesk components.",
@@ -367,13 +400,30 @@ var init_ir = __esm({
       staticProps;
       loadFn;
       topLevelCode;
-      constructor(components, imports = [], importedNames = /* @__PURE__ */ new Set(), staticProps = null, loadFn = null, topLevelCode = []) {
+      /**
+       * Same-file specifier exports (`export { A }`, `export { A as B }`) as
+       * `{ local, exported }` pairs. These are NOT emitted as JS: components live
+       * in the component registry rather than as top-level bindings, so a raw
+       * `export { A }` would reference an undefined identifier. The pairs become
+       * registry alias entries so the exported name is importable.
+       */
+      exportAliases;
+      /**
+       * Module specifiers re-exported from this file (`export * from './x.vsk'`,
+       * `export { A } from './x.vsk'`, `export * as ns from './x.vsk'`). The
+       * statements themselves are dropped — the target file is compiled and
+       * merged into this one's component registry instead.
+       */
+      reexportSources;
+      constructor(components, imports = [], importedNames = /* @__PURE__ */ new Set(), staticProps = null, loadFn = null, topLevelCode = [], exportAliases = [], reexportSources = []) {
         this.components = components;
         this.imports = imports;
         this.importedNames = importedNames;
         this.staticProps = staticProps;
         this.loadFn = loadFn;
         this.topLevelCode = topLevelCode;
+        this.exportAliases = exportAliases;
+        this.reexportSources = reexportSources;
       }
     };
     ComponentIR = class {
@@ -1982,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);
@@ -3440,10 +3500,10 @@ function flattenLayoutChain(tree, pathParts, result = []) {
     if (matched) {
       const consumeCount = node.isCatchAll ? pathParts.length : segCount;
       const remaining = pathParts.slice(consumeCount);
-      const isLeaf = remaining.length === 0 || remaining.every((p) => p === "");
+      const isLeaf2 = remaining.length === 0 || remaining.every((p) => p === "");
       if (node.standalone) result.length = 0;
       result.push(node);
-      if (isLeaf) {
+      if (isLeaf2) {
         break;
       } else if ((node.children || []).length > 0) {
         flattenLayoutChain(node.children || [], remaining, result);
@@ -16853,9 +16913,9 @@ function looksLikeTypeAssertionAt(input, pos) {
   while (i < input.length && isIdentCharCode(input.charCodeAt(i))) i++;
   const name = input.slice(nameStart, i);
   if (HTML_TAGS.has(name) || VOID_ELEMENTS.has(name)) return false;
-  const isPrimitive = TS_PRIMITIVE_TYPES.has(name);
+  const isPrimitive2 = TS_PRIMITIVE_TYPES.has(name);
   const isCapitalized = name[0] >= "A" && name[0] <= "Z";
-  if (!isPrimitive && !isCapitalized) return false;
+  if (!isPrimitive2 && !isCapitalized) return false;
   if (input.charCodeAt(i) === 60) {
     let depth = 0;
     let j = i;
@@ -16904,6 +16964,15 @@ function matchKeywordSequence(input, words) {
   const c = input.charCodeAt(p);
   return isWsChar(c) || c === 123;
 }
+function withStandaloneTokens(fn) {
+  const prev = standaloneTokens;
+  standaloneTokens = true;
+  try {
+    return fn();
+  } finally {
+    standaloneTokens = prev;
+  }
+}
 function VeskParserPlugin(config = {}) {
   return (Parser3) => {
     const tt = Parser3.tokTypes || types$1;
@@ -16919,6 +16988,10 @@ function VeskParserPlugin(config = {}) {
       constructor(options, input) {
         super(options, input);
       }
+      /** True when JSX tags are recognised without parser-driven componentDepth. */
+      #jsxAllowed() {
+        return this.#componentDepth > 0 || standaloneTokens;
+      }
       #isBlockContext() {
         const ctx2 = this.curContext();
         return ctx2 && (ctx2.token === "{" || ctx2.token === "function");
@@ -17148,7 +17221,7 @@ function VeskParserPlugin(config = {}) {
           }
           return super.readToken(this.input.codePointAt(this.pos));
         }
-        if (this.#componentDepth > 0 && code === 60 && this.#isBlockContext()) {
+        if (this.#jsxAllowed() && code === 60 && this.#isBlockContext()) {
           const next = this.input.charCodeAt(this.pos + 1);
           const startsNewStatement = this.hasPrecedingLineBreak();
           const inType = this.inType;
@@ -17599,7 +17672,7 @@ function VeskParserPlugin(config = {}) {
     return VeskParser;
   };
 }
-var VOID_ELEMENTS, TS_PRIMITIVE_TYPES, HTML_TAGS;
+var VOID_ELEMENTS, TS_PRIMITIVE_TYPES, HTML_TAGS, standaloneTokens;
 var init_vesk_plugin = __esm({
   "../compiler/src/vesk-plugin.ts"() {
     "use strict";
@@ -17622,6 +17695,7 @@ var init_vesk_plugin = __esm({
     ]);
     TS_PRIMITIVE_TYPES = /* @__PURE__ */ new Set(["number", "string", "boolean", "any", "unknown", "never", "void", "object", "symbol", "bigint", "undefined", "null"]);
     HTML_TAGS = /* @__PURE__ */ new Set(["a", "abbr", "address", "area", "article", "aside", "audio", "b", "base", "bdi", "bdo", "blockquote", "body", "br", "button", "canvas", "caption", "cite", "code", "col", "colgroup", "data", "datalist", "dd", "del", "details", "dfn", "dialog", "div", "dl", "dt", "em", "embed", "fieldset", "figcaption", "figure", "footer", "form", "h1", "h2", "h3", "h4", "h5", "h6", "head", "header", "hgroup", "hr", "html", "i", "iframe", "img", "input", "ins", "kbd", "label", "legend", "li", "link", "main", "map", "mark", "menu", "meta", "meter", "nav", "noscript", "object", "ol", "optgroup", "option", "output", "p", "picture", "pre", "progress", "q", "rp", "rt", "ruby", "s", "samp", "script", "section", "select", "slot", "small", "source", "span", "strong", "style", "sub", "summary", "sup", "table", "tbody", "td", "template", "textarea", "tfoot", "th", "thead", "time", "title", "tr", "track", "u", "ul", "var", "video", "wbr"]);
+    standaloneTokens = false;
   }
 });
 
@@ -17993,6 +18067,340 @@ var init_scan = __esm({
   }
 });
 
+// ../compiler/src/tokens.ts
+function tokenizeCode(code) {
+  return withStandaloneTokens(() => {
+    try {
+      const ParserClass = createBaseParser();
+      const tok = ParserClass.tokenizer(code, {
+        ecmaVersion: "latest",
+        sourceType: "module"
+      });
+      const out = [];
+      let t;
+      while ((t = tok.getToken()) && t.type && t.type.label !== "eof") {
+        out.push({
+          label: t.type.label,
+          value: typeof t.value === "string" ? t.value : "",
+          start: t.start,
+          end: t.end
+        });
+      }
+      return out;
+    } catch {
+      return null;
+    }
+  });
+}
+function containsIdentifier(code, name) {
+  const tokens = tokenizeCode(code);
+  if (tokens !== null) {
+    for (const t of tokens) {
+      if ((t.label === "name" || t.label === "jsxName") && t.value === name) return true;
+    }
+    return false;
+  }
+  return manualContainsIdentifier(code, name);
+}
+function isIdentifierImported(code, name) {
+  const tokens = tokenizeCode(code);
+  if (tokens !== null) {
+    for (let i = 0; i < tokens.length; i++) {
+      if (tokens[i].label !== "import") continue;
+      let j = i + 1;
+      while (j < tokens.length && tokens[j].label !== ";" && !(tokens[j].label === "name" && tokens[j].value === "from")) {
+        j++;
+      }
+      for (let k = i + 1; k < j; k++) {
+        if ((tokens[k].label === "name" || tokens[k].label === "jsxName") && tokens[k].value === name) return true;
+      }
+      i = j;
+    }
+    return false;
+  }
+  return manualIsIdentifierImported(code, name);
+}
+function extractImportNames(importText) {
+  const tokens = tokenizeCode(importText);
+  if (tokens !== null) {
+    const names = [];
+    let i = 0;
+    while (i < tokens.length && tokens[i].label !== "import") i++;
+    if (i >= tokens.length) return names;
+    i++;
+    if (i < tokens.length && tokens[i].label === "name" && tokens[i].value === "type") i++;
+    if (i < tokens.length && tokens[i].label === "{") {
+      i++;
+      while (i < tokens.length && tokens[i].label !== "}") {
+        const t = tokens[i];
+        if (t.label === "name") {
+          if (t.value === "type" || t.value === "typeof") {
+            i++;
+            continue;
+          }
+          let name = t.value;
+          if (i + 2 < tokens.length && tokens[i + 1].label === "name" && tokens[i + 1].value === "as" && tokens[i + 2].label === "name") {
+            name = tokens[i + 2].value;
+            i += 2;
+          }
+          names.push(name);
+        }
+        i++;
+      }
+      return names;
+    }
+    if (i < tokens.length && tokens[i].label === "*") {
+      while (i < tokens.length && tokens[i].label !== "name") i++;
+      if (i < tokens.length) names.push(tokens[i].value);
+    } else if (i < tokens.length && tokens[i].label === "name") {
+      names.push(tokens[i].value);
+    }
+    return names;
+  }
+  return manualExtractImportNames(importText);
+}
+function importModuleTarget(importText) {
+  const tokens = tokenizeCode(importText);
+  if (tokens === null) return null;
+  for (let i = tokens.length - 1; i >= 0; i--) {
+    if (tokens[i].label === "string") return tokens[i].value;
+  }
+  return null;
+}
+function manualContainsIdentifier(code, name) {
+  let i = 0;
+  while (i < code.length) {
+    const c = code[i];
+    if (c === '"' || c === "'" || c === "`") {
+      i = skipString(code, i);
+      continue;
+    }
+    if (c === "/" && (code[i + 1] === "/" || code[i + 1] === "*")) {
+      i = skipComment(code, i);
+      continue;
+    }
+    if (isIdentStart(c) && code.slice(i, i + name.length) === name) {
+      const after = i + name.length;
+      if ((after >= code.length || !isIdentChar(code[after])) && (i === 0 || !isIdentChar(code[i - 1]))) return true;
+    }
+    i++;
+  }
+  return false;
+}
+function manualIsIdentifierImported(code, name) {
+  let i = 0;
+  while (i < code.length) {
+    const c = code[i];
+    if (c === '"' || c === "'" || c === "`") {
+      i = skipString(code, i);
+      continue;
+    }
+    if (c === "/" && (code[i + 1] === "/" || code[i + 1] === "*")) {
+      i = skipComment(code, i);
+      continue;
+    }
+    if (isIdentStart(c)) {
+      let j = i + 1;
+      while (j < code.length && isIdentChar(code[j])) j++;
+      const word = code.slice(i, j);
+      if (word === "import") {
+        let k = j;
+        while (k < code.length) {
+          if (code[k] === ";" || code[k] === "\n") break;
+          if (code[k] === '"' || code[k] === "'" || code[k] === "`") {
+            k = skipString(code, k);
+            continue;
+          }
+          if (isIdentStart(code[k]) && code.slice(k, k + name.length) === name) {
+            const a = k + name.length;
+            if ((a >= code.length || !isIdentChar(code[a])) && (k === 0 || !isIdentChar(code[k - 1]))) return true;
+          }
+          k++;
+        }
+      }
+      i = j;
+      continue;
+    }
+    i++;
+  }
+  return false;
+}
+function manualExtractImportNames(importText) {
+  const names = [];
+  const open = importText.indexOf("{");
+  if (open !== -1) {
+    const close = importText.indexOf("}", open + 1);
+    if (close !== -1) {
+      let i2 = open + 1;
+      while (i2 < close) {
+        const c = importText[i2];
+        if (c === '"' || c === "'" || c === "`") {
+          i2 = skipString(importText, i2);
+          continue;
+        }
+        if (isIdentStart(c)) {
+          let j = i2 + 1;
+          while (j < close && isIdentChar(importText[j])) j++;
+          let word = importText.slice(i2, j);
+          if (word === "type" || word === "typeof") {
+            i2 = j;
+            continue;
+          }
+          let k = skipWhitespace(importText, j);
+          if (importText.slice(k, k + 2) === "as" && !isIdentChar(importText[k + 2])) {
+            let m = skipWhitespace(importText, k + 2);
+            if (isIdentStart(importText[m])) {
+              let n = m + 1;
+              while (n < close && isIdentChar(importText[n])) n++;
+              word = importText.slice(m, n);
+            }
+          }
+          names.push(word);
+          i2 = j;
+          continue;
+        }
+        i2++;
+      }
+      return names;
+    }
+  }
+  let i = 0;
+  while (i < importText.length && !isIdentStart(importText[i])) i++;
+  while (i < importText.length && isIdentChar(importText[i])) i++;
+  i = skipWhitespace(importText, i);
+  if (importText[i] === "*") {
+    i = skipWhitespace(importText, i + 1);
+    if (importText.slice(i, i + 2) === "as") i = skipWhitespace(importText, i + 2);
+    if (isIdentStart(importText[i])) {
+      let j = i + 1;
+      while (j < importText.length && isIdentChar(importText[j])) j++;
+      names.push(importText.slice(i, j));
+    }
+  } else if (isIdentStart(importText[i])) {
+    let j = i + 1;
+    while (j < importText.length && isIdentChar(importText[j])) j++;
+    names.push(importText.slice(i, j));
+  }
+  return names;
+}
+function hasTopLevelValueDeclaration(code, name) {
+  const tokens = tokenizeCode(code);
+  if (tokens === null) return false;
+  const declWords = ["const", "let", "var", "function", "class"];
+  for (let i = 1; i < tokens.length; i++) {
+    if (tokens[i].label !== "name" || tokens[i].value !== name) continue;
+    const prev = tokens[i - 1];
+    if (!prev || !declWords.includes(prev.value)) continue;
+    if (i >= 2) {
+      const pp2 = tokens[i - 2];
+      if (pp2 && pp2.label === "name" && pp2.value === "export") continue;
+    }
+    return true;
+  }
+  return false;
+}
+function findSpecifierExports(code) {
+  const tokens = tokenizeCode(code);
+  if (tokens === null) return [];
+  const out = [];
+  for (let i = 0; i < tokens.length; i++) {
+    if (tokens[i].label !== "export") continue;
+    if (!tokens[i + 1] || tokens[i + 1].label !== "{") continue;
+    let k = i + 2;
+    let depth = 1;
+    for (; k < tokens.length; k++) {
+      const lbl = tokens[k].label;
+      if (lbl === "string") {
+        continue;
+      }
+      if (lbl === "{") depth++;
+      else if (lbl === "}") {
+        depth--;
+        if (depth === 0) break;
+      }
+    }
+    let isReexport = false;
+    for (let j = k + 1; j < tokens.length; j++) {
+      const lbl = tokens[j].label;
+      if (lbl === "string") {
+        isReexport = true;
+        break;
+      }
+      if (lbl === ";" || lbl === "export" || lbl === "import" || lbl === "}") break;
+    }
+    if (depth !== 0 || isReexport) continue;
+    const pairs = readSpecifierPairs(code, tokens[i + 1].end, tokens[k].end);
+    if (pairs === null) continue;
+    const stmtEnd = tokens[k].end;
+    for (const [local, exported] of pairs) out.push({ local, exported, start: tokens[i].start, end: stmtEnd });
+    i = k;
+  }
+  return out;
+}
+function readSpecifierPairs(code, from, to) {
+  const tokens = tokenizeCode(`(${code.slice(from, to)})`);
+  if (tokens === null || tokens.length < 2) return null;
+  const pairs = [];
+  let i = 1;
+  while (i < tokens.length) {
+    const local = tokens[i];
+    if (!local || local.label === ")" || local.label === ";") break;
+    if (local.label !== "name") return null;
+    const asTok = tokens[i + 1];
+    if (asTok && asTok.label === "name" && asTok.value === "as") {
+      const exported = tokens[i + 2];
+      if (!exported || exported.label !== "name") return null;
+      pairs.push([local.value, exported.value]);
+      i += 3;
+    } else {
+      pairs.push([local.value, local.value]);
+      i += 1;
+    }
+    const sep8 = tokens[i];
+    if (!sep8 || sep8.label !== ",") break;
+    i += 1;
+  }
+  return pairs.length > 0 ? pairs : null;
+}
+function collectTrackDeclMarkers(node, out) {
+  if (!node || typeof node !== "object") return;
+  if (Array.isArray(node)) {
+    for (const child of node) collectTrackDeclMarkers(child, out);
+    return;
+  }
+  if (node.type === "ArrayPattern" && node.lazy === true && typeof node.start === "number") {
+    out.add(node.start - 1);
+    return;
+  }
+  for (const key of Object.keys(node)) {
+    const value = node[key];
+    if (value && typeof value === "object") collectTrackDeclMarkers(value, out);
+  }
+}
+function stripTrackDeclMarkers(text, base, node) {
+  const offsets = /* @__PURE__ */ new Set();
+  collectTrackDeclMarkers(node, offsets);
+  if (offsets.size === 0) return text;
+  const sorted = [...offsets].sort((a, b) => a - b);
+  let out = "";
+  let prev = 0;
+  for (const offset2 of sorted) {
+    const i = offset2 - base;
+    if (i < prev || i >= text.length) continue;
+    out += text.slice(prev, i) + " ";
+    prev = i + 1;
+  }
+  return out + text.slice(prev);
+}
+var init_tokens = __esm({
+  "../compiler/src/tokens.ts"() {
+    "use strict";
+    init_parser();
+    init_vesk_plugin();
+    init_scan();
+  }
+});
+
 // ../compiler/src/parser.ts
 function isIdentChar2(code) {
   return code >= 97 && code <= 122 || code >= 65 && code <= 90 || code >= 48 && code <= 57 || code === 95 || code === 36;
@@ -18213,8 +18621,19 @@ function createBaseParser() {
 function parse4(source, options = {}) {
   const ParserClass = createBaseParser();
   const { code, annotations } = preprocessForClauses(blankComments(source));
+  const vskSource = !options.filename || String(options.filename).endsWith(".vsk");
+  const specifierExports = vskSource ? findSpecifierExports(code).filter((e) => !hasTopLevelValueDeclaration(code, e.local)) : [];
+  let parseable = code;
+  if (specifierExports.length > 0) {
+    const edits = specifierExports.map((e) => code.slice(e.start, e.end)).map((text) => text.split("").map((ch) => ch === "\n" ? "\n" : " ").join(""));
+    let cut = 0;
+    for (const spec of specifierExports) {
+      const blanked = edits[cut++];
+      parseable = parseable.slice(0, spec.start) + blanked + parseable.slice(spec.end);
+    }
+  }
   try {
-    const ast = ParserClass.parse(code, {
+    const ast = ParserClass.parse(parseable, {
       ecmaVersion: "latest",
       sourceType: "module",
       locations: true,
@@ -18224,6 +18643,11 @@ function parse4(source, options = {}) {
     if (annotations.length > 0) {
       ast.__vskAnnotations = annotations;
     }
+    if (specifierExports.length > 0) {
+      ast.__vskSpecifierExports = specifierExports.map(
+        (e) => ({ local: e.local, exported: e.exported })
+      );
+    }
     return ast;
   } catch (e) {
     const err = e;
@@ -18264,6 +18688,7 @@ var init_parser = __esm({
     init_vesk_plugin();
     init_scan();
     init_errors();
+    init_tokens();
   }
 });
 
@@ -18458,228 +18883,6 @@ var init_strip_ts = __esm({
   }
 });
 
-// ../compiler/src/tokens.ts
-function tokenizeCode(code) {
-  try {
-    const ParserClass = createBaseParser();
-    const tok = ParserClass.tokenizer(code, {
-      ecmaVersion: "latest",
-      sourceType: "module"
-    });
-    const out = [];
-    let t;
-    while ((t = tok.getToken()) && t.type && t.type.label !== "eof") {
-      out.push({
-        label: t.type.label,
-        value: typeof t.value === "string" ? t.value : "",
-        start: t.start,
-        end: t.end
-      });
-    }
-    return out;
-  } catch {
-    return null;
-  }
-}
-function containsIdentifier(code, name) {
-  const tokens = tokenizeCode(code);
-  if (tokens !== null) {
-    for (const t of tokens) {
-      if ((t.label === "name" || t.label === "jsxName") && t.value === name) return true;
-    }
-    return false;
-  }
-  return manualContainsIdentifier(code, name);
-}
-function isIdentifierImported(code, name) {
-  const tokens = tokenizeCode(code);
-  if (tokens !== null) {
-    for (let i = 0; i < tokens.length; i++) {
-      if (tokens[i].label !== "import") continue;
-      let j = i + 1;
-      while (j < tokens.length && tokens[j].label !== ";" && !(tokens[j].label === "name" && tokens[j].value === "from")) {
-        j++;
-      }
-      for (let k = i + 1; k < j; k++) {
-        if ((tokens[k].label === "name" || tokens[k].label === "jsxName") && tokens[k].value === name) return true;
-      }
-      i = j;
-    }
-    return false;
-  }
-  return manualIsIdentifierImported(code, name);
-}
-function extractImportNames(importText) {
-  const tokens = tokenizeCode(importText);
-  if (tokens !== null) {
-    const names = [];
-    let i = 0;
-    while (i < tokens.length && tokens[i].label !== "import") i++;
-    if (i >= tokens.length) return names;
-    i++;
-    if (i < tokens.length && tokens[i].label === "name" && tokens[i].value === "type") i++;
-    if (i < tokens.length && tokens[i].label === "{") {
-      i++;
-      while (i < tokens.length && tokens[i].label !== "}") {
-        const t = tokens[i];
-        if (t.label === "name") {
-          if (t.value === "type" || t.value === "typeof") {
-            i++;
-            continue;
-          }
-          let name = t.value;
-          if (i + 2 < tokens.length && tokens[i + 1].label === "name" && tokens[i + 1].value === "as" && tokens[i + 2].label === "name") {
-            name = tokens[i + 2].value;
-            i += 2;
-          }
-          names.push(name);
-        }
-        i++;
-      }
-      return names;
-    }
-    if (i < tokens.length && tokens[i].label === "*") {
-      while (i < tokens.length && tokens[i].label !== "name") i++;
-      if (i < tokens.length) names.push(tokens[i].value);
-    } else if (i < tokens.length && tokens[i].label === "name") {
-      names.push(tokens[i].value);
-    }
-    return names;
-  }
-  return manualExtractImportNames(importText);
-}
-function importModuleTarget(importText) {
-  const tokens = tokenizeCode(importText);
-  if (tokens === null) return null;
-  for (let i = tokens.length - 1; i >= 0; i--) {
-    if (tokens[i].label === "string") return tokens[i].value;
-  }
-  return null;
-}
-function manualContainsIdentifier(code, name) {
-  let i = 0;
-  while (i < code.length) {
-    const c = code[i];
-    if (c === '"' || c === "'" || c === "`") {
-      i = skipString(code, i);
-      continue;
-    }
-    if (c === "/" && (code[i + 1] === "/" || code[i + 1] === "*")) {
-      i = skipComment(code, i);
-      continue;
-    }
-    if (isIdentStart(c) && code.slice(i, i + name.length) === name) {
-      const after = i + name.length;
-      if ((after >= code.length || !isIdentChar(code[after])) && (i === 0 || !isIdentChar(code[i - 1]))) return true;
-    }
-    i++;
-  }
-  return false;
-}
-function manualIsIdentifierImported(code, name) {
-  let i = 0;
-  while (i < code.length) {
-    const c = code[i];
-    if (c === '"' || c === "'" || c === "`") {
-      i = skipString(code, i);
-      continue;
-    }
-    if (c === "/" && (code[i + 1] === "/" || code[i + 1] === "*")) {
-      i = skipComment(code, i);
-      continue;
-    }
-    if (isIdentStart(c)) {
-      let j = i + 1;
-      while (j < code.length && isIdentChar(code[j])) j++;
-      const word = code.slice(i, j);
-      if (word === "import") {
-        let k = j;
-        while (k < code.length) {
-          if (code[k] === ";" || code[k] === "\n") break;
-          if (code[k] === '"' || code[k] === "'" || code[k] === "`") {
-            k = skipString(code, k);
-            continue;
-          }
-          if (isIdentStart(code[k]) && code.slice(k, k + name.length) === name) {
-            const a = k + name.length;
-            if ((a >= code.length || !isIdentChar(code[a])) && (k === 0 || !isIdentChar(code[k - 1]))) return true;
-          }
-          k++;
-        }
-      }
-      i = j;
-      continue;
-    }
-    i++;
-  }
-  return false;
-}
-function manualExtractImportNames(importText) {
-  const names = [];
-  const open = importText.indexOf("{");
-  if (open !== -1) {
-    const close = importText.indexOf("}", open + 1);
-    if (close !== -1) {
-      let i2 = open + 1;
-      while (i2 < close) {
-        const c = importText[i2];
-        if (c === '"' || c === "'" || c === "`") {
-          i2 = skipString(importText, i2);
-          continue;
-        }
-        if (isIdentStart(c)) {
-          let j = i2 + 1;
-          while (j < close && isIdentChar(importText[j])) j++;
-          let word = importText.slice(i2, j);
-          if (word === "type" || word === "typeof") {
-            i2 = j;
-            continue;
-          }
-          let k = skipWhitespace(importText, j);
-          if (importText.slice(k, k + 2) === "as" && !isIdentChar(importText[k + 2])) {
-            let m = skipWhitespace(importText, k + 2);
-            if (isIdentStart(importText[m])) {
-              let n = m + 1;
-              while (n < close && isIdentChar(importText[n])) n++;
-              word = importText.slice(m, n);
-            }
-          }
-          names.push(word);
-          i2 = j;
-          continue;
-        }
-        i2++;
-      }
-      return names;
-    }
-  }
-  let i = 0;
-  while (i < importText.length && !isIdentStart(importText[i])) i++;
-  while (i < importText.length && isIdentChar(importText[i])) i++;
-  i = skipWhitespace(importText, i);
-  if (importText[i] === "*") {
-    i = skipWhitespace(importText, i + 1);
-    if (importText.slice(i, i + 2) === "as") i = skipWhitespace(importText, i + 2);
-    if (isIdentStart(importText[i])) {
-      let j = i + 1;
-      while (j < importText.length && isIdentChar(importText[j])) j++;
-      names.push(importText.slice(i, j));
-    }
-  } else if (isIdentStart(importText[i])) {
-    let j = i + 1;
-    while (j < importText.length && isIdentChar(importText[j])) j++;
-    names.push(importText.slice(i, j));
-  }
-  return names;
-}
-var init_tokens = __esm({
-  "../compiler/src/tokens.ts"() {
-    "use strict";
-    init_parser();
-    init_scan();
-  }
-});
-
 // ../compiler/src/module-imports.ts
 import { readFileSync as readFileSync2, existsSync as existsSync2, realpathSync, statSync } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
@@ -19629,19 +19832,65 @@ function collectVskImportPaths(imports, sourcePath2) {
     if (stripTypeImport(imp) === null) continue;
     const target = vskImportTarget(imp);
     if (!target) continue;
-    if (target.startsWith(".")) {
-      const full = resolve2(dirname3(sourcePath2), target);
-      if (existsSync3(full)) out.push(full);
-      continue;
-    }
-    const aliased = resolveImportPath(target, dirname3(sourcePath2));
-    if (aliased !== target && existsSync3(aliased)) out.push(aliased);
+    const full = resolveVskTarget(target, sourcePath2);
+    if (full) out.push(full);
   }
   return out;
 }
+function collectVskReexportPaths(reexportSources, sourcePath2) {
+  const out = [];
+  for (const spec of reexportSources) {
+    if (!spec.endsWith(".vsk")) continue;
+    const full = resolveVskTarget(spec, sourcePath2);
+    if (full) out.push(full);
+  }
+  return out;
+}
+function resolveVskTarget(target, sourcePath2) {
+  if (target.startsWith(".")) {
+    const full = resolve2(dirname3(sourcePath2), target);
+    return existsSync3(full) ? full : null;
+  }
+  const aliased = resolveImportPath(target, dirname3(sourcePath2));
+  return aliased !== target && existsSync3(aliased) ? aliased : null;
+}
+function vskImportValueNames(imports) {
+  const names = [];
+  for (const imp of imports) {
+    if (stripTypeImport(imp) === null) continue;
+    if (vskImportTarget(imp) === null) continue;
+    for (const pair of importBindingPairs(imp)) {
+      if (pair.imported === "default" || pair.imported === "*") continue;
+      names.push(pair.local);
+    }
+  }
+  return names;
+}
 function vskImportLines(source) {
   return extractImportStatements(source).filter((imp) => vskImportTarget(imp) !== null && stripTypeImport(imp) !== null);
 }
+function vskRegistryAliases(importLines, exportAliases) {
+  const aliases = [];
+  for (const alias of exportAliases) {
+    if (alias.local !== alias.exported) aliases.push({ local: alias.local, exported: alias.exported });
+  }
+  for (const imp of importLines) {
+    if (stripTypeImport(imp) === null) continue;
+    if (vskImportTarget(imp) === null) continue;
+    for (const pair of importBindingPairs(imp)) {
+      if (pair.imported === "default" || pair.imported === "*") continue;
+      if (pair.local !== pair.imported) aliases.push({ local: pair.imported, exported: pair.local });
+    }
+  }
+  return aliases;
+}
+function applyVskRegistryAliases(componentMap, aliases) {
+  for (const { local, exported } of aliases) {
+    if (componentMap.has(exported)) continue;
+    const fn = componentMap.get(local);
+    if (fn) componentMap.set(exported, fn);
+  }
+}
 function isTypeOnlyImport(stmt) {
   if (!stmt || stmt.type !== "ImportDeclaration") return false;
   if (stmt.importKind === "type") return true;
@@ -19952,6 +20201,130 @@ function getJSXTagName(nameNode) {
   }
   return "unknown";
 }
+function jsxTagRootName(nameNode) {
+  let node = 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 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) {
+        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();
 }
@@ -19959,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) {
@@ -20320,8 +20694,17 @@ function processJSXElement(source, element) {
     return [new HeadBlock(children2)];
   }
   if (nameNode && nameNode.type === "JSXMemberExpression") {
+    const root3 = jsxTagRootName(nameNode);
+    const isVskNamespace = !!currentVskNamespaceLocals && currentVskNamespaceLocals.has(root3);
+    if (isVskNamespace && jsxTagDepth(nameNode) > 1) {
+      const { line, column } = offsetToLineCol2(source, nameNode.start ?? 0);
+      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) {
@@ -20735,217 +21118,263 @@ function generateIR(ast, source, filename) {
   let staticProps = null;
   let loadFn = null;
   const topLevelCode = [];
-  for (const node of ast.body) {
-    if (node.type === "ImportDeclaration") {
-      const raw2 = getSource(source, node);
-      let cleaned = stripTypeImport(raw2);
-      if (cleaned === null) continue;
-      cleaned = normalizeRuntimeSpecifier(cleaned);
-      imports.push(cleaned);
-      for (const spec of node.specifiers) {
-        if (spec.importKind === "type") continue;
-        if (spec.type === "ImportSpecifier") {
-          importedNames.add(spec.local.name);
+  const exportAliases = [];
+  const reexportSources = [];
+  for (const pair of ast.__vskSpecifierExports || []) {
+    exportAliases.push({ local: pair.local, exported: pair.exported });
+  }
+  const vskNamespaceLocals = collectVskNamespaceLocals(ast);
+  const prevNamespaceLocals = currentVskNamespaceLocals;
+  const prevSourceFile = currentSourceFile;
+  currentVskNamespaceLocals = vskNamespaceLocals;
+  currentSourceFile = file;
+  try {
+    for (const node of ast.body) {
+      if (node.type === "ImportDeclaration") {
+        const raw2 = getSource(source, node);
+        let cleaned = stripTypeImport(raw2);
+        if (cleaned === null) continue;
+        cleaned = normalizeRuntimeSpecifier(cleaned);
+        imports.push(cleaned);
+        for (const spec of node.specifiers) {
+          if (spec.importKind === "type") continue;
+          if (spec.type === "ImportSpecifier") {
+            importedNames.add(spec.local.name);
+          }
         }
+        continue;
       }
-      continue;
-    }
-    if (node.type === "ExportNamedDeclaration" && node.declaration && !staticProps) {
-      const decl = node.declaration;
-      const fnName = decl.type === "FunctionDeclaration" ? decl.id?.name : decl.type === "VariableDeclaration" ? decl.declarations[0]?.id?.name : null;
-      if (fnName === "getStaticProps") {
-        staticProps = stripCodeTypes(getSource(source, decl));
+      if (node.type === "ExportNamedDeclaration" && node.declaration && !staticProps) {
+        const decl = node.declaration;
+        const fnName = decl.type === "FunctionDeclaration" ? decl.id?.name : decl.type === "VariableDeclaration" ? decl.declarations[0]?.id?.name : null;
+        if (fnName === "getStaticProps") {
+          staticProps = stripCodeTypes(getSource(source, decl));
+          continue;
+        }
+      }
+      if (node.type === "ExportNamedDeclaration" && node.declaration && !loadFn) {
+        const decl = node.declaration;
+        const fnName = decl.type === "FunctionDeclaration" ? decl.id?.name : decl.type === "VariableDeclaration" ? decl.declarations[0]?.id?.name : null;
+        if (fnName === "load") {
+          loadFn = stripCodeTypes(getSource(source, decl));
+          continue;
+        }
+      }
+      if (node.type === "ExportNamedDeclaration" && node.declaration) {
+        const decl = node.declaration;
+        if (decl.type === "VariableDeclaration") {
+          const declName = decl.declarations[0]?.id?.name;
+          if (declName === "standalone") {
+            continue;
+          }
+        }
+      }
+      if (node.type === "ExportNamedDeclaration" && !node.declaration) {
+        if (node.source) {
+          if (typeof node.source.value === "string") reexportSources.push(node.source.value);
+          for (const spec of node.specifiers || []) {
+            if (spec.type === "ExportSpecifier") {
+              const localName = spec.local && spec.local.name;
+              const exportedName = spec.exported && spec.exported.name;
+              if (typeof localName === "string" && typeof exportedName === "string") {
+                exportAliases.push({ local: localName, exported: exportedName });
+              }
+            }
+          }
+          continue;
+        }
+        for (const spec of node.specifiers || []) {
+          if (spec.type === "ExportSpecifier") {
+            const localName = spec.local && spec.local.name;
+            const exportedName = spec.exported && spec.exported.name;
+            if (typeof localName === "string" && typeof exportedName === "string") {
+              exportAliases.push({ local: localName, exported: exportedName });
+            }
+          }
+        }
         continue;
       }
-    }
-    if (node.type === "ExportNamedDeclaration" && node.declaration && !loadFn) {
-      const decl = node.declaration;
-      const fnName = decl.type === "FunctionDeclaration" ? decl.id?.name : decl.type === "VariableDeclaration" ? decl.declarations[0]?.id?.name : null;
-      if (fnName === "load") {
-        loadFn = stripCodeTypes(getSource(source, decl));
+      if (node.type === "ExportAllDeclaration") {
+        if (node.source && typeof node.source.value === "string") reexportSources.push(node.source.value);
         continue;
       }
-    }
-    if (node.type === "ExportNamedDeclaration" && node.declaration) {
-      const decl = node.declaration;
-      if (decl.type === "VariableDeclaration") {
-        const declName = decl.declarations[0]?.id?.name;
-        if (declName === "standalone") {
-          continue;
+      let inner = node;
+      let exported = false;
+      let defaultExport = false;
+      if (node.type === "ExportNamedDeclaration" && node.declaration) {
+        inner = node.declaration;
+        exported = true;
+      } else if (node.type === "ExportDefaultDeclaration" && node.declaration) {
+        inner = node.declaration;
+        exported = true;
+        defaultExport = true;
+      }
+      if (inner.type === "ComponentDeclaration") {
+      } else if (inner.type === "ClassDeclaration") {
+        const { line, column } = offsetToLineCol2(source, inner.start ?? 0);
+        throw VeskError.classDecl({ file, line, column, code: codeFrame(source, line, column) });
+      } else if (inner.type === "TSEnumDeclaration") {
+        const code = processEnum(inner, source, exported);
+        topLevelCode.push(code);
+        continue;
+      } else {
+        topLevelCode.push(getSource(source, node));
+        continue;
+      }
+      const name = inner.id.name;
+      const paramNames = getParamNames(inner.params, source);
+      const firstParam = inner.params?.[0];
+      const propsAlias = firstParam && firstParam.type === "Identifier" ? firstParam.name : null;
+      const propsType = getPropsType(inner.params, source);
+      const bodyStmts = inner.body.body;
+      const isClientComp = !!inner.client;
+      const prevSlotProps = __slotProps;
+      __slotProps = slotPropNamesFromType(propsType);
+      __propsParam = propsAlias || null;
+      if (isStatementMode(bodyStmts)) {
+        const raw2 = processStatementModeBody(source, bodyStmts, file);
+        const { body, css } = extractStyle(raw2);
+        validateBlocks(name, isClientComp, body, file, source);
+        const comp = new ComponentIR(name, paramNames, body, { mode: "statement", exported, defaultExport, isClient: inner.client, isAsync: inner.async, ssrAwait: componentUsesFetch(body), propsType, propsAlias });
+        comp.style = css;
+        components.push(comp);
+        __slotProps = prevSlotProps;
+      } else {
+        const guardClauses = [];
+        let mainReturn = null;
+        const preamble = [];
+        for (const stmt of bodyStmts) {
+          if (stmt.type === "VeskBlock") {
+            const innerBody = processStatementModeBody(source, stmt.body, file);
+            if (stmt.tag === "server") {
+              preamble.push(new ServerBlock(innerBody));
+            } else if (stmt.tag === "client") {
+              preamble.push(new ClientBlock(innerBody));
+            }
+          } else if (stmt.type === "ReturnStatement") {
+            mainReturn = stmt;
+          } else if (isTrackDeclaration(stmt)) {
+            const elements = stmt.declarations[0].id.elements;
+            const trackName = elements[0]?.name;
+            const rawName = elements.length > 1 ? elements[1]?.name : null;
+            const init = getSource(source, stmt.declarations[0].init);
+            if (trackName) preamble.push(new TrackDecl(trackName, init, rawName));
+            const refName = getComponentRefName(stmt);
+            if (refName) preamble.push(new ComponentRef(refName));
+          } else if (stmt.type === "IfStatement" && !mainReturn && stmt.consequent.type !== "ThrowStatement") {
+            guardClauses.push(stmt);
+          } else if (stmt.type === "ClassDeclaration") {
+            const { line, column } = offsetToLineCol2(source, stmt.start ?? 0);
+            throw VeskError.classDecl({ file, line, column, code: codeFrame(source, line, column) });
+          } else {
+            const raw2 = getSource(source, stmt);
+            if (raw2) preamble.push(new RuntimeStatement(raw2, stmt, source));
+          }
         }
+        const guardBody = buildGuardChain(source, guardClauses, mainReturn);
+        const { body, css } = extractStyle([...preamble, ...guardBody]);
+        validateBlocks(name, isClientComp, body, file, source);
+        const comp = new ComponentIR(name, paramNames, body, { exported, defaultExport, isClient: inner.client, isAsync: inner.async, ssrAwait: componentUsesFetch(body), propsType, propsAlias });
+        comp.style = css;
+        components.push(comp);
+        __slotProps = prevSlotProps;
       }
     }
-    let inner = node;
-    let exported = false;
-    let defaultExport = false;
-    if (node.type === "ExportNamedDeclaration" && node.declaration) {
-      inner = node.declaration;
-      exported = true;
-    } else if (node.type === "ExportDefaultDeclaration" && node.declaration) {
-      inner = node.declaration;
-      exported = true;
-      defaultExport = true;
-    }
-    if (inner.type === "ComponentDeclaration") {
-    } else if (inner.type === "ClassDeclaration") {
-      const { line, column } = offsetToLineCol2(source, inner.start ?? 0);
-      throw VeskError.classDecl({ file, line, column, code: codeFrame(source, line, column) });
-    } else if (inner.type === "TSEnumDeclaration") {
-      const code = processEnum(inner, source, exported);
-      topLevelCode.push(code);
-      continue;
-    } else {
-      topLevelCode.push(getSource(source, node));
-      continue;
-    }
-    const name = inner.id.name;
-    const paramNames = getParamNames(inner.params, source);
-    const firstParam = inner.params?.[0];
-    const propsAlias = firstParam && firstParam.type === "Identifier" ? firstParam.name : null;
-    const propsType = getPropsType(inner.params, source);
-    const bodyStmts = inner.body.body;
-    const isClientComp = !!inner.client;
-    const prevSlotProps = __slotProps;
-    __slotProps = slotPropNamesFromType(propsType);
-    __propsParam = propsAlias || null;
-    if (isStatementMode(bodyStmts)) {
-      const raw2 = processStatementModeBody(source, bodyStmts, file);
-      const { body, css } = extractStyle(raw2);
-      validateBlocks(name, isClientComp, body, file, source);
-      const comp = new ComponentIR(name, paramNames, body, { mode: "statement", exported, defaultExport, isClient: inner.client, isAsync: inner.async, ssrAwait: componentUsesFetch(body), propsType, propsAlias });
-      comp.style = css;
-      components.push(comp);
-      __slotProps = prevSlotProps;
-    } else {
-      const guardClauses = [];
-      let mainReturn = null;
-      const preamble = [];
-      for (const stmt of bodyStmts) {
-        if (stmt.type === "VeskBlock") {
-          const innerBody = processStatementModeBody(source, stmt.body, file);
-          if (stmt.tag === "server") {
-            preamble.push(new ServerBlock(innerBody));
-          } else if (stmt.tag === "client") {
-            preamble.push(new ClientBlock(innerBody));
-          }
-        } else if (stmt.type === "ReturnStatement") {
-          mainReturn = stmt;
-        } else if (isTrackDeclaration(stmt)) {
-          const elements = stmt.declarations[0].id.elements;
-          const trackName = elements[0]?.name;
-          const rawName = elements.length > 1 ? elements[1]?.name : null;
-          const init = getSource(source, stmt.declarations[0].init);
-          if (trackName) preamble.push(new TrackDecl(trackName, init, rawName));
-          const refName = getComponentRefName(stmt);
-          if (refName) preamble.push(new ComponentRef(refName));
-        } else if (stmt.type === "IfStatement" && !mainReturn && stmt.consequent.type !== "ThrowStatement") {
-          guardClauses.push(stmt);
-        } else if (stmt.type === "ClassDeclaration") {
-          const { line, column } = offsetToLineCol2(source, stmt.start ?? 0);
-          throw VeskError.classDecl({ file, line, column, code: codeFrame(source, line, column) });
-        } else {
-          const raw2 = getSource(source, stmt);
-          if (raw2) preamble.push(new RuntimeStatement(raw2, stmt, source));
-        }
-      }
-      const guardBody = buildGuardChain(source, guardClauses, mainReturn);
-      const { body, css } = extractStyle([...preamble, ...guardBody]);
-      validateBlocks(name, isClientComp, body, file, source);
-      const comp = new ComponentIR(name, paramNames, body, { exported, defaultExport, isClient: inner.client, isAsync: inner.async, ssrAwait: componentUsesFetch(body), propsType, propsAlias });
-      comp.style = css;
-      components.push(comp);
-      __slotProps = prevSlotProps;
-    }
-  }
-  const asyncNames = new Set(components.filter((c) => c.isAsync || c.ssrAwait).map((c) => c.name));
-  for (const comp of components) {
-    if (asyncNames.has(comp.name)) continue;
-    const called2 = /* @__PURE__ */ new Map();
-    collectComponentCalls(comp.body, called2);
-    for (const [childName, start] of called2) {
-      if (!asyncNames.has(childName)) continue;
-      const { line, column } = offsetToLineCol2(source, start >= 0 ? start : 0);
-      throw VeskError.asyncChildInSyncParent(comp.name, childName, { file, line, column, code: codeFrame(source, line, column) });
-    }
-  }
-  const autoImportable = [
-    "useFetch",
-    "useRouter",
-    "useParams",
-    "usePathname",
-    "useSearchParams",
-    "useNavigate",
-    "defineAction",
-    "Form",
-    "Field",
-    "required",
-    "email",
-    "minLength",
-    "maxLength",
-    "pattern",
-    "custom",
-    "Link",
-    "NavLink",
-    "Outlet",
-    "Redirect",
-    "Image",
-    "Portal",
-    "Experiment",
-    "LoadingIndicator",
-    "useLoadingIndicator",
-    "JsonLd",
-    "ArticleSchema",
-    "ProductSchema",
-    "FAQPageSchema",
-    "BreadcrumbListSchema",
-    "OrganizationSchema",
-    "LocalBusinessSchema",
-    "VideoSchema",
-    "effect",
-    "derived",
-    "untrack",
-    "peek",
-    "tick",
-    "flushSync",
-    "on_destroy",
-    "createContext",
-    "redirect",
-    "permanentRedirect",
-    "notFound",
-    "NotFoundError",
-    "createResource",
-    "getAction",
-    "validateActionInput",
-    "issuesToFieldMap",
-    "isFormAction",
-    "Show",
-    "For",
-    "Switch",
-    "Match"
-  ];
-  const called = collectCallAndJsxTargets(ast);
-  const usedFunctions = /* @__PURE__ */ new Set();
-  for (const fn of autoImportable) {
-    if (called.has(fn)) usedFunctions.add(fn);
-  }
-  if (usedFunctions.size > 0) {
-    const existing = /* @__PURE__ */ new Set();
-    for (const imp of imports) {
-      if (importModuleTarget(imp) !== "@vesk/runtime") continue;
-      for (const n of extractImportNames(imp)) existing.add(n);
+    const asyncNames = new Set(components.filter((c) => c.isAsync || c.ssrAwait).map((c) => c.name));
+    for (const comp of components) {
+      if (asyncNames.has(comp.name)) continue;
+      const called2 = /* @__PURE__ */ new Map();
+      collectComponentCalls(comp.body, called2);
+      for (const [childName, start] of called2) {
+        if (!asyncNames.has(childName)) continue;
+        const { line, column } = offsetToLineCol2(source, start >= 0 ? start : 0);
+        throw VeskError.asyncChildInSyncParent(comp.name, childName, { file, line, column, code: codeFrame(source, line, column) });
+      }
     }
-    const boundLocally = /* @__PURE__ */ new Set();
-    for (const imp of imports) {
-      for (const pair of importBindingPairs(imp)) boundLocally.add(pair.local);
+    const autoImportable = [
+      "useFetch",
+      "useRouter",
+      "useParams",
+      "usePathname",
+      "useSearchParams",
+      "useNavigate",
+      "defineAction",
+      "Form",
+      "Field",
+      "required",
+      "email",
+      "minLength",
+      "maxLength",
+      "pattern",
+      "custom",
+      "Link",
+      "NavLink",
+      "Outlet",
+      "Redirect",
+      "Image",
+      "Portal",
+      "Experiment",
+      "LoadingIndicator",
+      "useLoadingIndicator",
+      "JsonLd",
+      "ArticleSchema",
+      "ProductSchema",
+      "FAQPageSchema",
+      "BreadcrumbListSchema",
+      "OrganizationSchema",
+      "LocalBusinessSchema",
+      "VideoSchema",
+      "effect",
+      "derived",
+      "untrack",
+      "peek",
+      "tick",
+      "flushSync",
+      "on_destroy",
+      "createContext",
+      "redirect",
+      "permanentRedirect",
+      "notFound",
+      "NotFoundError",
+      "createResource",
+      "getAction",
+      "validateActionInput",
+      "issuesToFieldMap",
+      "isFormAction",
+      "Show",
+      "For",
+      "Switch",
+      "Match",
+      "primitive",
+      "leaf"
+    ];
+    const called = collectCallAndJsxTargets(ast);
+    const usedFunctions = /* @__PURE__ */ new Set();
+    for (const fn of autoImportable) {
+      if (called.has(fn)) usedFunctions.add(fn);
     }
-    const missing = [...usedFunctions].filter((f) => !existing.has(f) && !boundLocally.has(f));
-    if (missing.length > 0) {
-      imports.push(`import { ${missing.join(", ")} } from '@vesk/runtime';`);
+    if (usedFunctions.size > 0) {
+      const existing = /* @__PURE__ */ new Set();
+      for (const imp of imports) {
+        if (importModuleTarget(imp) !== "@vesk/runtime") continue;
+        for (const n of extractImportNames(imp)) existing.add(n);
+      }
+      const boundLocally = /* @__PURE__ */ new Set();
+      for (const imp of imports) {
+        for (const pair of importBindingPairs(imp)) boundLocally.add(pair.local);
+      }
+      const missing = [...usedFunctions].filter((f) => !existing.has(f) && !boundLocally.has(f));
+      if (missing.length > 0) {
+        imports.push(`import { ${missing.join(", ")} } from '@vesk/runtime';`);
+      }
     }
+    return new IRRoot(components, imports, importedNames, staticProps, loadFn, topLevelCode, exportAliases, reexportSources);
+  } finally {
+    currentVskNamespaceLocals = prevNamespaceLocals;
+    currentSourceFile = prevSourceFile;
   }
-  return new IRRoot(components, imports, importedNames, staticProps, loadFn, topLevelCode);
 }
-var __vskAnnotations, __slotProps, __propsParam;
+var __vskAnnotations, __slotProps, __propsParam, currentVskNamespaceLocals, currentSourceFile;
 var init_ir_generator = __esm({
   "../compiler/src/ir-generator.ts"() {
     "use strict";
@@ -20960,6 +21389,7 @@ var init_ir_generator = __esm({
     __vskAnnotations = [];
     __slotProps = null;
     __propsParam = null;
+    currentVskNamespaceLocals = null;
   }
 });
 
@@ -21853,6 +22283,13 @@ function loadRuntimeImports(importStrs) {
   }
   return {};
 }
+function patternElementName(element) {
+  if (!element) return null;
+  if (element.type === "Identifier") return element.name;
+  if (element.type === "AssignmentPattern" && element.left) return patternElementName(element.left);
+  if (element.type === "RestElement" && element.argument) return patternElementName(element.argument);
+  return null;
+}
 function evalTopLevelCode(topLevelCode, __vesk) {
   for (const code of topLevelCode) {
     const ast = tryParseTopLevel(code);
@@ -21863,8 +22300,11 @@ function evalTopLevelCode(topLevelCode, __vesk) {
         if (!target) continue;
         if (target.type === "VariableDeclaration") {
           for (const d of target.declarations) {
-            if (!d.id || d.id.type !== "Identifier") continue;
-            const initSrc = d.init ? code.slice(d.init.start, d.init.end) : "undefined";
+            if (!d.id) continue;
+            const isTrack = d.id.type === "ArrayPattern" && d.id.lazy === true;
+            const names = isTrack ? (d.id.elements || []).map(patternElementName) : d.id.type === "Identifier" ? [d.id.name] : [];
+            if (names.every((n) => n === null)) continue;
+            const initSrc = d.init ? stripTrackDeclMarkers(code.slice(d.init.start, d.init.end), d.init.start, d.init) : "undefined";
             try {
               const keys = Object.keys(__vesk);
               const params = [...keys, "__vesk", "result"];
@@ -21872,7 +22312,10 @@ function evalTopLevelCode(topLevelCode, __vesk) {
               const fn = new Function(...params, body);
               const result = { value: void 0 };
               fn(...keys.map((k) => __vesk[k]), __vesk, result);
-              __vesk[d.id.name] = result.value;
+              names.forEach((name, i) => {
+                if (name === null) return;
+                __vesk[name] = isTrack ? Array.isArray(result.value) ? result.value[i] : void 0 : result.value;
+              });
             } catch {
             }
           }
@@ -21882,7 +22325,7 @@ function evalTopLevelCode(topLevelCode, __vesk) {
             const keys = Object.keys(__vesk);
             const params = [...keys, "__vesk"];
             const paramSrc = target.params.length ? code.slice(target.params[0].start, target.params[target.params.length - 1].end) : "";
-            const bodySrc = code.slice(target.body.start, target.body.end);
+            const bodySrc = stripTrackDeclMarkers(code.slice(target.body.start, target.body.end), target.body.start, target.body);
             const asyncKw = target.async ? "async " : "";
             const fn = new Function(...params, `__vesk['${target.id.name}'] = ${asyncKw}function ${target.id.name}(${paramSrc}) ${bodySrc};`);
             fn(...keys.map((k) => __vesk[k]), __vesk);
@@ -25830,6 +26273,96 @@ var init_headless = __esm({
   }
 });
 
+// ../runtime/src/primitive.ts
+function primitive(fn) {
+  const wrapped = ((props, registry, scope2) => {
+    return fn(props == null ? EMPTY_PROPS : props, registry, scope2);
+  });
+  wrapped.__veskPrimitive = true;
+  return wrapped;
+}
+function leaf(fn) {
+  fn.__veskLeaf = true;
+  return fn;
+}
+function isPrimitive(value) {
+  return typeof value === "function" && value.__veskPrimitive === true;
+}
+function isLeaf(value) {
+  return typeof value === "function" && value.__veskLeaf === true;
+}
+function isVeskComponent(value) {
+  return typeof value === "function";
+}
+function toDomNode(value) {
+  if (typeof document === "undefined") return value;
+  if (value == null || typeof value === "boolean") return value;
+  if (typeof value.nodeType === "number") {
+    return value;
+  }
+  if (typeof value !== "string") return value;
+  if (value === "") return document.createDocumentFragment();
+  const template = document.createElement("template");
+  template.innerHTML = value;
+  const { content } = template;
+  if (content.childNodes.length === 1) {
+    const only = content.firstChild;
+    content.removeChild(only);
+    return only;
+  }
+  return content;
+}
+function isCell2(value) {
+  return typeof value === "object" && value !== null && typeof value.f === "number";
+}
+function readDep(dep) {
+  return isCell2(dep) ? get(dep) : dep;
+}
+function rerenderNode(node, deps, call) {
+  if (typeof document === "undefined") return node;
+  if (deps.length === 0) return node;
+  let owned = null;
+  let current2 = null;
+  if (Array.isArray(node)) {
+    const roots = node.filter((n) => n && typeof n.nodeType === "number");
+    owned = roots.length ? roots : null;
+    current2 = owned ? owned[0] : null;
+  } else if (node && typeof node.nodeType === "number") {
+    current2 = node;
+  }
+  if (!current2) return node;
+  const liveRange = () => {
+    if (owned) return owned;
+    return current2 && current2.parentNode ? [current2] : null;
+  };
+  let seen = deps.map(readDep);
+  effect(() => {
+    const now2 = deps.map(readDep);
+    if (now2.length === seen.length && now2.every((v, i) => Object.is(v, seen[i]))) return;
+    seen = now2;
+    const old = liveRange();
+    if (!old || !old[0].parentNode) return;
+    const next = toDomNode(call());
+    if (!next || typeof next.nodeType !== "number") return;
+    const fresh = next.nodeType === 11 ? Array.from(next.childNodes) : [next];
+    const parent = old[0].parentNode;
+    for (const freshNode of fresh) parent.insertBefore(freshNode, old[0]);
+    for (const oldNode of old) if (oldNode.parentNode) oldNode.parentNode.removeChild(oldNode);
+    owned = next.nodeType === 11 ? fresh : null;
+    current2 = fresh[0] ?? current2;
+  });
+  return node;
+}
+var EMPTY_PROPS;
+var init_primitive = __esm({
+  "../runtime/src/primitive.ts"() {
+    "use strict";
+    init_ripple_runtime();
+    init_ripple_blocks();
+    EMPTY_PROPS = Object.freeze({});
+  }
+});
+
 // ../runtime/src/action.ts
 function getActionRegistry() {
   const g2 = globalThis;
@@ -25983,11 +26516,15 @@ __export(index_server_exports, {
   get_server_context: () => get_server_context,
   headers: () => headers,
   isFormAction: () => isFormAction,
+  isLeaf: () => isLeaf,
   isLoadingActive: () => isLoadingActive,
+  isPrimitive: () => isPrimitive,
+  isVeskComponent: () => isVeskComponent,
   is_destroyed: () => is_destroyed,
   isr: () => isr,
   isrConfigToRevalidate: () => isrConfigToRevalidate,
   issuesToFieldMap: () => issuesToFieldMap,
+  leaf: () => leaf,
   locals: () => locals,
   maxLength: () => maxLength,
   minLength: () => minLength,
@@ -26001,12 +26538,14 @@ __export(index_server_exports, {
   permanentRedirect: () => permanentRedirect,
   pop_component: () => pop_component,
   pre_effect: () => pre_effect,
+  primitive: () => primitive,
   push_component: () => push_component,
   readSignedCookie: () => readSignedCookie2,
   redirect: () => redirect,
   removeHook: () => removeHook,
   render: () => render,
   required: () => required,
+  rerenderNode: () => rerenderNode,
   resolveSsrResources: () => resolveSsrResources,
   resume_block: () => resume_block,
   revalidateComponent: () => revalidateComponent,
@@ -26030,6 +26569,7 @@ __export(index_server_exports, {
   set_server_context: () => set_server_context,
   signCookie: () => signCookie2,
   tick: () => tick,
+  toDomNode: () => toDomNode,
   track: () => track,
   unlink_block: () => unlink_block,
   unsignCookie: () => unsignCookie2,
@@ -26068,6 +26608,7 @@ var init_index_server = __esm({
     init_form();
     init_md();
     init_headless();
+    init_primitive();
     init_loading_indicator();
     init_action();
   }
@@ -28497,11 +29038,20 @@ function printWithTypesStripped(ast, code, hadTs = hasTsSyntax(ast)) {
 function transformTopLevelForActions(topLevelCode, mode) {
   const out = [];
   for (const c of topLevelCode) {
-    const rewritten = rewriteTopLevelActions(c, mode);
+    const rewritten = rewriteTopLevelActions(stripTopLevelTrackDecls(c), mode);
     if (rewritten !== "") out.push(rewritten);
   }
   return out;
 }
+function stripTopLevelTrackDecls(code) {
+  let ast;
+  try {
+    ast = parse4(code);
+  } catch {
+    return code;
+  }
+  return stripTrackDeclMarkers(code, 0, ast);
+}
 function collectActionIds(source) {
   const ids = [];
   const stmts = collectTopLevelStatements(source);
@@ -28557,6 +29107,7 @@ var init_actions = __esm({
     "use strict";
     init_parser();
     init_strip_ts();
+    init_tokens();
     ACTION_PREFIX = "/_vesk/action/";
   }
 });
@@ -28684,6 +29235,39 @@ function simpleGetName(expr) {
   }
   return inner;
 }
+function untrackBindingArg(expr) {
+  let head = -1;
+  for (const name of BINDING_REF_CALLS) {
+    if (expr.startsWith(`${name}(`)) {
+      head = name.length;
+      break;
+    }
+  }
+  if (head < 0) return expr;
+  const rest = expr.slice(head + 1);
+  if (rest[0] !== "g" || rest[1] !== "e" || rest[2] !== "t" || rest[3] !== "(") return expr;
+  let i = 4;
+  let word = "";
+  for (; i < rest.length; i++) {
+    const c = rest.charCodeAt(i);
+    const ok = c >= 48 && c <= 57 || c >= 65 && c <= 90 || c >= 97 && c <= 122 || c === 95 || c === 36;
+    if (!ok) break;
+    word += rest[i];
+  }
+  if (word.length === 0 || rest[i] !== ")") return expr;
+  const after = i + 1;
+  if (rest[after] !== "," && rest[after] !== ")") return expr;
+  return expr.slice(0, head + 1) + word + rest.slice(after);
+}
+function trackedRefTarget(expr, tracked2) {
+  const cell = simpleGetName(expr);
+  if (cell !== null) return cell;
+  if (/^[A-Za-z_$][\w$]*$/.test(expr)) {
+    const info = tracked2.get(expr);
+    if (info && info.kind === "cell" && info.cellName === expr) return expr;
+  }
+  return null;
+}
 function semicolonizeStatement(code) {
   const trimmed = code.trimEnd();
   if (!trimmed || trimmed.endsWith(";") || trimmed.endsWith("}")) return code;
@@ -28782,6 +29366,21 @@ function transformTracked(irNode, tracked2) {
       }
       return context.next();
     },
+    Property(node, context) {
+      if (node.shorthand && node.value && node.value.type === "Identifier" && !node.computed) {
+        const info = context.state.get(node.value.name);
+        if (info && info.kind === "virtual") {
+          return {
+            ...node,
+            shorthand: false,
+            value: callExpr({ type: "Identifier", name: "get" }, [
+              { type: "Identifier", name: info.cellName }
+            ])
+          };
+        }
+      }
+      return context.next();
+    },
     Identifier(node, context) {
       const parent = context.path.at(-1);
       if (parent) {
@@ -28793,6 +29392,8 @@ function transformTracked(irNode, tracked2) {
           return context.next();
         if (parent.type === "Property" && parent.value === node && parent.key && parent.key.type === "Identifier" && parent.key.name === "into")
           return context.next();
+        if (parent.type === "Property" && parent.key === node && !parent.computed && !parent.shorthand)
+          return context.next();
         if (parent.type === "MemberExpression" && !parent.computed && parent.object === node && parent.property && parent.property.type === "Identifier" && parent.property.name === "set")
           return context.next();
       }
@@ -28819,6 +29420,28 @@ function collectTrackedNames(body) {
   }
   return names;
 }
+function collectTrackedDeps(value, tracked2) {
+  const ast = value?.ast;
+  if (!ast || typeof ast !== "object" || tracked2.size === 0) return [];
+  const found = [];
+  const seen = /* @__PURE__ */ new Set();
+  walk4(ast, tracked2, {
+    Identifier(node, context) {
+      const parent = context.path.at(-1);
+      if (parent) {
+        if (parent.type === "MemberExpression" && !parent.computed && parent.property === node) return context.next();
+        if (parent.type === "Property" && parent.key === node) return context.next();
+      }
+      const info = context.state.get(node.name);
+      if (info && !seen.has(node.name)) {
+        seen.add(node.name);
+        found.push(node.name);
+      }
+      return context.next();
+    }
+  });
+  return found;
+}
 function transformTrackedInit(init, tracked2) {
   if (!init) return init;
   let expr = null;
@@ -29012,8 +29635,9 @@ function emitStatic(ctx2, node, tracked2, effectsVar, skipK = 0, regionBudget) {
         const target = attr.target || "";
         const isEvent2 = target.startsWith("on") && target.length > 2;
         if (target === "ref") {
-          const expr = transformTracked(attr.expression, tracked2);
-          ctx2.push(`(${expr})(${ssrEl});`);
+          const expr = untrackBindingArg(transformTracked(attr.expression, tracked2));
+          const cell = trackedRefTarget(expr, tracked2);
+          ctx2.push(cell !== null ? `set(${cell}, ${ssrEl});` : `(${expr})(${ssrEl});`);
         } else if (isEvent2) {
           const eventName = target.slice(2).toLowerCase();
           const handler = transformTracked(attr.expression, tracked2);
@@ -29070,8 +29694,9 @@ function emitStatic(ctx2, node, tracked2, effectsVar, skipK = 0, regionBudget) {
     const target = attr.target || "";
     const isEvent2 = target.startsWith("on") && target.length > 2;
     if (target === "ref") {
-      const expr = transformTracked(attr.expression, tracked2);
-      ctx2.push(`(${expr})(${el});`);
+      const expr = untrackBindingArg(transformTracked(attr.expression, tracked2));
+      const cell = trackedRefTarget(expr, tracked2);
+      ctx2.push(cell !== null ? `set(${cell}, ${el});` : `(${expr})(${el});`);
     } else if (isEvent2) {
       const eventName = target.slice(2).toLowerCase();
       const handler = transformTracked(attr.expression, tracked2);
@@ -29265,19 +29890,29 @@ function emitComponentCall(ctx2, node, tracked2, effectsVar, parentVar, compPref
   const calleeExpr = node.calleeExpr ? `(${node.calleeExpr})` : null;
   const slotChildren = node.children.filter((c) => c instanceof PropSlot);
   const regChildren = node.children.filter((c) => !(c instanceof PropSlot));
-  const callArgs = () => `{ ${propsEntries.join(", ")} }`;
+  const plainTarget = !!(calleeExpr || ctx2.importedNames.has(node.componentName)) && !ctx2.selfClaimNames.has(node.componentName);
+  const trackedDeps = [];
+  if (plainTarget) {
+    for (const p of node.props) {
+      if (typeof p.value === "string") continue;
+      for (const d of collectTrackedDeps(p.value, tracked2)) if (!trackedDeps.includes(d)) trackedDeps.push(d);
+    }
+    for (const sp of node.spreadProps) {
+      for (const d of collectTrackedDeps(sp, tracked2)) if (!trackedDeps.includes(d)) trackedDeps.push(d);
+    }
+  }
+  const callArgs = () => plainTarget ? `reactiveProps({ ${propsEntries.join(", ")} })` : `{ ${propsEntries.join(", ")} }`;
   if (ctx2.hydrate) {
     const access = calleeExpr ?? (ctx2.importedNames.has(node.componentName) ? node.componentName : `__components[${JSON.stringify(node.componentName)}]`);
     if (!calleeExpr && !ctx2.importedNames.has(node.componentName)) {
       ctx2.push(`if (${access} == null) throw new Error(${JSON.stringify(`Component "${node.componentName}" was not found while rendering. Declare it with the \`component\` keyword, import it, or register it in the component registry.`)});`);
     }
-    const plainTarget = !!(calleeExpr || ctx2.importedNames.has(node.componentName)) && !ctx2.selfClaimNames.has(node.componentName);
     const walkerArg = ctx2.walker;
     const promptExpr = ctx2.markerless && (regionBudget || skipK > 0) ? markerlessSkipExpr(regionBudget, skipK) : null;
     const maybeReplace = (v2) => {
       if (!plainTarget) return;
       const claim = promptExpr ? `${walkerArg}.claimOnly(undefined, ${promptExpr})` : `${walkerArg}.claimOnly()`;
-      ctx2.push(`if (${v2} && ${v2}.parentNode == null && ${v2}.nodeType !== 11) { const __sr = ${claim}; if (__sr && __sr.parentNode) __sr.parentNode.replaceChild(${v2}, __sr); }`);
+      ctx2.push(`if (${v2} && ${v2}.parentNode == null) { if (${v2}.nodeType === 11) { const __cnt = ${v2}.childNodes.length; let __sr = null; for (let __i = 0; __i < __cnt; __i++) { const __c = ${claim}; if (__c && __c.parentNode) { if (__sr) { __c.remove(); } else { __sr = __c; } } } if (__sr) { const __p = __sr.parentNode; while (${v2}.firstChild) __p.insertBefore(${v2}.firstChild, __sr); __p.removeChild(__sr); } } else { const __sr = ${claim}; if (__sr && __sr.parentNode) __sr.parentNode.replaceChild(${v2}, __sr); } }`);
       if (regionBudget && ctx2.markerless) ctx2.push(`${regionBudget} = 0;`);
     };
     const maybeRetire = () => {
@@ -29312,10 +29947,15 @@ function emitComponentCall(ctx2, node, tracked2, effectsVar, parentVar, compPref
     }
     ctx2.push(`let ${v} = undefined;`);
     ctx2.push(`if (__hydrate) __hydrate.childFrame = (__hydrate.childFrame || 0) + 1;`);
-    ctx2.push(`try { ${v} = ${awaitKw}${access}(${callArgs()}, __registry, ${walkerArg}); } finally { if (__hydrate) __hydrate.childFrame--; }`);
+    ctx2.push(`try { ${v} = toDomNode(${awaitKw}${access}(${callArgs()}, __registry, ${walkerArg})); } finally { if (__hydrate) __hydrate.childFrame--; }`);
+    const rootsVar = trackedDeps.length > 0 ? ctx2.n() : null;
+    if (rootsVar) ctx2.push(`const ${rootsVar} = ${v} && ${v}.nodeType === 11 ? Array.from(${v}.childNodes) : [${v}];`);
     if (ctx2.markerless && promptExpr && !plainTarget && regionBudget) ctx2.push(`${regionBudget} = 0;`);
     maybeReplace(v);
     maybeRetire();
+    if (trackedDeps.length > 0) {
+      ctx2.push(`rerenderNode(${rootsVar}, [${trackedDeps.join(", ")}], () => ${awaitKw}${access}(${callArgs()}, __registry, ${walkerArg}));`);
+    }
     return v;
   } else {
     for (const slot of slotChildren) {
@@ -29337,12 +29977,18 @@ function emitComponentCall(ctx2, node, tracked2, effectsVar, parentVar, compPref
       propsEntries.push(`children: ${frag}`);
     }
     if (calleeExpr) {
-      ctx2.push(`const ${v} = ${calleeExpr}(${callArgs()});`);
+      ctx2.push(`const ${v} = toDomNode(${calleeExpr}(${callArgs()}));`);
     } else if (ctx2.importedNames.has(node.componentName)) {
-      ctx2.push(`const ${v} = ${awaitKw}${node.componentName}(${callArgs()});`);
+      ctx2.push(`const ${v} = toDomNode(${awaitKw}${node.componentName}(${callArgs()}));`);
     } else {
       ctx2.push(`if (${compPrefix}[${JSON.stringify(node.componentName)}] == null) throw new Error(${JSON.stringify(`Component "${node.componentName}" was not found while rendering. Declare it with the \`component\` keyword, import it, or register it in the component registry.`)});`);
-      ctx2.push(`const ${v} = ${awaitKw}${compPrefix}[${JSON.stringify(node.componentName)}](${callArgs()});`);
+      ctx2.push(`const ${v} = toDomNode(${awaitKw}${compPrefix}[${JSON.stringify(node.componentName)}](${callArgs()}));`);
+    }
+    if (trackedDeps.length > 0) {
+      const calleeRef = calleeExpr ?? (ctx2.importedNames.has(node.componentName) ? node.componentName : `${compPrefix}[${JSON.stringify(node.componentName)}]`);
+      const rootsVar2 = ctx2.n();
+      ctx2.push(`const ${rootsVar2} = ${v} && ${v}.nodeType === 11 ? Array.from(${v}.childNodes) : [${v}];`);
+      ctx2.push(`rerenderNode(${rootsVar2}, [${trackedDeps.join(", ")}], () => ${awaitKw}${calleeRef}(${callArgs()}));`);
     }
   }
   return v;
@@ -30428,7 +31074,7 @@ function emitClientFromIR(ir, options) {
     }
   }
   const exportCode = exportLines.join("\n");
-  const runtimeNames = ["track", "get", "set", "destroy_block", "getActiveComponent", "setActiveComponent", "reactiveProps", "applyStyle"];
+  const runtimeNames = ["track", "get", "set", "destroy_block", "getActiveComponent", "setActiveComponent", "reactiveProps", "applyStyle", "toDomNode", "rerenderNode"];
   if (ir.components.some((c) => !isStaticIR(c.body))) runtimeNames.push("effect");
   for (const name of usedRuntimeBindings(ir)) runtimeNames.push(name);
   for (const name of ["derived"]) {
@@ -30489,14 +31135,26 @@ function compileClientBoth(source, _componentName, sourcePath2, opts) {
   }
   const alloc = nameAllocFor(sourcePath2);
   const comp = emitClientFromIR(ir, { forceClient: true, nameAllocator: alloc });
-  if (opts?.skipHyd) return { comp, hyd: "", name };
+  const aliases = vskRegistryAliases(ir.imports, ir.exportAliases);
+  const reexportPaths = sourcePath2 ? collectVskReexportPaths(ir.reexportSources, sourcePath2) : [];
+  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
+    name,
+    aliases,
+    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)
   };
 }
-var NON_BUBBLING_EVENTS, Ctx, PROPERTY_ATTRS;
+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"() {
     "use strict";
@@ -30508,8 +31166,10 @@ var init_client_codegen = __esm({
     init_module_imports();
     init_scan();
     init_tokens();
+    init_vsk_imports();
     init_md_inline();
     init_strip_ts();
+    BINDING_REF_CALLS = ["bindValue", "bindChecked", "bindGroup"];
     NON_BUBBLING_EVENTS = /* @__PURE__ */ new Set([
       "focus",
       "blur",
@@ -31045,7 +31705,8 @@ function buildComponentEntries(irRoot) {
   const importedNames = /* @__PURE__ */ new Set([...runtimeNames, ...localValueNames, ...topValueNames]);
   const hasTracked = irRoot.components.some((c) => c.body.some((n) => n instanceof TrackDecl));
   const extraNames = hasTracked ? ["get", "set", "track"] : [];
-  const allNames = [.../* @__PURE__ */ new Set([...runtimeNames, ...topNames, ...extraNames, ...localValueNames])];
+  const vskValueNames = vskImportValueNames(irRoot.imports);
+  const allNames = [.../* @__PURE__ */ new Set([...runtimeNames, ...topNames, ...extraNames, ...localValueNames, ...vskValueNames])];
   const scopeDecl = allNames.length > 0 ? `const { ${allNames.join(", ")} } = __vesk;
 ` : "";
   setVskImportedNames(importedNames);
@@ -31086,41 +31747,155 @@ var init_server_jsgen = __esm({
     init_scan();
     init_server_utils();
     init_module_imports();
+    init_vsk_imports();
     __currentCompName = "";
   }
 });
 
 // ../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);
 }
-var storage, ssrSink2;
+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, 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();
   }
 });
 
@@ -31144,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));
@@ -31155,10 +31933,15 @@ 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) {
-    for (const importPath of collectVskImportPaths(ir.imports, sourcePath2)) {
+    const vskPaths = [
+      ...collectVskImportPaths(ir.imports, sourcePath2),
+      ...collectVskReexportPaths(ir.reexportSources, sourcePath2)
+    ];
+    for (const importPath of vskPaths) {
       if (seenImportFiles.has(importPath)) continue;
       seenImportFiles.add(importPath);
       let importedSrc;
@@ -31167,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);
       }
@@ -31178,6 +31961,7 @@ function compileFileInternal(source, sourcePath2, seenImportFiles) {
     }
   }
   evalTopLevelCode(transformTopLevelForActions(ir.topLevelCode, "server"), __vesk);
+  applyVskRegistryAliases(componentMap, vskRegistryAliases(ir.imports, ir.exportAliases));
   for (const name of ownComponentNames) {
     const fn = componentMap.get(name);
     if (fn && !fn.__veskScope) fn.__veskScope = __vesk;
@@ -31195,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);
@@ -31241,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));
@@ -31257,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 };
@@ -31296,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()) {
@@ -31304,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];
   });
 }
@@ -31443,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 {
@@ -31519,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);
@@ -31593,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 {
@@ -31614,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") : "";
@@ -31627,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();
 }
@@ -31650,6 +32463,7 @@ var init_server_render = __esm({
     init_md_inline();
     init_ssr_store();
     init_module_imports();
+    init_vsk_collision();
   }
 });
 
@@ -34147,7 +34961,7 @@ function unwrapMaybeCell2(v) {
   }
   return v;
 }
-function isCell2(v) {
+function isCell3(v) {
   return v !== null && typeof v === "object" && typeof v.get === "function";
 }
 function escapeHtml7(s) {
@@ -36152,7 +36966,7 @@ function Md2(props, _registry, hydrate) {
   if (propFg && propFg !== "none")
     wrapperParts.push(`--md-code-fg:${propFg}`);
   const wrapperStyle = wrapperParts.length > 0 ? escapeHtml7(wrapperParts.join(";")) : "";
-  const reactive = isCell2(contentCell);
+  const reactive = isCell3(contentCell);
   const pathMode = isPublicMarkdownPath2(content);
   if (mdIsSSR2()) {
     const attrs = className ? ` class="${escapeHtml7(className)}"` : "";
@@ -36813,6 +37627,36 @@ var init_errors2 = __esm({
           tip: isBuiltin ? `"${name}" is a Vesk built-in. Use it directly \u2014 no manual import needed.` : ""
         });
       }
+      /**
+       * 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: 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` 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: "`<ns.Icon />` works; only nested paths and value reads need a real module namespace."
+        });
+      }
       static classDecl(context = {}) {
         return new _VeskError("class declarations are not supported inside Vesk components.", {
           ...context,
@@ -39778,6 +40622,7 @@ init_server_jsgen();
 // ../compiler/src/precompile-runtime.ts
 init_ir();
 init_server_utils();
+init_vsk_imports();
 var IR_CLASSES = [
   ["Expression", Expression.prototype],
   ["IRRoot", IRRoot.prototype],
@@ -39864,7 +40709,11 @@ function precompileFileInternal(source, sourcePath2, seenImportFiles) {
   const bindings = sourcePath2 !== void 0 ? collectModuleBundle(ir.imports, dirname6(sourcePath2), collector) : [];
   const subFiles = [];
   if (sourcePath2 !== void 0) {
-    for (const importPath of collectVskImportPaths(ir.imports, sourcePath2)) {
+    const vskPaths = [
+      ...collectVskImportPaths(ir.imports, sourcePath2),
+      ...collectVskReexportPaths(ir.reexportSources, sourcePath2)
+    ];
+    for (const importPath of vskPaths) {
       if (seenImportFiles.has(importPath)) continue;
       seenImportFiles.add(importPath);
       try {
@@ -40147,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");
@@ -40884,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";
@@ -41001,6 +41864,31 @@ function extractCompiledNodes(code, isTarget) {
 function isModuleLevel(node) {
   return node.type === "ImportDeclaration" || node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration";
 }
+function nativeLibraryImportStubs(code) {
+  let ast;
+  try {
+    ast = parse4(code);
+  } catch {
+    return "";
+  }
+  const body = ast.body ?? [];
+  const bindings = [];
+  for (const node of body) {
+    if (node?.type !== "ImportDeclaration") continue;
+    const src2 = node.source?.value;
+    if (typeof src2 !== "string" || !src2.startsWith("@vesk/") || src2.startsWith("@vesk/runtime")) continue;
+    for (const spec of node.specifiers ?? []) {
+      if (typeof spec?.local?.name === "string") bindings.push([spec.local.name, src2]);
+    }
+  }
+  if (bindings.length === 0) return "";
+  const lines = bindings.map(([local, spec]) => {
+    const message = `web preview: native library "${spec}" has no browser equivalent on the web (dev-only) \u2014 binding "${local}" cannot be provided in vesk dev --web. Build for Android to use it.`;
+    const thrower = `throw Object.assign(new Error(${JSON.stringify(message)}), { __veskPreviewMissing: ${JSON.stringify(spec)} })`;
+    return `const ${local} = new Proxy(function () {}, { get: function () { ${thrower}; }, apply: function () { ${thrower}; }, construct: function () { ${thrower}; } });`;
+  });
+  return lines.join("\n") + "\n\n";
+}
 function demoteExports(code) {
   let ast;
   try {
@@ -41334,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 } = 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 = [];
@@ -41354,6 +42243,11 @@ async function generateClientBundle(routeTree, appDir, componentMap, options) {
       output.push(`Object.defineProperty(__components, ${JSON.stringify(resolvedName)}, { get: () => __components[${JSON.stringify(actualName)}], configurable: true });`);
       output.push(`Object.defineProperty(__hydrators, ${JSON.stringify(resolvedName)}, { get: () => __hydrators[${JSON.stringify(actualName)}], configurable: true });`);
     }
+    for (const alias of aliases || []) {
+      output.push(`Object.defineProperty(__components, ${JSON.stringify(alias.exported)}, { get: () => __components[${JSON.stringify(alias.local)}], configurable: true });`);
+      output.push(`Object.defineProperty(__hydrators, ${JSON.stringify(alias.exported)}, { get: () => __hydrators[${JSON.stringify(alias.local)}], configurable: true });`);
+    }
+    for (const reexportPath of reexportPaths || []) compileFile2(reexportPath, null, output, imports);
     if (cache2 && namesBefore) {
       const st = statSync3(filePath);
       cache2.files.set(filePath, {
@@ -41379,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;
@@ -41491,7 +42386,7 @@ ${entry.code}
           const err = e;
           console.error("[vesk] chunk bundle failed", entry.name, err?.errors?.map((x) => x.text).join(" | ") || err?.message || String(e));
           const stripped = demoteExports(removeCompiledNodes(entry.code, isAnyImport));
-          finalCode = chunkIIFE(stripped);
+          finalCode = chunkIIFE(nativeLibraryImportStubs(entry.code) + stripped);
         } finally {
           try {
             rmSync(tmpBase, { recursive: true, force: true });
@@ -41499,7 +42394,7 @@ ${entry.code}
           }
         }
       } else {
-        finalCode = chunkIIFE(entry.code);
+        finalCode = chunkIIFE(demoteExports(entry.code));
       }
       chunks.push({ name: entry.name, code: finalCode });
     }
@@ -41517,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) {
@@ -41524,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 });
@@ -41573,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: [] };
   }
 }
@@ -41708,7 +42606,7 @@ function appendHmrGlobals(code) {
   return code + "globalThis.__vesk_hmr_eval = (code, n) => {\n  if (!n || n !== globalThis.__vesk_hmr_nonce) throw new Error('vesk hmr: invalid nonce');\n  return eval(code);\n};\n";
 }
 async function buildMainBundle(routeTree, runtimeDir, codeSplit, mono, hmr, importRuntime, runtimeImportNames, routeDataCache) {
-  const baseRuntimeImports = ["createFileRouter", "get", "set", "effect", "track", "destroy_block", "getActiveComponent", "setActiveComponent", "NavLink", "Link", "reactiveProps", "matchRoute", "ensureChunk"];
+  const baseRuntimeImports = ["createFileRouter", "get", "set", "effect", "track", "destroy_block", "getActiveComponent", "setActiveComponent", "NavLink", "Link", "reactiveProps", "matchRoute", "ensureChunk", "toDomNode", "rerenderNode"];
   const allRuntimeImports = runtimeImportNames && runtimeImportNames.size > 0 ? [.../* @__PURE__ */ new Set([...baseRuntimeImports, ...runtimeImportNames])] : baseRuntimeImports;
   const runtimeGlobals = [
     "reconcile",
@@ -42991,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();
@@ -43028,6 +43997,7 @@ init_server_utils();
 init_module_imports();
 init_scan();
 init_tokens();
+init_vsk_imports();
 init_md_inline();
 init_strip_ts();
 import { walk as walk6 } from "zimmerframe";
@@ -43051,6 +44021,47 @@ function simpleGetName2(expr) {
   }
   return inner;
 }
+var BINDING_REF_CALLS2 = ["bindValue", "bindChecked", "bindGroup"];
+function untrackBindingArg2(expr) {
+  let head = -1;
+  for (const name of BINDING_REF_CALLS2) {
+    if (expr.startsWith(`${name}(`)) {
+      head = name.length;
+      break;
+    }
+  }
+  if (head < 0)
+    return expr;
+  const rest = expr.slice(head + 1);
+  if (rest[0] !== "g" || rest[1] !== "e" || rest[2] !== "t" || rest[3] !== "(")
+    return expr;
+  let i = 4;
+  let word = "";
+  for (; i < rest.length; i++) {
+    const c = rest.charCodeAt(i);
+    const ok = c >= 48 && c <= 57 || c >= 65 && c <= 90 || c >= 97 && c <= 122 || c === 95 || c === 36;
+    if (!ok)
+      break;
+    word += rest[i];
+  }
+  if (word.length === 0 || rest[i] !== ")")
+    return expr;
+  const after = i + 1;
+  if (rest[after] !== "," && rest[after] !== ")")
+    return expr;
+  return expr.slice(0, head + 1) + word + rest.slice(after);
+}
+function trackedRefTarget2(expr, tracked2) {
+  const cell = simpleGetName2(expr);
+  if (cell !== null)
+    return cell;
+  if (/^[A-Za-z_$][\w$]*$/.test(expr)) {
+    const info = tracked2.get(expr);
+    if (info && info.kind === "cell" && info.cellName === expr)
+      return expr;
+  }
+  return null;
+}
 function semicolonizeStatement2(code) {
   const trimmed = code.trimEnd();
   if (!trimmed || trimmed.endsWith(";") || trimmed.endsWith("}"))
@@ -43157,6 +44168,21 @@ function transformTracked2(irNode, tracked2) {
       }
       return context.next();
     },
+    Property(node, context) {
+      if (node.shorthand && node.value && node.value.type === "Identifier" && !node.computed) {
+        const info = context.state.get(node.value.name);
+        if (info && info.kind === "virtual") {
+          return {
+            ...node,
+            shorthand: false,
+            value: callExpr2({ type: "Identifier", name: "get" }, [
+              { type: "Identifier", name: info.cellName }
+            ])
+          };
+        }
+      }
+      return context.next();
+    },
     Identifier(node, context) {
       const parent = context.path.at(-1);
       if (parent) {
@@ -43168,6 +44194,8 @@ function transformTracked2(irNode, tracked2) {
           return context.next();
         if (parent.type === "Property" && parent.value === node && parent.key && parent.key.type === "Identifier" && parent.key.name === "into")
           return context.next();
+        if (parent.type === "Property" && parent.key === node && !parent.computed && !parent.shorthand)
+          return context.next();
         if (parent.type === "MemberExpression" && !parent.computed && parent.object === node && parent.property && parent.property.type === "Identifier" && parent.property.name === "set")
           return context.next();
       }
@@ -43195,6 +44223,31 @@ function collectTrackedNames2(body) {
   }
   return names;
 }
+function collectTrackedDeps2(value, tracked2) {
+  const ast = value?.ast;
+  if (!ast || typeof ast !== "object" || tracked2.size === 0)
+    return [];
+  const found = [];
+  const seen = /* @__PURE__ */ new Set();
+  walk6(ast, tracked2, {
+    Identifier(node, context) {
+      const parent = context.path.at(-1);
+      if (parent) {
+        if (parent.type === "MemberExpression" && !parent.computed && parent.property === node)
+          return context.next();
+        if (parent.type === "Property" && parent.key === node)
+          return context.next();
+      }
+      const info = context.state.get(node.name);
+      if (info && !seen.has(node.name)) {
+        seen.add(node.name);
+        found.push(node.name);
+      }
+      return context.next();
+    }
+  });
+  return found;
+}
 function transformTrackedInit2(init, tracked2) {
   if (!init)
     return init;
@@ -43531,8 +44584,9 @@ function emitStatic2(ctx2, node, tracked2, effectsVar, skipK = 0, regionBudget)
         const target = attr.target || "";
         const isEvent2 = target.startsWith("on") && target.length > 2;
         if (target === "ref") {
-          const expr = transformTracked2(attr.expression, tracked2);
-          ctx2.push(`(${expr})(${ssrEl});`);
+          const expr = untrackBindingArg2(transformTracked2(attr.expression, tracked2));
+          const cell = trackedRefTarget2(expr, tracked2);
+          ctx2.push(cell !== null ? `set(${cell}, ${ssrEl});` : `(${expr})(${ssrEl});`);
         } else if (isEvent2) {
           const eventName = target.slice(2).toLowerCase();
           const handler = transformTracked2(attr.expression, tracked2);
@@ -43590,8 +44644,9 @@ function emitStatic2(ctx2, node, tracked2, effectsVar, skipK = 0, regionBudget)
     const target = attr.target || "";
     const isEvent2 = target.startsWith("on") && target.length > 2;
     if (target === "ref") {
-      const expr = transformTracked2(attr.expression, tracked2);
-      ctx2.push(`(${expr})(${el});`);
+      const expr = untrackBindingArg2(transformTracked2(attr.expression, tracked2));
+      const cell = trackedRefTarget2(expr, tracked2);
+      ctx2.push(cell !== null ? `set(${cell}, ${el});` : `(${expr})(${el});`);
     } else if (isEvent2) {
       const eventName = target.slice(2).toLowerCase();
       const handler = transformTracked2(attr.expression, tracked2);
@@ -43810,20 +44865,35 @@ function emitComponentCall2(ctx2, node, tracked2, effectsVar, parentVar, compPre
   const calleeExpr = node.calleeExpr ? `(${node.calleeExpr})` : null;
   const slotChildren = node.children.filter((c) => c instanceof PropSlot);
   const regChildren = node.children.filter((c) => !(c instanceof PropSlot));
-  const callArgs = () => `{ ${propsEntries.join(", ")} }`;
+  const plainTarget = !!(calleeExpr || ctx2.importedNames.has(node.componentName)) && !ctx2.selfClaimNames.has(node.componentName);
+  const trackedDeps = [];
+  if (plainTarget) {
+    for (const p of node.props) {
+      if (typeof p.value === "string")
+        continue;
+      for (const d of collectTrackedDeps2(p.value, tracked2))
+        if (!trackedDeps.includes(d))
+          trackedDeps.push(d);
+    }
+    for (const sp of node.spreadProps) {
+      for (const d of collectTrackedDeps2(sp, tracked2))
+        if (!trackedDeps.includes(d))
+          trackedDeps.push(d);
+    }
+  }
+  const callArgs = () => plainTarget ? `reactiveProps({ ${propsEntries.join(", ")} })` : `{ ${propsEntries.join(", ")} }`;
   if (ctx2.hydrate) {
     const access = calleeExpr ?? (ctx2.importedNames.has(node.componentName) ? node.componentName : `__components[${JSON.stringify(node.componentName)}]`);
     if (!calleeExpr && !ctx2.importedNames.has(node.componentName)) {
       ctx2.push(`if (${access} == null) throw new Error(${JSON.stringify(`Component "${node.componentName}" was not found while rendering. Declare it with the \`component\` keyword, import it, or register it in the component registry.`)});`);
     }
-    const plainTarget = !!(calleeExpr || ctx2.importedNames.has(node.componentName)) && !ctx2.selfClaimNames.has(node.componentName);
     const walkerArg = ctx2.walker;
     const promptExpr = ctx2.markerless && (regionBudget || skipK > 0) ? markerlessSkipExpr2(regionBudget, skipK) : null;
     const maybeReplace = (v2) => {
       if (!plainTarget)
         return;
       const claim = promptExpr ? `${walkerArg}.claimOnly(undefined, ${promptExpr})` : `${walkerArg}.claimOnly()`;
-      ctx2.push(`if (${v2} && ${v2}.parentNode == null && ${v2}.nodeType !== 11) { const __sr = ${claim}; if (__sr && __sr.parentNode) __sr.parentNode.replaceChild(${v2}, __sr); }`);
+      ctx2.push(`if (${v2} && ${v2}.parentNode == null) { if (${v2}.nodeType === 11) { const __cnt = ${v2}.childNodes.length; let __sr = null; for (let __i = 0; __i < __cnt; __i++) { const __c = ${claim}; if (__c && __c.parentNode) { if (__sr) { __c.remove(); } else { __sr = __c; } } } if (__sr) { const __p = __sr.parentNode; while (${v2}.firstChild) __p.insertBefore(${v2}.firstChild, __sr); __p.removeChild(__sr); } } else { const __sr = ${claim}; if (__sr && __sr.parentNode) __sr.parentNode.replaceChild(${v2}, __sr); } }`);
       if (regionBudget && ctx2.markerless)
         ctx2.push(`${regionBudget} = 0;`);
     };
@@ -43862,11 +44932,17 @@ function emitComponentCall2(ctx2, node, tracked2, effectsVar, parentVar, compPre
     }
     ctx2.push(`let ${v} = undefined;`);
     ctx2.push(`if (__hydrate) __hydrate.childFrame = (__hydrate.childFrame || 0) + 1;`);
-    ctx2.push(`try { ${v} = ${awaitKw}${access}(${callArgs()}, __registry, ${walkerArg}); } finally { if (__hydrate) __hydrate.childFrame--; }`);
+    ctx2.push(`try { ${v} = toDomNode(${awaitKw}${access}(${callArgs()}, __registry, ${walkerArg})); } finally { if (__hydrate) __hydrate.childFrame--; }`);
+    const rootsVar = trackedDeps.length > 0 ? ctx2.n() : null;
+    if (rootsVar)
+      ctx2.push(`const ${rootsVar} = ${v} && ${v}.nodeType === 11 ? Array.from(${v}.childNodes) : [${v}];`);
     if (ctx2.markerless && promptExpr && !plainTarget && regionBudget)
       ctx2.push(`${regionBudget} = 0;`);
     maybeReplace(v);
     maybeRetire();
+    if (trackedDeps.length > 0) {
+      ctx2.push(`rerenderNode(${rootsVar}, [${trackedDeps.join(", ")}], () => ${awaitKw}${access}(${callArgs()}, __registry, ${walkerArg}));`);
+    }
     return v;
   } else {
     for (const slot of slotChildren) {
@@ -43890,12 +44966,18 @@ function emitComponentCall2(ctx2, node, tracked2, effectsVar, parentVar, compPre
       propsEntries.push(`children: ${frag}`);
     }
     if (calleeExpr) {
-      ctx2.push(`const ${v} = ${calleeExpr}(${callArgs()});`);
+      ctx2.push(`const ${v} = toDomNode(${calleeExpr}(${callArgs()}));`);
     } else if (ctx2.importedNames.has(node.componentName)) {
-      ctx2.push(`const ${v} = ${awaitKw}${node.componentName}(${callArgs()});`);
+      ctx2.push(`const ${v} = toDomNode(${awaitKw}${node.componentName}(${callArgs()}));`);
     } else {
       ctx2.push(`if (${compPrefix}[${JSON.stringify(node.componentName)}] == null) throw new Error(${JSON.stringify(`Component "${node.componentName}" was not found while rendering. Declare it with the \`component\` keyword, import it, or register it in the component registry.`)});`);
-      ctx2.push(`const ${v} = ${awaitKw}${compPrefix}[${JSON.stringify(node.componentName)}](${callArgs()});`);
+      ctx2.push(`const ${v} = toDomNode(${awaitKw}${compPrefix}[${JSON.stringify(node.componentName)}](${callArgs()}));`);
+    }
+    if (trackedDeps.length > 0) {
+      const calleeRef = calleeExpr ?? (ctx2.importedNames.has(node.componentName) ? node.componentName : `${compPrefix}[${JSON.stringify(node.componentName)}]`);
+      const rootsVar2 = ctx2.n();
+      ctx2.push(`const ${rootsVar2} = ${v} && ${v}.nodeType === 11 ? Array.from(${v}.childNodes) : [${v}];`);
+      ctx2.push(`rerenderNode(${rootsVar2}, [${trackedDeps.join(", ")}], () => ${awaitKw}${calleeRef}(${callArgs()}));`);
     }
   }
   return v;
@@ -45135,7 +46217,7 @@ function emitClientFromIR2(ir, options) {
     }
   }
   const exportCode = exportLines.join("\n");
-  const runtimeNames = ["track", "get", "set", "destroy_block", "getActiveComponent", "setActiveComponent", "reactiveProps", "applyStyle"];
+  const runtimeNames = ["track", "get", "set", "destroy_block", "getActiveComponent", "setActiveComponent", "reactiveProps", "applyStyle", "toDomNode", "rerenderNode"];
   if (ir.components.some((c) => !isStaticIR2(c.body)))
     runtimeNames.push("effect");
   for (const name of usedRuntimeBindings2(ir))
@@ -45203,12 +46285,20 @@ function compileClientBoth2(source, _componentName, sourcePath2, opts) {
   }
   const alloc = nameAllocFor2(sourcePath2);
   const comp = emitClientFromIR2(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 };
+    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
+    name,
+    aliases,
+    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)
   };
 }
 
@@ -46407,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();
@@ -46529,6 +47620,35 @@ function extractCompiledNodes2(code, isTarget) {
 function isModuleLevel2(node) {
   return node.type === "ImportDeclaration" || node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration";
 }
+function nativeLibraryImportStubs2(code) {
+  let ast;
+  try {
+    ast = parse4(code);
+  } catch {
+    return "";
+  }
+  const body = ast.body ?? [];
+  const bindings = [];
+  for (const node of body) {
+    if (node?.type !== "ImportDeclaration")
+      continue;
+    const src2 = node.source?.value;
+    if (typeof src2 !== "string" || !src2.startsWith("@vesk/") || src2.startsWith("@vesk/runtime"))
+      continue;
+    for (const spec of node.specifiers ?? []) {
+      if (typeof spec?.local?.name === "string")
+        bindings.push([spec.local.name, src2]);
+    }
+  }
+  if (bindings.length === 0)
+    return "";
+  const lines = bindings.map(([local, spec]) => {
+    const message = `web preview: native library "${spec}" has no browser equivalent on the web (dev-only) \u2014 binding "${local}" cannot be provided in vesk dev --web. Build for Android to use it.`;
+    const thrower = `throw Object.assign(new Error(${JSON.stringify(message)}), { __veskPreviewMissing: ${JSON.stringify(spec)} })`;
+    return `const ${local} = new Proxy(function () {}, { get: function () { ${thrower}; }, apply: function () { ${thrower}; }, construct: function () { ${thrower}; } });`;
+  });
+  return lines.join("\n") + "\n\n";
+}
 function demoteExports2(code) {
   let ast;
   try {
@@ -46895,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 } = 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 = [];
@@ -46918,6 +48040,12 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options) {
       output.push(`Object.defineProperty(__components, ${JSON.stringify(resolvedName)}, { get: () => __components[${JSON.stringify(actualName)}], configurable: true });`);
       output.push(`Object.defineProperty(__hydrators, ${JSON.stringify(resolvedName)}, { get: () => __hydrators[${JSON.stringify(actualName)}], configurable: true });`);
     }
+    for (const alias of aliases || []) {
+      output.push(`Object.defineProperty(__components, ${JSON.stringify(alias.exported)}, { get: () => __components[${JSON.stringify(alias.local)}], configurable: true });`);
+      output.push(`Object.defineProperty(__hydrators, ${JSON.stringify(alias.exported)}, { get: () => __hydrators[${JSON.stringify(alias.local)}], configurable: true });`);
+    }
+    for (const reexportPath of reexportPaths || [])
+      compileFile2(reexportPath, null, output, imports);
     if (cache2 && namesBefore) {
       const st = statSync14(filePath);
       cache2.files.set(filePath, {
@@ -46943,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;
@@ -47061,7 +48190,7 @@ ${entry.code}
           const err = e;
           console.error("[vesk] chunk bundle failed", entry.name, err?.errors?.map((x) => x.text).join(" | ") || err?.message || String(e));
           const stripped = demoteExports2(removeCompiledNodes2(entry.code, isAnyImport2));
-          finalCode = chunkIIFE(stripped);
+          finalCode = chunkIIFE(nativeLibraryImportStubs2(entry.code) + stripped);
         } finally {
           try {
             rmSync4(tmpBase, { recursive: true, force: true });
@@ -47069,7 +48198,7 @@ ${entry.code}
           }
         }
       } else {
-        finalCode = chunkIIFE(entry.code);
+        finalCode = chunkIIFE(demoteExports2(entry.code));
       }
       chunks.push({ name: entry.name, code: finalCode });
     }
@@ -47088,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) {
@@ -47096,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 });
@@ -47155,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: [] };
   }
 }
@@ -47292,7 +48425,7 @@ function appendHmrGlobals2(code) {
   return code + "globalThis.__vesk_hmr_eval = (code, n) => {\n  if (!n || n !== globalThis.__vesk_hmr_nonce) throw new Error('vesk hmr: invalid nonce');\n  return eval(code);\n};\n";
 }
 async function buildMainBundle2(routeTree, runtimeDir, codeSplit, mono, hmr, importRuntime, runtimeImportNames, routeDataCache) {
-  const baseRuntimeImports = ["createFileRouter", "get", "set", "effect", "track", "destroy_block", "getActiveComponent", "setActiveComponent", "NavLink", "Link", "reactiveProps", "matchRoute", "ensureChunk"];
+  const baseRuntimeImports = ["createFileRouter", "get", "set", "effect", "track", "destroy_block", "getActiveComponent", "setActiveComponent", "NavLink", "Link", "reactiveProps", "matchRoute", "ensureChunk", "toDomNode", "rerenderNode"];
   const allRuntimeImports = runtimeImportNames && runtimeImportNames.size > 0 ? [.../* @__PURE__ */ new Set([...baseRuntimeImports, ...runtimeImportNames])] : baseRuntimeImports;
   const runtimeGlobals = [
     "reconcile",
@@ -53292,11 +54425,11 @@ ${prettifyHtml(body)}
 </html>`;
     return applyHtmlPlugins(fullHtml, ctx2.plugins, { sourcePath: ctx2.url.pathname });
   }
-  const leaf = chain.find((n) => n.page);
-  if (!leaf) return null;
-  const src2 = readFileSync37(resolve37(ctx2.appDirPath, leaf.sourceDir, "page.vsk"), "utf-8");
-  const compName = resolveComponentName(src2) || leaf.page;
-  const html = await renderFullPage(src2, compName, { params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: actionCssUrls(ctx2.appDirPath), security: ctx2.security, sourcePath: resolve37(ctx2.appDirPath, leaf.sourceDir, "page.vsk"), plugins: ctx2.plugins });
+  const leaf2 = chain.find((n) => n.page);
+  if (!leaf2) return null;
+  const src2 = readFileSync37(resolve37(ctx2.appDirPath, leaf2.sourceDir, "page.vsk"), "utf-8");
+  const compName = resolveComponentName(src2) || leaf2.page;
+  const html = await renderFullPage(src2, compName, { params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: actionCssUrls(ctx2.appDirPath), security: ctx2.security, sourcePath: resolve37(ctx2.appDirPath, leaf2.sourceDir, "page.vsk"), plugins: ctx2.plugins });
   return applyHtmlPlugins(html.replace("</body>", '	<script type="module" src="/_vesk/hmr.js"></script>\n</body>'), ctx2.plugins, { sourcePath: ctx2.url.pathname });
 }
 async function handleActionRequest(req, res, ctx2) {
@@ -53689,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",
@@ -54237,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;
@@ -54381,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) {
@@ -54688,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 = "";
@@ -54753,11 +55921,11 @@ ${prettifyHtml(body)}
             html = injectDevScripts(html);
             html = await applyHtmlPlugins(html, getActiveDevPlugins(), { sourcePath: url.pathname });
           } else {
-            const leaf = chain.find((n) => n.page);
-            if (leaf) {
-              const src2 = readFileSync38(resolve38(appDirPath, leaf.sourceDir, "page.vsk"), "utf-8");
-              const compName = extractCompName2(src2) || leaf.page;
-              html = await renderFullPage(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: resolve38(appDirPath, leaf.sourceDir, "page.vsk"), cached: cachedSsrCompile(ssrCompileCache, src2, resolve38(appDirPath, leaf.sourceDir, "page.vsk")), plugins: getActiveDevPlugins() });
+            const leaf2 = chain.find((n) => n.page);
+            if (leaf2) {
+              const src2 = readFileSync38(resolve38(appDirPath, leaf2.sourceDir, "page.vsk"), "utf-8");
+              const compName = extractCompName2(src2) || leaf2.page;
+              html = await renderFullPage(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: resolve38(appDirPath, leaf2.sourceDir, "page.vsk"), cached: cachedSsrCompile(ssrCompileCache, src2, resolve38(appDirPath, leaf2.sourceDir, "page.vsk")), plugins: getActiveDevPlugins() });
               html = html.replace("</body>", '	<script type="module" src="/_vesk/hmr.js"></script>\n</body>');
               html = await applyHtmlPlugins(html, getActiveDevPlugins(), { sourcePath: url.pathname });
             } else {
@@ -54767,27 +55935,26 @@ ${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;
         const hasLayout = chain.some((n) => n.layout && existsSync42(resolve38(appDirPath, n.sourceDir, "layout.vsk")));
         if (!hasLayout) {
-          const leaf = chain.find((n) => n.page);
-          if (leaf) {
-            const src2 = readFileSync38(resolve38(appDirPath, leaf.sourceDir, "page.vsk"), "utf-8");
-            const compName = extractCompName2(src2) || leaf.page;
-            yield* renderPageStream(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: resolve38(appDirPath, leaf.sourceDir, "page.vsk"), cached: cachedSsrCompile(ssrCompileCache, src2, resolve38(appDirPath, leaf.sourceDir, "page.vsk")), plugins: getActiveDevPlugins() });
+          const leaf2 = chain.find((n) => n.page);
+          if (leaf2) {
+            const src2 = readFileSync38(resolve38(appDirPath, leaf2.sourceDir, "page.vsk"), "utf-8");
+            const compName = extractCompName2(src2) || leaf2.page;
+            yield* renderPageStream(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: resolve38(appDirPath, leaf2.sourceDir, "page.vsk"), cached: cachedSsrCompile(ssrCompileCache, src2, resolve38(appDirPath, leaf2.sourceDir, "page.vsk")), plugins: getActiveDevPlugins() });
           } else {
             throw new Error("No page or layout matched");
           }
@@ -54841,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;
         }
       }
@@ -55071,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();
@@ -55242,11 +56412,15 @@ __export(index_server_exports2, {
   get_server_context: () => get_server_context,
   headers: () => headers,
   isFormAction: () => isFormAction,
+  isLeaf: () => isLeaf,
   isLoadingActive: () => isLoadingActive,
+  isPrimitive: () => isPrimitive,
+  isVeskComponent: () => isVeskComponent,
   is_destroyed: () => is_destroyed,
   isr: () => isr,
   isrConfigToRevalidate: () => isrConfigToRevalidate,
   issuesToFieldMap: () => issuesToFieldMap,
+  leaf: () => leaf,
   locals: () => locals,
   maxLength: () => maxLength,
   minLength: () => minLength,
@@ -55260,12 +56434,14 @@ __export(index_server_exports2, {
   permanentRedirect: () => permanentRedirect,
   pop_component: () => pop_component,
   pre_effect: () => pre_effect,
+  primitive: () => primitive,
   push_component: () => push_component,
   readSignedCookie: () => readSignedCookie2,
   redirect: () => redirect,
   removeHook: () => removeHook,
   render: () => render,
   required: () => required,
+  rerenderNode: () => rerenderNode,
   resolveSsrResources: () => resolveSsrResources,
   resume_block: () => resume_block,
   revalidateComponent: () => revalidateComponent,
@@ -55289,6 +56465,7 @@ __export(index_server_exports2, {
   set_server_context: () => set_server_context,
   signCookie: () => signCookie2,
   tick: () => tick,
+  toDomNode: () => toDomNode,
   track: () => track,
   unlink_block: () => unlink_block,
   unsignCookie: () => unsignCookie2,
@@ -55324,6 +56501,7 @@ init_experiment();
 init_form();
 init_md();
 init_headless();
+init_primitive();
 init_loading_indicator();
 init_action();