@vesk/vesk-cli 0.2.57 → 0.2.59

package/dist/cli.js

@@ -3369,6 +3369,17 @@ ${String(this.root.outerHTML).slice(0, 800)}` : ""),
       // callee's first claim and resets the deposit so later claims stay
       // positional against the advancing cursor. Consumed synchronously on the
       // same walker reference the call was made through.
+      //
+      // The deposit is ALSO consumed implicitly by the next claim made through this
+      // walker when the caller passed no explicit skipK. A component written in plain
+      // JS (lucide-vesk icons are the common case) never calls `takeSkipK`, so
+      // before this the deposit was silently dropped: the icon's `nextElement("svg")`
+      // claimed the slot still holding the STATIC residue in front of it
+      // (`<button><span>Apply Now</span><svg/></button>`), the descriptor missed on
+      // `<span>`, and the walker detached server-rendered content that no client
+      // program had any intention of replacing. Implicit consumption keeps static
+      // residue out of the way for plain-JS components exactly as it is for
+      // compiled ones.
       inheritOffset = 0;
       injectSkipK(n) {
         this.inheritOffset = n;
@@ -3382,7 +3393,11 @@ ${String(this.root.outerHTML).slice(0, 800)}` : ""),
         if (globalThis.__vesk_hydrate_debug) {
           console.error("[hyd-dbg] claimAt", tag, "skip=", skipK, "idx=", this.idx, "els=", this.els.length);
         }
-        let target = this.advancePastSkippable(this.idx + (skipK || 0));
+        let offset2 = skipK || 0;
+        const inherited = this.inheritOffset;
+        this.inheritOffset = 0;
+        if (!offset2) offset2 = inherited;
+        let target = this.advancePastSkippable(this.idx + offset2);
         if (target > this.els.length) target = this.idx;
         while (target < this.els.length) {
           const el = this.els[target];
@@ -21909,6 +21924,7 @@ function warnStaleConstBindings(comp, file) {
     for (const d of st.declarations || []) {
       if (d.id?.type !== "Identifier" || !d.init) continue;
       if (reactive.has(d.id.name)) continue;
+      if (d.init.type === "ArrowFunctionExpression" || d.init.type === "FunctionExpression") continue;
       if (d.init.type === "Identifier" && reactive.has(d.init.name)) continue;
       const seen = /* @__PURE__ */ new Set();
       collectIdentifiers(d.init, seen);
@@ -30704,6 +30720,9 @@ function isReactiveExpression(node, tracked2) {
   if (!ast) return false;
   let reactive = false;
   walk4(ast, tracked2, {
+    CallExpression() {
+      reactive = true;
+    },
     Identifier(n, context) {
       if (reactive) return;
       const parent = context.path.at(-1);
@@ -30831,7 +30850,7 @@ function emitComponentCall(ctx2, node, tracked2, effectsVar, parentVar, compPref
       ctx2.push(`return $f; })();`);
       propsEntries.push(`children: ${frag}`);
     }
-    if (ctx2.markerless && promptExpr && !plainTarget) {
+    if (ctx2.markerless && promptExpr) {
       ctx2.push(`${walkerArg}.injectSkipK(${promptExpr});`);
     }
     ctx2.push(`let ${v} = undefined;`);
@@ -31669,6 +31688,18 @@ function generateComponent(comp, importedNames = /* @__PURE__ */ new Set(), hydr
       `(typeof __hydrate.takeSkipK === 'function' ? __hydrate.takeSkipK() : 0)`
     );
   }
+  if (ctx2.hydrate) {
+    const bodyNodes = comp.body.filter((node) => !(node instanceof TrackDecl));
+    const slotless = (node) => node instanceof StaticNode || node instanceof TextNode || node instanceof RuntimeStatement || node instanceof DynamicBinding && node.kind === "text";
+    const claimless = bodyNodes.every((node) => slotless(node) && !claimsWalkerNode(ctx2, node));
+    if (claimless) {
+      const slots = bodyNodes.filter((node) => node instanceof StaticNode).length;
+      for (let i = 0; i < slots; i++) {
+        ctx2.push(indent2(`__hydrate.claimOnly(undefined, ${i === 0 && topBudget ? topBudget : "0"});`));
+        if (i === 0 && topBudget) ctx2.push(indent2(`${topBudget} = 0;`));
+      }
+    }
+  }
   for (const node of comp.body) {
     if (node instanceof TrackDecl) continue;
     const v = emitNode(ctx2, node, tracked2, null, void 0, "__components", topPendingSkip, topBudget || void 0);
@@ -31693,7 +31724,16 @@ function generateComponent(comp, importedNames = /* @__PURE__ */ new Set(), hydr
     ctx2.push(indent2(`if ($mount === null) $mount = document.createDocumentFragment();`));
     ctx2.push(indent2(`return __pendingChild || $mount;`));
   } else {
-    ctx2.push(indent2(`return __pendingChild || $root;`));
+    const hasBareSlot = comp.body.some((node) => node instanceof SlotNode);
+    if (hasBareSlot) {
+      ctx2.push(indent2(`if (__pendingChild !== null && __pendingChild !== undefined) {`));
+      ctx2.push(indent2(`  if (typeof __pendingChild.then === 'function') return __pendingChild.then((__c) => { $root.appendChild(toDomNode(__c)); return $root; });`));
+      ctx2.push(indent2(`  const __c = toDomNode(__pendingChild);`));
+      ctx2.push(indent2(`  if ($root.childNodes.length === 0) return __c;`));
+      ctx2.push(indent2(`  $root.appendChild(__c);`));
+      ctx2.push(indent2(`}`));
+    }
+    ctx2.push(indent2(hasBareSlot ? `return $root;` : `return __pendingChild || $root;`));
   }
   ctx2.push(indent2(`} finally {`));
   ctx2.push(indent2(`	setActiveComponent(__prev);`));
@@ -49507,6 +49547,34 @@ function demoteExports(code) {
 function chunkHasImports(headLen, mergeAborted) {
   return headLen > 0 || mergeAborted;
 }
+function runtimeImportsOf(filePath) {
+  let text;
+  try {
+    text = readFileSync11(filePath, "utf8");
+  } catch {
+    return [];
+  }
+  const names = [];
+  const pattern2 = /import\s+(type\s+)?\{([^}]*)\}\s*from\s*['"]@vesk\/runtime[^'"]*['"]/g;
+  for (const match of text.matchAll(pattern2)) {
+    if (match[1]) continue;
+    for (const part of match[2].split(",")) {
+      const cleaned = part.trim().replace(/^type\s+/, "");
+      if (!cleaned) continue;
+      const name = cleaned.split(/\s+as\s+/)[0].trim();
+      if (name) names.push(name);
+    }
+  }
+  return names;
+}
+function sharedRuntimeResolver(shimPath) {
+  return {
+    name: "vesk-shared-runtime",
+    setup(build4) {
+      build4.onResolve({ filter: /^@vesk\/runtime(\/.*)?$/ }, () => ({ path: shimPath }));
+    }
+  };
+}
 var ChunkImports = class {
   bySource = /* @__PURE__ */ new Map();
   aborted = false;
@@ -49604,6 +49672,20 @@ var ChunkImports = class {
   get reason() {
     return this.abortReason;
   }
+  /** Every import source this chunk's merged block pulls in (absolute paths). */
+  sources() {
+    return this.aborted ? [] : [...this.bySource.keys()];
+  }
+  /**
+   * The named bindings this chunk imports from `source`, so a shared-module
+   * shim can re-export exactly what consumers use (re-exporting `*` from the
+   * real module would drag it back into the chunk being built).
+   */
+  bindingsFor(source) {
+    const group = this.bySource.get(source);
+    if (!group) return { named: [], hasDefault: false };
+    return { named: [...group.named.keys()].sort(), hasDefault: !!group.default };
+  }
   /** Renders the deduped import block (empty string when there are no imports). */
   render() {
     if (this.aborted || this.bySource.size === 0) return "";
@@ -49739,6 +49821,7 @@ async function generateClientBundle(routeTree, appDir, componentMap, options) {
   let cachedFileHits = 0;
   let compiledFiles = 0;
   let mainFromCache = false;
+  let sharedModuleBundle = "";
   function mustReuseWithoutStat(filePath) {
     return !!only && !only.has(filePath);
   }
@@ -49924,7 +50007,7 @@ async function generateClientBundle(routeTree, appDir, componentMap, options) {
           if (!chunkImports.ok) console.error("[vesk] chunk import merge aborted for", chunkName + ":", chunkImports.reason);
           const head = chunkImports.render();
           const code = (head ? head + "\n\n" : "") + chunkCode.join("\n\n");
-          chunkEntries.push({ name: chunkName, code, node, imports: chunkHasImports(head.length, !chunkImports.ok) });
+          chunkEntries.push({ name: chunkName, code, node, importsTable: chunkImports, imports: chunkHasImports(head.length, !chunkImports.ok) });
         }
         walkSplit2(node.children || [], [..._chain, node]);
       }
@@ -49953,7 +50036,7 @@ async function generateClientBundle(routeTree, appDir, componentMap, options) {
       if (!sharedImports.ok) console.error("[vesk] chunk import merge aborted for shared.js:", sharedImports.reason);
       const head = sharedImports.render();
       const code = (head ? head + "\n\n" : "") + sharedCode.join("\n\n");
-      chunkEntries.push({ name: "shared.js", code, node: null, imports: chunkHasImports(head.length, !sharedImports.ok) });
+      chunkEntries.push({ name: "shared.js", code, node: null, importsTable: sharedImports, imports: chunkHasImports(head.length, !sharedImports.ok) });
     }
     const chunkIIFE = (body) => `(()=>{
 const __components = globalThis.__components || (globalThis.__components = {});
@@ -49961,6 +50044,98 @@ const __hydrators = globalThis.__hydrators || (globalThis.__hydrators = {});
 ${body}
 })();
 `;
+    const sharedUsage = /* @__PURE__ */ new Map();
+    for (const entry of chunkEntries) {
+      for (const source of new Set(entry.importsTable.sources())) {
+        sharedUsage.set(source, (sharedUsage.get(source) ?? 0) + 1);
+      }
+    }
+    const isAppLocal = (source) => !source.includes("node_modules") && source.startsWith(resolve10(appDir, ".."));
+    const sharedSources = [...sharedUsage.entries()].filter(([source, uses]) => uses > 1 && isAppLocal(source)).map(([source]) => source);
+    if (process.env.VESK_DEBUG_SHARED) {
+      console.error("[shared] candidates:", [...sharedUsage.entries()].map(([s, n]) => `${n}x ${s}`).join("\n"));
+      console.error("[shared] selected:", sharedSources.join(", "));
+    }
+    const chunkAlias = {};
+    let sharedBundleCode = "";
+    const sharedRuntimeNames = /* @__PURE__ */ new Set();
+    if (sharedSources.length > 0) {
+      const tmpBase = mkdtempSync(join7(resolve10(appDir, ".."), "tmp-vesk-shared-"));
+      try {
+        const sharedEntry = join7(tmpBase, "shared-entry.js");
+        const lines = [];
+        const members = [];
+        sharedSources.forEach((source, i) => {
+          lines.push(`import * as m${i} from ${JSON.stringify(source)};`);
+          members.push(`  ${JSON.stringify(source)}: m${i},`);
+        });
+        lines.push(`globalThis.__veskShared = { ${members.join("\n")} };`);
+        writeFileSync4(sharedEntry, lines.join("\n"));
+        const appTsconfig = findTsconfigPath(appDir);
+        const runtimeShim = join7(tmpBase, "runtime-shim.js");
+        const runtimeLines = [
+          "// ONE runtime instance: the entry bundle publishes these on globalThis,",
+          "// and route chunks import the same functions. A second bundled copy",
+          "// would mean a second Cell class and a second currentEffect.",
+          "const __r = (n) => (...args) => globalThis[n](...args);"
+        ];
+        for (const source of sharedSources) {
+          for (const name of runtimeImportsOf(source)) sharedRuntimeNames.add(name);
+        }
+        for (const name of [...sharedRuntimeNames].sort()) {
+          runtimeLines.push(`export const ${name} = __r(${JSON.stringify(name)});`);
+        }
+        writeFileSync4(runtimeShim, runtimeLines.join("\n") + "\n");
+        const result = await build({
+          entryPoints: [sharedEntry],
+          bundle: true,
+          format: "iife",
+          platform: "browser",
+          write: false,
+          logLevel: "silent",
+          loader: { ".js": "tsx" },
+          legalComments: "none",
+          // `@vesk/runtime` MUST stay the entry bundle's instance. Bundling a
+          // second copy in here gives the app a second `Cell` class and a
+          // second `currentEffect` variable: a store cell written from a click
+          // notifies subscribers registered against the OTHER copy, so nothing
+          // the store drives ever updates — writes land, no error, no repaint.
+          plugins: [sharedRuntimeResolver(runtimeShim)],
+          ...appTsconfig ? { tsconfig: appTsconfig } : {}
+        });
+        sharedBundleCode = result.outputFiles[0].text;
+        sharedSources.forEach((source, i) => {
+          const named = /* @__PURE__ */ new Set();
+          let hasDefault = false;
+          for (const entry of chunkEntries) {
+            const bindings = entry.importsTable.bindingsFor(source);
+            bindings.named.forEach((n) => named.add(n));
+            hasDefault = hasDefault || bindings.hasDefault;
+          }
+          const shim = join7(tmpBase, `shim-${i}.js`);
+          const shimLines = [`const m = globalThis.__veskShared[${JSON.stringify(source)}];`];
+          if (hasDefault) shimLines.push(`export default m;`);
+          for (const name of [...named].sort()) {
+            shimLines.push(`export const ${name} = m[${JSON.stringify(name)}];`);
+          }
+          writeFileSync4(shim, shimLines.join("\n") + "\n");
+          chunkAlias[source] = shim;
+        });
+      } catch (e) {
+        console.error("[vesk] shared-module pass failed; falling back to per-chunk inlining:", e.message);
+        sharedBundleCode = "";
+        for (const key of Object.keys(chunkAlias)) delete chunkAlias[key];
+      }
+    }
+    const sharedRedirectPlugin = Object.keys(chunkAlias).length > 0 ? {
+      name: "vesk-shared-modules",
+      setup(build4) {
+        build4.onResolve({ filter: /.*/ }, (args2) => {
+          const mapped = chunkAlias[args2.path];
+          return mapped ? { path: mapped } : null;
+        });
+      }
+    } : null;
     for (const entry of chunkEntries) {
       if (!entry.code.trim()) continue;
       let finalCode;
@@ -49989,6 +50164,13 @@ ${entry.code}
             // for a dependency stays in its own package; shipping every
             // module's header inside our own chunk adds nothing.
             legalComments: "none",
+            // Shared app modules are NOT inlined here: the resolver below
+            // redirects them to a generated shim reading
+            // `globalThis.__veskShared`, so the single copy in
+            // shared-modules.js serves every route chunk. (esbuild's `alias`
+            // option only accepts bare package names, so this is a resolver
+            // rather than a map.)
+            ...sharedRedirectPlugin ? { plugins: [sharedRedirectPlugin] } : {},
             ...appTsconfig ? { tsconfig: appTsconfig } : {}
           });
           finalCode = result.outputFiles[0].text;
@@ -50016,13 +50198,15 @@ ${entry.code}
       chunks.push({ name: entry.name, code: finalCode });
     }
     annotate2(routeTree);
-    const mainKey = JSON.stringify(routeTree) + "|" + [...runtimeImportNames].sort().join(",") + `|${!!options?.hmr}|${!!options?.importRuntime}|${options?.routeDataCache ?? ""}`;
+    sharedModuleBundle = sharedBundleCode;
+    for (const name of sharedRuntimeNames) runtimeImportNames.add(name);
+    const mainKey = JSON.stringify(routeTree) + "|" + [...runtimeImportNames].sort().join(",") + `|${!!options?.hmr}|${!!options?.importRuntime}|${options?.routeDataCache ?? ""}|${sharedModuleBundle.length}`;
     let main;
     if (cache2?.mainBundle && cache2.mainBundle.key === mainKey) {
       mainFromCache = true;
       main = cache2.mainBundle.code;
     } else {
-      main = await buildMainBundle(routeTree, runtimeDir, true, {}, !!options?.hmr, !!options?.importRuntime, runtimeImportNames, options?.routeDataCache);
+      main = await buildMainBundle(routeTree, runtimeDir, true, {}, !!options?.hmr, !!options?.importRuntime, runtimeImportNames, options?.routeDataCache, sharedModuleBundle);
       if (cache2) cache2.mainBundle = { key: mainKey, code: main };
     }
     const transformedChunks = [];
@@ -50223,7 +50407,7 @@ export { ${unique.join(", ")} };
 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) {
+async function buildMainBundle(routeTree, runtimeDir, codeSplit, mono, hmr, importRuntime, runtimeImportNames, routeDataCache, sharedModuleBundle = "") {
   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 = [
@@ -50292,7 +50476,11 @@ if (__pendChunks.length > 0 && typeof ensureChunk === 'function') {
 `).join("") + "globalThis.__runtime_comps = __runtime_comps;\nglobalThis.__cleanup = __cleanup;\nglobalThis.__place = __place;\n\n";
     const extraGlobals = [...runtimeImportNames || []].filter((n) => n && n !== "default").map((n) => `globalThis.${n} = ${n};
 `).join("");
-    const code2 = preamble + "const __components = globalThis.__components || (globalThis.__components = {});\nconst __hydrators = globalThis.__hydrators || (globalThis.__hydrators = {});\nconst __runtime_comps = __components;\n\n" + runtimeGlobals2 + extraGlobals + cleanupFn + placeFn + "globalThis.__components = __components;\n" + resolveNamesFn + updateComponentsFn + "const __routeTree = " + routeTreeJson + ";\n__resolveNames(__routeTree);\n" + pendCode + startRouterCode;
+    const code2 = preamble + "const __components = globalThis.__components || (globalThis.__components = {});\nconst __hydrators = globalThis.__hydrators || (globalThis.__hydrators = {});\nconst __runtime_comps = __components;\n\n" + runtimeGlobals2 + extraGlobals + // Shared app modules run HERE: after the runtime bindings are published,
+    // before anything can request a route chunk. Earlier (at the top of the
+    // bundle) `globalThis.track` was still undefined, so every module-scope
+    // cell in a store was created against a missing runtime.
+    (sharedModuleBundle ? sharedModuleBundle + "\n" : "") + cleanupFn + placeFn + "globalThis.__components = __components;\n" + resolveNamesFn + updateComponentsFn + "const __routeTree = " + routeTreeJson + ";\n__resolveNames(__routeTree);\n" + pendCode + startRouterCode;
     return hmr ? appendHmrGlobals(code2) : code2;
   }
   const componentLines = mono?.componentLines || [];
@@ -52547,6 +52735,9 @@ function isReactiveExpression2(node, tracked2) {
     return false;
   let reactive = false;
   walk7(ast, tracked2, {
+    CallExpression() {
+      reactive = true;
+    },
     Identifier(n, context) {
       if (reactive)
         return;
@@ -52692,7 +52883,7 @@ function emitComponentCall2(ctx2, node, tracked2, effectsVar, parentVar, compPre
       ctx2.push(`return $f; })();`);
       propsEntries.push(`children: ${frag}`);
     }
-    if (ctx2.markerless && promptExpr && !plainTarget) {
+    if (ctx2.markerless && promptExpr) {
       ctx2.push(`${walkerArg}.injectSkipK(${promptExpr});`);
     }
     ctx2.push(`let ${v} = undefined;`);
@@ -53616,6 +53807,19 @@ function generateComponent2(comp, importedNames = /* @__PURE__ */ new Set(), hyd
   if (ctx2.markerless && ctx2.hydrate) {
     topBudget = regionBudgetVar2(ctx2, 0, void 0, `(typeof __hydrate.takeSkipK === 'function' ? __hydrate.takeSkipK() : 0)`);
   }
+  if (ctx2.hydrate) {
+    const bodyNodes = comp.body.filter((node) => !(node instanceof TrackDecl));
+    const slotless = (node) => node instanceof StaticNode || node instanceof TextNode || node instanceof RuntimeStatement || node instanceof DynamicBinding && node.kind === "text";
+    const claimless = bodyNodes.every((node) => slotless(node) && !claimsWalkerNode2(ctx2, node));
+    if (claimless) {
+      const slots = bodyNodes.filter((node) => node instanceof StaticNode).length;
+      for (let i = 0; i < slots; i++) {
+        ctx2.push(indent3(`__hydrate.claimOnly(undefined, ${i === 0 && topBudget ? topBudget : "0"});`));
+        if (i === 0 && topBudget)
+          ctx2.push(indent3(`${topBudget} = 0;`));
+      }
+    }
+  }
   for (const node of comp.body) {
     if (node instanceof TrackDecl)
       continue;
@@ -53644,7 +53848,16 @@ function generateComponent2(comp, importedNames = /* @__PURE__ */ new Set(), hyd
     ctx2.push(indent3(`if ($mount === null) $mount = document.createDocumentFragment();`));
     ctx2.push(indent3(`return __pendingChild || $mount;`));
   } else {
-    ctx2.push(indent3(`return __pendingChild || $root;`));
+    const hasBareSlot = comp.body.some((node) => node instanceof SlotNode);
+    if (hasBareSlot) {
+      ctx2.push(indent3(`if (__pendingChild !== null && __pendingChild !== undefined) {`));
+      ctx2.push(indent3(`  if (typeof __pendingChild.then === 'function') return __pendingChild.then((__c) => { $root.appendChild(toDomNode(__c)); return $root; });`));
+      ctx2.push(indent3(`  const __c = toDomNode(__pendingChild);`));
+      ctx2.push(indent3(`  if ($root.childNodes.length === 0) return __c;`));
+      ctx2.push(indent3(`  $root.appendChild(__c);`));
+      ctx2.push(indent3(`}`));
+    }
+    ctx2.push(indent3(hasBareSlot ? `return $root;` : `return __pendingChild || $root;`));
   }
   ctx2.push(indent3(`} finally {`));
   ctx2.push(indent3(`	setActiveComponent(__prev);`));
@@ -55446,6 +55659,37 @@ function demoteExports2(code) {
 function chunkHasImports2(headLen, mergeAborted) {
   return headLen > 0 || mergeAborted;
 }
+function runtimeImportsOf2(filePath) {
+  let text;
+  try {
+    text = readFileSync24(filePath, "utf8");
+  } catch {
+    return [];
+  }
+  const names = [];
+  const pattern2 = /import\s+(type\s+)?\{([^}]*)\}\s*from\s*['"]@vesk\/runtime[^'"]*['"]/g;
+  for (const match of text.matchAll(pattern2)) {
+    if (match[1])
+      continue;
+    for (const part of match[2].split(",")) {
+      const cleaned = part.trim().replace(/^type\s+/, "");
+      if (!cleaned)
+        continue;
+      const name = cleaned.split(/\s+as\s+/)[0].trim();
+      if (name)
+        names.push(name);
+    }
+  }
+  return names;
+}
+function sharedRuntimeResolver2(shimPath) {
+  return {
+    name: "vesk-shared-runtime",
+    setup(build4) {
+      build4.onResolve({ filter: /^@vesk\/runtime(\/.*)?$/ }, () => ({ path: shimPath }));
+    }
+  };
+}
 var ChunkImports2 = class {
   bySource = /* @__PURE__ */ new Map();
   aborted = false;
@@ -55553,6 +55797,21 @@ var ChunkImports2 = class {
   get reason() {
     return this.abortReason;
   }
+  /** Every import source this chunk's merged block pulls in (absolute paths). */
+  sources() {
+    return this.aborted ? [] : [...this.bySource.keys()];
+  }
+  /**
+   * The named bindings this chunk imports from `source`, so a shared-module
+   * shim can re-export exactly what consumers use (re-exporting `*` from the
+   * real module would drag it back into the chunk being built).
+   */
+  bindingsFor(source) {
+    const group = this.bySource.get(source);
+    if (!group)
+      return { named: [], hasDefault: false };
+    return { named: [...group.named.keys()].sort(), hasDefault: !!group.default };
+  }
   /** Renders the deduped import block (empty string when there are no imports). */
   render() {
     if (this.aborted || this.bySource.size === 0)
@@ -55707,6 +55966,7 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options) {
   let cachedFileHits = 0;
   let compiledFiles = 0;
   let mainFromCache = false;
+  let sharedModuleBundle = "";
   function mustReuseWithoutStat(filePath) {
     return !!only && !only.has(filePath);
   }
@@ -55905,7 +56165,7 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options) {
             console.error("[vesk] chunk import merge aborted for", chunkName + ":", chunkImports.reason);
           const head = chunkImports.render();
           const code = (head ? head + "\n\n" : "") + chunkCode.join("\n\n");
-          chunkEntries.push({ name: chunkName, code, node, imports: chunkHasImports2(head.length, !chunkImports.ok) });
+          chunkEntries.push({ name: chunkName, code, node, importsTable: chunkImports, imports: chunkHasImports2(head.length, !chunkImports.ok) });
         }
         walkSplit2(node.children || [], [..._chain, node]);
       }
@@ -55935,7 +56195,7 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options) {
         console.error("[vesk] chunk import merge aborted for shared.js:", sharedImports.reason);
       const head = sharedImports.render();
       const code = (head ? head + "\n\n" : "") + sharedCode.join("\n\n");
-      chunkEntries.push({ name: "shared.js", code, node: null, imports: chunkHasImports2(head.length, !sharedImports.ok) });
+      chunkEntries.push({ name: "shared.js", code, node: null, importsTable: sharedImports, imports: chunkHasImports2(head.length, !sharedImports.ok) });
     }
     const chunkIIFE = (body) => `(()=>{
 const __components = globalThis.__components || (globalThis.__components = {});
@@ -55943,6 +56203,101 @@ const __hydrators = globalThis.__hydrators || (globalThis.__hydrators = {});
 ${body}
 })();
 `;
+    const sharedUsage = /* @__PURE__ */ new Map();
+    for (const entry of chunkEntries) {
+      for (const source of new Set(entry.importsTable.sources())) {
+        sharedUsage.set(source, (sharedUsage.get(source) ?? 0) + 1);
+      }
+    }
+    const isAppLocal = (source) => !source.includes("node_modules") && source.startsWith(resolve24(appDir, ".."));
+    const sharedSources = [...sharedUsage.entries()].filter(([source, uses]) => uses > 1 && isAppLocal(source)).map(([source]) => source);
+    if (process.env.VESK_DEBUG_SHARED) {
+      console.error("[shared] candidates:", [...sharedUsage.entries()].map(([s, n]) => `${n}x ${s}`).join("\n"));
+      console.error("[shared] selected:", sharedSources.join(", "));
+    }
+    const chunkAlias = {};
+    let sharedBundleCode = "";
+    const sharedRuntimeNames = /* @__PURE__ */ new Set();
+    if (sharedSources.length > 0) {
+      const tmpBase = mkdtempSync2(join20(resolve24(appDir, ".."), "tmp-vesk-shared-"));
+      try {
+        const sharedEntry = join20(tmpBase, "shared-entry.js");
+        const lines = [];
+        const members = [];
+        sharedSources.forEach((source, i) => {
+          lines.push(`import * as m${i} from ${JSON.stringify(source)};`);
+          members.push(`  ${JSON.stringify(source)}: m${i},`);
+        });
+        lines.push(`globalThis.__veskShared = { ${members.join("\n")} };`);
+        writeFileSync13(sharedEntry, lines.join("\n"));
+        const appTsconfig = findTsconfigPath(appDir);
+        const runtimeShim = join20(tmpBase, "runtime-shim.js");
+        const runtimeLines = [
+          "// ONE runtime instance: the entry bundle publishes these on globalThis,",
+          "// and route chunks import the same functions. A second bundled copy",
+          "// would mean a second Cell class and a second currentEffect.",
+          "const __r = (n) => (...args) => globalThis[n](...args);"
+        ];
+        for (const source of sharedSources) {
+          for (const name of runtimeImportsOf2(source))
+            sharedRuntimeNames.add(name);
+        }
+        for (const name of [...sharedRuntimeNames].sort()) {
+          runtimeLines.push(`export const ${name} = __r(${JSON.stringify(name)});`);
+        }
+        writeFileSync13(runtimeShim, runtimeLines.join("\n") + "\n");
+        const result = await build3({
+          entryPoints: [sharedEntry],
+          bundle: true,
+          format: "iife",
+          platform: "browser",
+          write: false,
+          logLevel: "silent",
+          loader: { ".js": "tsx" },
+          legalComments: "none",
+          // `@vesk/runtime` MUST stay the entry bundle's instance. Bundling a
+          // second copy in here gives the app a second `Cell` class and a
+          // second `currentEffect` variable: a store cell written from a click
+          // notifies subscribers registered against the OTHER copy, so nothing
+          // the store drives ever updates — writes land, no error, no repaint.
+          plugins: [sharedRuntimeResolver2(runtimeShim)],
+          ...appTsconfig ? { tsconfig: appTsconfig } : {}
+        });
+        sharedBundleCode = result.outputFiles[0].text;
+        sharedSources.forEach((source, i) => {
+          const named = /* @__PURE__ */ new Set();
+          let hasDefault = false;
+          for (const entry of chunkEntries) {
+            const bindings = entry.importsTable.bindingsFor(source);
+            bindings.named.forEach((n) => named.add(n));
+            hasDefault = hasDefault || bindings.hasDefault;
+          }
+          const shim = join20(tmpBase, `shim-${i}.js`);
+          const shimLines = [`const m = globalThis.__veskShared[${JSON.stringify(source)}];`];
+          if (hasDefault)
+            shimLines.push(`export default m;`);
+          for (const name of [...named].sort()) {
+            shimLines.push(`export const ${name} = m[${JSON.stringify(name)}];`);
+          }
+          writeFileSync13(shim, shimLines.join("\n") + "\n");
+          chunkAlias[source] = shim;
+        });
+      } catch (e) {
+        console.error("[vesk] shared-module pass failed; falling back to per-chunk inlining:", e.message);
+        sharedBundleCode = "";
+        for (const key of Object.keys(chunkAlias))
+          delete chunkAlias[key];
+      }
+    }
+    const sharedRedirectPlugin = Object.keys(chunkAlias).length > 0 ? {
+      name: "vesk-shared-modules",
+      setup(build4) {
+        build4.onResolve({ filter: /.*/ }, (args2) => {
+          const mapped = chunkAlias[args2.path];
+          return mapped ? { path: mapped } : null;
+        });
+      }
+    } : null;
     for (const entry of chunkEntries) {
       if (!entry.code.trim())
         continue;
@@ -55972,6 +56327,13 @@ ${entry.code}
             // for a dependency stays in its own package; shipping every
             // module's header inside our own chunk adds nothing.
             legalComments: "none",
+            // Shared app modules are NOT inlined here: the resolver below
+            // redirects them to a generated shim reading
+            // `globalThis.__veskShared`, so the single copy in
+            // shared-modules.js serves every route chunk. (esbuild's `alias`
+            // option only accepts bare package names, so this is a resolver
+            // rather than a map.)
+            ...sharedRedirectPlugin ? { plugins: [sharedRedirectPlugin] } : {},
             ...appTsconfig ? { tsconfig: appTsconfig } : {}
           });
           finalCode = result.outputFiles[0].text;
@@ -55999,13 +56361,16 @@ ${entry.code}
       chunks.push({ name: entry.name, code: finalCode });
     }
     annotate2(routeTree);
-    const mainKey = JSON.stringify(routeTree) + "|" + [...runtimeImportNames].sort().join(",") + `|${!!options?.hmr}|${!!options?.importRuntime}|${options?.routeDataCache ?? ""}`;
+    sharedModuleBundle = sharedBundleCode;
+    for (const name of sharedRuntimeNames)
+      runtimeImportNames.add(name);
+    const mainKey = JSON.stringify(routeTree) + "|" + [...runtimeImportNames].sort().join(",") + `|${!!options?.hmr}|${!!options?.importRuntime}|${options?.routeDataCache ?? ""}|${sharedModuleBundle.length}`;
     let main;
     if (cache2?.mainBundle && cache2.mainBundle.key === mainKey) {
       mainFromCache = true;
       main = cache2.mainBundle.code;
     } else {
-      main = await buildMainBundle2(routeTree, runtimeDir, true, {}, !!options?.hmr, !!options?.importRuntime, runtimeImportNames, options?.routeDataCache);
+      main = await buildMainBundle2(routeTree, runtimeDir, true, {}, !!options?.hmr, !!options?.importRuntime, runtimeImportNames, options?.routeDataCache, sharedModuleBundle);
       if (cache2)
         cache2.mainBundle = { key: mainKey, code: main };
     }
@@ -56222,7 +56587,7 @@ export { ${unique.join(", ")} };
 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) {
+async function buildMainBundle2(routeTree, runtimeDir, codeSplit, mono, hmr, importRuntime, runtimeImportNames, routeDataCache, sharedModuleBundle = "") {
   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 = [
@@ -56291,7 +56656,11 @@ if (__pendChunks.length > 0 && typeof ensureChunk === 'function') {
 `).join("") + "globalThis.__runtime_comps = __runtime_comps;\nglobalThis.__cleanup = __cleanup;\nglobalThis.__place = __place;\n\n";
     const extraGlobals = [...runtimeImportNames || []].filter((n) => n && n !== "default").map((n) => `globalThis.${n} = ${n};
 `).join("");
-    const code2 = preamble + "const __components = globalThis.__components || (globalThis.__components = {});\nconst __hydrators = globalThis.__hydrators || (globalThis.__hydrators = {});\nconst __runtime_comps = __components;\n\n" + runtimeGlobals2 + extraGlobals + cleanupFn + placeFn + "globalThis.__components = __components;\n" + resolveNamesFn + updateComponentsFn + "const __routeTree = " + routeTreeJson + ";\n__resolveNames(__routeTree);\n" + pendCode + startRouterCode;
+    const code2 = preamble + "const __components = globalThis.__components || (globalThis.__components = {});\nconst __hydrators = globalThis.__hydrators || (globalThis.__hydrators = {});\nconst __runtime_comps = __components;\n\n" + runtimeGlobals2 + extraGlobals + // Shared app modules run HERE: after the runtime bindings are published,
+    // before anything can request a route chunk. Earlier (at the top of the
+    // bundle) `globalThis.track` was still undefined, so every module-scope
+    // cell in a store was created against a missing runtime.
+    (sharedModuleBundle ? sharedModuleBundle + "\n" : "") + cleanupFn + placeFn + "globalThis.__components = __components;\n" + resolveNamesFn + updateComponentsFn + "const __routeTree = " + routeTreeJson + ";\n__resolveNames(__routeTree);\n" + pendCode + startRouterCode;
     return hmr ? appendHmrGlobals2(code2) : code2;
   }
   const componentLines = mono?.componentLines || [];

package/package.json

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