@vesk/vesk-cli 0.2.59 → 0.2.60

package/dist/cli.js

@@ -889,6 +889,9 @@ function block(flags, fn, state = null, co) {
   }
   if (active_block !== null) {
     push_block(newBlock, active_block);
+  } else {
+    newBlock.p = get_orphan_root();
+    push_block(newBlock, newBlock.p);
   }
   if ((flags & EFFECT_BLOCK) !== 0) {
     schedule_update(newBlock);
@@ -978,6 +981,7 @@ function is_destroyed(target_block) {
 }
 function destroy_block(block2, remove_dom = true) {
   block2.f ^= DESTROYED;
+  unsubscribe_reaction(block2);
   let removed = false;
   const f = block2.f;
   if (remove_dom && (f & (BRANCH_BLOCK | ROOT_BLOCK)) !== 0 && (f & TRY_BLOCK) === 0 || (f & HEAD_BLOCK) !== 0) {
@@ -1013,6 +1017,28 @@ var init_ripple_utils = __esm({
 });
 
 // ../runtime/src/ripple-runtime.ts
+function get_orphan_root() {
+  if (orphan_root === null) {
+    orphan_root = {
+      co: null,
+      d: null,
+      first: null,
+      f: ROOT_BLOCK,
+      fn: null,
+      last: null,
+      next: null,
+      p: null,
+      prev: null,
+      s: null,
+      t: null,
+      tc: null
+    };
+  }
+  return orphan_root;
+}
+function is_orphan(block2) {
+  return block2 === null || block2 === void 0 || block2 === orphan_root;
+}
 function increment_clock() {
   return ++clock;
 }
@@ -1138,6 +1164,7 @@ function run_block(block2) {
   try {
     active_block = block2;
     active_reaction = block2;
+    unsubscribe_reaction(block2);
     active_component = block2.co;
     destroy_non_branch_children(block2);
     run_teardown(block2);
@@ -1167,10 +1194,10 @@ function run_block(block2) {
   }
 }
 function tracked(v, block2, get2, set2) {
-  return new TrackedValue(v, block2 || active_block, get2 || set2 ? { get: get2, set: set2 } : empty_get_set);
+  return new TrackedValue(v, block2 || active_block || get_orphan_root(), get2 || set2 ? { get: get2, set: set2 } : empty_get_set);
 }
 function derived(fn, block2, get2, set2) {
-  return new DerivedValue(fn, block2 || active_block, get2 || set2 ? { get: get2, set: set2 } : empty_get_set);
+  return new DerivedValue(fn, block2 || active_block || get_orphan_root(), get2 || set2 ? { get: get2, set: set2 } : empty_get_set);
 }
 function track(v, b, get2, set2) {
   if (is_ripple_object(v)) {
@@ -1193,6 +1220,9 @@ function track(v, b, get2, set2) {
 }
 function create_dependency(tracked2) {
   const reaction = active_reaction;
+  if (is_orphan(tracked2.b)) {
+    (tracked2.r ??= /* @__PURE__ */ new Set()).add(reaction);
+  }
   const existing = reaction.d;
   if (existing !== null) {
     reaction.d = existing.n;
@@ -1367,6 +1397,7 @@ function queue_microtask(fn) {
 }
 function schedule_update(block2) {
   if (block2 === null) return;
+  if (block2.p === get_orphan_root() && globalThis.__vsk_ssr) return;
   if (scheduler_mode === FLUSH_MICROTASK) {
     queue_microtask();
   }
@@ -1426,6 +1457,36 @@ function register_dependency(tracked2) {
     current2.n = dependency;
   }
 }
+function unsubscribe_reaction(reaction) {
+  if (reaction === null) return;
+  let dep = reaction.d;
+  while (dep !== null) {
+    const t = dep.t;
+    if (is_orphan(t.b) && t.r !== null) {
+      t.r.delete(reaction);
+    }
+    dep = dep.n;
+  }
+}
+function schedule_ownerless_update(tracked2, visited) {
+  const subscribers = tracked2.r;
+  if (subscribers === null) return;
+  for (const reaction of Array.from(subscribers)) {
+    if (visited !== null) {
+      if (visited.has(reaction)) continue;
+      visited.add(reaction);
+    }
+    if (reaction.f & DESTROYED) {
+      subscribers.delete(reaction);
+      continue;
+    }
+    if ((reaction.f & DERIVED) !== 0) {
+      schedule_ownerless_update(reaction, visited ?? /* @__PURE__ */ new Set());
+      continue;
+    }
+    schedule_update(reaction);
+  }
+}
 function get_derived(computed) {
   update_derived(computed);
   if (tracking) {
@@ -1493,7 +1554,11 @@ function set(tracked2, value) {
     }
     tracked2.__v = value;
     tracked2.c = increment_clock();
-    schedule_update(tracked_block);
+    if (!is_orphan(tracked_block)) {
+      schedule_update(tracked_block);
+    } else {
+      schedule_ownerless_update(tracked2, null);
+    }
   }
 }
 function untrack2(fn) {
@@ -1590,7 +1655,7 @@ function pop_component() {
   }
   active_component = component.p;
 }
-var FLUSH_MICROTASK, FLUSH_SYNC, active_block, active_reaction, active_scope, active_component, is_mutating_allowed, old_values, scheduler_mode, is_micro_task_queued, clock, queued_root_blocks, disable_scoped_flush, queued_microtasks, flush_count, queued_post_block_flush, active_dependency, tracking, teardown, empty_get_set, TrackedValue, DerivedValue;
+var FLUSH_MICROTASK, FLUSH_SYNC, active_block, active_reaction, active_scope, active_component, is_mutating_allowed, old_values, orphan_root, scheduler_mode, is_micro_task_queued, clock, queued_root_blocks, disable_scoped_flush, queued_microtasks, flush_count, queued_post_block_flush, active_dependency, tracking, teardown, empty_get_set, TrackedValue, DerivedValue;
 var init_ripple_runtime = __esm({
   "../runtime/src/ripple-runtime.ts"() {
     "use strict";
@@ -1605,6 +1670,7 @@ var init_ripple_runtime = __esm({
     active_component = null;
     is_mutating_allowed = true;
     old_values = /* @__PURE__ */ new Map();
+    orphan_root = null;
     scheduler_mode = FLUSH_MICROTASK;
     is_micro_task_queued = false;
     clock = 0;
@@ -1623,6 +1689,7 @@ var init_ripple_runtime = __esm({
       c;
       d;
       f;
+      r;
       __v;
       constructor(v, block2, a) {
         this.a = a;
@@ -1630,6 +1697,7 @@ var init_ripple_runtime = __esm({
         this.c = 0;
         this.d = null;
         this.f = TRACKED;
+        this.r = null;
         this.__v = v;
       }
       get() {
@@ -1670,6 +1738,7 @@ var init_ripple_runtime = __esm({
       d;
       f;
       fn;
+      r;
       __v;
       constructor(fn, block2, a) {
         this.a = a;
@@ -1680,6 +1749,7 @@ var init_ripple_runtime = __esm({
         this.d = null;
         this.f = DERIVED;
         this.fn = fn;
+        this.r = null;
         this.__v = UNINITIALIZED;
       }
       get() {
@@ -18320,6 +18390,20 @@ function tokenizeCode(code) {
     }
   });
 }
+function collectStringDelimiters(code, tokens) {
+  const t = tokens == null ? tokenizeCode(code) : tokens;
+  if (t === null) return null;
+  const starts = /* @__PURE__ */ new Set();
+  let ti = 0;
+  for (let i = 0; i < code.length; i++) {
+    const c = code.charCodeAt(i);
+    if (c !== 34 && c !== 39 && c !== 96) continue;
+    while (ti < t.length && t[ti].end <= i) ti++;
+    const covered = ti < t.length && t[ti].start <= i;
+    if (!covered || QUOTED_LABELS.has(t[ti].label)) starts.add(i);
+  }
+  return starts;
+}
 function containsIdentifier(code, name) {
   const tokens = tokenizeCode(code);
   if (tokens !== null) {
@@ -18511,33 +18595,33 @@ function manualExtractImportNames(importText) {
   }
   return names;
 }
-function hasTopLevelValueDeclaration(code, name) {
-  const tokens = tokenizeCode(code);
-  if (tokens === null) return false;
+function hasTopLevelValueDeclaration(code, name, tokens) {
+  const t = tokens == null ? tokenizeCode(code) : tokens;
+  if (t === 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];
+  for (let i = 1; i < t.length; i++) {
+    if (t[i].label !== "name" || t[i].value !== name) continue;
+    const prev = t[i - 1];
     if (!prev || !declWords.includes(prev.value)) continue;
     if (i >= 2) {
-      const pp2 = tokens[i - 2];
+      const pp2 = t[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 [];
+function findSpecifierExports(code, tokens) {
+  const t = tokens == null ? tokenizeCode(code) : tokens;
+  if (t === 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;
+  for (let i = 0; i < t.length; i++) {
+    if (t[i].label !== "export") continue;
+    if (!t[i + 1] || t[i + 1].label !== "{") continue;
     let k = i + 2;
     let depth = 1;
-    for (; k < tokens.length; k++) {
-      const lbl = tokens[k].label;
+    for (; k < t.length; k++) {
+      const lbl = t[k].label;
       if (lbl === "string") {
         continue;
       }
@@ -18548,8 +18632,8 @@ function findSpecifierExports(code) {
       }
     }
     let isReexport = false;
-    for (let j = k + 1; j < tokens.length; j++) {
-      const lbl = tokens[j].label;
+    for (let j = k + 1; j < t.length; j++) {
+      const lbl = t[j].label;
       if (lbl === "string") {
         isReexport = true;
         break;
@@ -18557,10 +18641,10 @@ function findSpecifierExports(code) {
       if (lbl === ";" || lbl === "export" || lbl === "import" || lbl === "}") break;
     }
     if (depth !== 0 || isReexport) continue;
-    const pairs = readSpecifierPairs(code, tokens[i + 1].end, tokens[k].end);
+    const pairs = readSpecifierPairs(code, t[i + 1].end, t[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 });
+    const stmtEnd = t[k].end;
+    for (const [local, exported] of pairs) out.push({ local, exported, start: t[i].start, end: stmtEnd });
     i = k;
   }
   return out;
@@ -18620,12 +18704,14 @@ function stripTrackDeclMarkers(text, base, node) {
   }
   return out + text.slice(prev);
 }
+var QUOTED_LABELS;
 var init_tokens = __esm({
   "../compiler/src/tokens.ts"() {
     "use strict";
     init_parser();
     init_vesk_plugin();
     init_scan();
+    QUOTED_LABELS = /* @__PURE__ */ new Set(["string", "template", "`", "backQuote"]);
   }
 });
 
@@ -18649,7 +18735,7 @@ function offsetToLineCol(source, offset2) {
   }
   return { line, column };
 }
-function preprocessForClauses(source) {
+function preprocessForClauses(source, delimiters) {
   const annotations = [];
   const chars = source.split("");
   const isString = (ch) => ch === '"' || ch === "'" || ch === "`";
@@ -18657,6 +18743,10 @@ function preprocessForClauses(source) {
   while (i < source.length) {
     const ch = source[i];
     if (isString(ch)) {
+      if (delimiters && !delimiters.has(i)) {
+        i++;
+        continue;
+      }
       const quote = ch;
       let j = i + 1;
       let tplDepth = 0;
@@ -19011,9 +19101,11 @@ function parseGeneratedJs(source) {
 }
 function parse4(source, options = {}) {
   const ParserClass = createBaseParser();
-  const { code, annotations } = preprocessForClauses(blankGenericArrowTypeParams(blankComments(source)));
+  const sourceTokens = tokenizeCode(source);
+  const delimiters = sourceTokens === null ? null : collectStringDelimiters(source, sourceTokens);
+  const { code, annotations } = preprocessForClauses(blankGenericArrowTypeParams(blankComments(source)), delimiters);
   const vskSource = !options.filename || String(options.filename).endsWith(".vsk");
-  const specifierExports = vskSource ? findSpecifierExports(code).filter((e) => !hasTopLevelValueDeclaration(code, e.local)) : [];
+  const specifierExports = vskSource && sourceTokens !== null ? findSpecifierExports(code, sourceTokens).filter((e) => !hasTopLevelValueDeclaration(code, e.local, sourceTokens)) : [];
   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(""));
@@ -30399,8 +30491,13 @@ function emitNode(ctx2, node, tracked2, effectsVar, parentVar, compPrefix = "__c
   if (node instanceof SlotNode) {
     if (!parentVar) {
       if (ctx2.hydrate) {
+        const promptExpr = ctx2.markerless && (regionBudget || skipK > 0) ? markerlessSkipExpr(regionBudget, skipK) : null;
         ctx2.push(`if (props.children !== undefined && props.children !== null) {`);
         ctx2.push(`  if (typeof props.children === 'function') {`);
+        if (promptExpr) {
+          ctx2.push(`    ${ctx2.walker}.injectSkipK(${promptExpr});`);
+          if (regionBudget && ctx2.markerless) ctx2.push(`    ${regionBudget} = 0;`);
+        }
         ctx2.push(`    __pendingChild = props.children(__hydrate);`);
         ctx2.push(`  } else if (__hydrate && __hydrate.root) {`);
         ctx2.push(`    __hydrate.root.appendChild(toDomNode(props.children));`);
@@ -35794,6 +35891,20 @@ ${serverStoreLine}
     });
   }
 
+  // Persisted-store pre-paint payload (buildStorePrePaintPayload) \u2014 same
+  // token-stash/consume contract as /ssr-data.js, own store so neither handoff
+  // can eat the other.
+  if (pathname === '/store-init.js') {
+    const initToken = url.searchParams.get('t') || '';
+    const initStore = (globalThis.__vsk_store_init_payload_store || {});
+    const initPayload = initStore[initToken];
+    if (initPayload !== undefined) delete initStore[initToken];
+    return new Response(initPayload ?? '// no store init', {
+      status: 200,
+      headers: { 'Content-Type': 'application/javascript', 'Cache-Control': 'no-store' },
+    });
+  }
+
 ${eventsStartLine}
   let mwCtx = { params: {}, url, locals: ${localsSeed}, cookies: {}, request, resolveUrl(u) { return new URL(u, request.url).href; }, set() {}, get() { return undefined; } };
   if (${hasMwLiteral}) {
@@ -46693,7 +46804,7 @@ function offsetToLineCol3(source, offset2) {
   }
   return { line, column };
 }
-function preprocessForClauses2(source) {
+function preprocessForClauses2(source, delimiters) {
   const annotations = [];
   const chars = source.split("");
   const isString = (ch) => ch === '"' || ch === "'" || ch === "`";
@@ -46701,6 +46812,10 @@ function preprocessForClauses2(source) {
   while (i < source.length) {
     const ch = source[i];
     if (isString(ch)) {
+      if (delimiters && !delimiters.has(i)) {
+        i++;
+        continue;
+      }
       const quote = ch;
       let j = i + 1;
       let tplDepth = 0;
@@ -47077,9 +47192,11 @@ function createBaseParser2() {
 }
 function parse5(source, options = {}) {
   const ParserClass = createBaseParser2();
-  const { code, annotations } = preprocessForClauses2(blankGenericArrowTypeParams2(blankComments(source)));
+  const sourceTokens = tokenizeCode(source);
+  const delimiters = sourceTokens === null ? null : collectStringDelimiters(source, sourceTokens);
+  const { code, annotations } = preprocessForClauses2(blankGenericArrowTypeParams2(blankComments(source)), delimiters);
   const vskSource = !options.filename || String(options.filename).endsWith(".vsk");
-  const specifierExports = vskSource ? findSpecifierExports(code).filter((e) => !hasTopLevelValueDeclaration(code, e.local)) : [];
+  const specifierExports = vskSource && sourceTokens !== null ? findSpecifierExports(code, sourceTokens).filter((e) => !hasTopLevelValueDeclaration(code, e.local, sourceTokens)) : [];
   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(""));
@@ -48034,6 +48151,7 @@ async function bundleRuntime(appDir, outDir) {
     `import { renderPage, renderFullPage, renderPageStream, compileFile, setRuntimeModule, setVskHydrate, hydratePrecompile, assertSameOrigin, withSsrStore } from ${JSON.stringify(resolve3(compilerRoot, "server-codegen.js"))};`,
     `import { parseCookies } from ${JSON.stringify(resolve3(compilerRoot, "server-cookies.js"))};`,
     `import * as __veskRuntime from ${JSON.stringify(resolve3(runtimeRoot, "index-server.js"))};`,
+    `import * as __persistence from ${JSON.stringify(resolve3(runtimeRoot, "store-persistence.js"))};`,
     "",
     "// Inject runtime module so server-codegen can find components like NavLink, Link, etc.",
     "setRuntimeModule(__veskRuntime);",
@@ -48099,6 +48217,40 @@ async function bundleRuntime(appDir, outDir) {
     "  return '/ssr-data.js?t=' + token;",
     "}",
     "",
+    "// Persisted-store SSR continuity. `installPersistedStoreServerHooks` installs the",
+    "// adapter-side read hook; `get/getReset` handle the per-request key registry",
+    "// the server drains into the pre-paint payload. The init payload is delivered",
+    "// as an origin-served script (/store-init.js?t=...) exactly like /ssr-data.js",
+    "// so strict CSP (no unsafe-inline) cannot block it; it is never inlined.",
+    "export const installPersistedStoreServerHooks = __persistence.installPersistedStoreServerHooks;",
+    "export const persistedStoreCookieName = __persistence.persistedStoreCookieName;",
+    "export const getPersistedStoreKeys = __persistence.getPersistedStoreKeys;",
+    "export const resetPersistedStoreKeys = __persistence.resetPersistedStoreKeys;",
+    "export const buildStorePrePaintPayload = __persistence.buildStorePrePaintPayload;",
+    "export const storeInitScriptTag = __persistence.storeInitScriptTag;",
+    "",
+    "// Stash the pre-paint payload under a CSPRNG token and return the origin URL",
+    "// the blocking <head> script points at. Own token store (NOT __vsk_ssr_payload_store)",
+    "// so consuming the page hydration handoff never eats the store-init payload",
+    "// and vice versa. Same 100-entry bound as /ssr-data.js.",
+    "export function storeInitScriptGlobal(payload) {",
+    "  if (!payload) return null;",
+    "  const bytes = new Uint8Array(12);",
+    "  crypto.getRandomValues(bytes);",
+    "  let tk = '';",
+    "  for (const b of bytes) tk += b.toString(16).padStart(2, '0');",
+    "  const token = tk;",
+    "  const store = (globalThis.__vsk_store_init_payload_store ||= {});",
+    "  store[token] = payload;",
+    "  const keys = Object.keys(store);",
+    "  if (keys.length > 100) {",
+    "    for (let i = 0; i < keys.length - 100; i++) {",
+    "      delete store[keys[i]];",
+    "    }",
+    "  }",
+    "  return '/store-init.js?t=' + token;",
+    "}",
+    "",
     "// Re-export runtime classes used by API routes",
     "export const VeskRequest = __veskRuntime.VeskRequest;",
     "export const PayloadTooLargeError = __veskRuntime.PayloadTooLargeError;",
@@ -48409,6 +48561,51 @@ function buildParamExtraction(node, urlParts) {
   walk9(node);
   return parts;
 }
+function persistedStoreSsrCode() {
+  return [
+    "// \u2500\u2500 Persisted-store SSR continuity (createStore / createPathStore persist) \u2500\u2500",
+    "// Reads a persisted store's cookie value through the adapter request context.",
+    "// Client writes mirror URL-encoded; decode on the way back (best effort).",
+    "function __persistRead(key) {",
+    "  const cookieName = persistedStoreCookieName(key);",
+    "  const req = globalThis.__vesk_request;",
+    "  if (!req) return null;",
+    "  const c = req.cookies || {};",
+    "  const v = typeof c.get === 'function' ? c.get(cookieName) : c[cookieName];",
+    "  if (v == null) return null;",
+    "  try { return decodeURIComponent(String(v)); } catch { return String(v); }",
+    "}",
+    "",
+    "// Drain this request's registered persisted keys into a served pre-paint",
+    "// script (/store-init.js?t=...) then forget them. `token` selects the",
+    "// render's bucket for callers outside the ALS scope (the no-layout stream",
+    "// path captures its token at the renderPageStream call site); the layout",
+    "// path runs this inside the scope and relies on the ambient token.",
+    "function __storeInitTag(token) {",
+    "  const keys = getPersistedStoreKeys(token);",
+    "  if (keys.length === 0) { resetPersistedStoreKeys(token); return ''; }",
+    "  const values = {};",
+    "  for (let __i = 0; __i < keys.length; __i++) values[keys[__i]] = __persistRead(keys[__i]);",
+    "  resetPersistedStoreKeys(token);",
+    "  const payload = buildStorePrePaintPayload(values);",
+    "  const url = storeInitScriptGlobal(payload);",
+    "  return url ? storeInitScriptTag(url) : '';",
+    "}",
+    "",
+    "// Inject the blocking store-init <script src> into a full HTML string",
+    "// (before </head>; append if the document has no head).",
+    "function __injectStoreInit(html) {",
+    "  const tag = __storeInitTag();",
+    "  if (tag === '') return html;",
+    "  const idx = html.lastIndexOf('</head>');",
+    "  if (idx === -1) return html + tag;",
+    "  return html.slice(0, idx) + tag + html.slice(idx);",
+    "}",
+    "",
+    "installPersistedStoreServerHooks({ read: __persistRead });",
+    ""
+  ].join("\n");
+}
 function generateSsrFunction(routeNode, appDir, outDir, componentMap, options) {
   const ancestorLayouts = options?.ancestorLayouts || [];
   const middlewareCode = options?.middlewareCode || null;
@@ -48510,6 +48707,7 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
       "",
       "async function __renderHtml(params, requestUrl) {",
       "  return withSsrStore(async () => {",
+      "  resetPersistedStoreKeys();",
       "  let page;",
       "  let caughtError = null;",
       "  const __expose = process.env.NODE_ENV !== 'production';",
@@ -48530,7 +48728,7 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
       "    if (_inner.head) _head = _inner.head + _head;",
       "  }",
       "  const html = await renderFullPage('', _layoutCompList[0], { params, children: _body }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[0]" + bakedOptions + clientScriptOption + dataScriptOption + ", pageHead: _head });",
-      "  return new Response(html, { headers: { 'Content-Type': 'text/html' }, status: caughtError ? 500 : 200 });",
+      "  return new Response(__injectStoreInit(html), { headers: { 'Content-Type': 'text/html' }, status: caughtError ? 500 : 200 });",
       "  });",
       "}",
       ""
@@ -48549,25 +48747,48 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
       "async function __renderHtml(params, requestUrl) {",
       "  return withSsrStore(async () => {",
       "  let stream;",
+      // The streamed no-layout page emits its <head> before the component body
+      // renders, so its persisted stores don't exist yet when the head is
+      // flushed — the pre-paint tag therefore goes into the final chunk, right
+      // before </body> (still a blocking, pre-paint script). Capture the render
+      // token now (renderPageStream adopts this exact ambient store) so the
+      // registry drain in the consumer's start() can hit the right bucket even
+      // though it runs outside the ALS scope.
+      "  const __streamToken = globalThis.__vsk_ssr_token || '';",
       "  try {",
       "    stream = renderPageStream('', _comp, { params }, __componentRegistry, { hydrate: true, cached: _compiled" + bakedOptions + clientScriptOption + dataScriptOption + " });",
       "  } catch (err) {",
       "    if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
       "    const html = await __renderErrorFullPage(params, requestUrl, err);",
-      "    return new Response(html, { headers: { 'Content-Type': 'text/html' }, status: 500 });",
+      "    return new Response(__injectStoreInit(html), { headers: { 'Content-Type': 'text/html' }, status: 500 });",
       "  }",
       "  return new Response(new ReadableStream({",
       "    async start(controller) {",
       "      const enc = new TextEncoder();",
+      "      let __tail = null;",
+      "      resetPersistedStoreKeys(__streamToken);",
       "      try {",
       "        for await (const chunk of stream) {",
-      "          controller.enqueue(enc.encode(chunk));",
+      "          if (__tail !== null) controller.enqueue(enc.encode(__tail));",
+      "          __tail = chunk;",
+      "        }",
+      "        if (__tail !== null) {",
+      "          const __tag = __storeInitTag(__streamToken);",
+      "          if (__tag !== '') {",
+      "            const __bi = __tail.lastIndexOf('</body>');",
+      "            __tail = __bi === -1 ? __tail + __tag : __tail.slice(0, __bi) + __tag + __tail.slice(__bi);",
+      "          }",
+      "          controller.enqueue(enc.encode(__tail));",
+      "        } else {",
+      "          // Empty stream (no chunks) \u2014 nothing to attach the tag to; just",
+      "          // clear the registry so a later render can't inherit these keys.",
+      "          resetPersistedStoreKeys(__streamToken);",
       "        }",
       "      } catch (err) {",
       "        if (err && (err.name === 'NotFoundError' || err.name === 'Redirect')) throw err;",
       "        try {",
       "          const html = await __renderErrorFullPage(params, requestUrl, err);",
-      "          controller.enqueue(enc.encode(html));",
+      "          controller.enqueue(enc.encode(__injectStoreInit(html)));",
       "        } catch {}",
       "      }",
       "      controller.close();",
@@ -48578,6 +48799,7 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
       ""
     ].join("\n");
   }
+  const persistCode = persistedStoreSsrCode();
   let dataCode;
   const exposeErr = "process.env.NODE_ENV !== 'production'";
   const dataNavCleanup = [
@@ -48591,6 +48813,9 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
     // 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;",
+    // SPA data-nav only runs renderPage, so the persisted-store registration
+    // bucket would otherwise keep this request's keys forever.
+    "      resetPersistedStoreKeys();",
     "    }"
   ];
   const dataNavWrap = (body) => [
@@ -48775,7 +49000,7 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
     ""
   ].join("\n");
   const funcCode = [
-    "import { renderFullPage, renderPageStream, renderPage, hydratePrecompile, parseCookies, getAction, validateActionInput, issuesToFieldMap, storeDataScriptGlobal, withSsrStore, assertSameOrigin, VeskRequest } from '../runtime.js';",
+    "import { renderFullPage, renderPageStream, renderPage, hydratePrecompile, parseCookies, getAction, validateActionInput, issuesToFieldMap, storeDataScriptGlobal, withSsrStore, assertSameOrigin, VeskRequest, installPersistedStoreServerHooks, persistedStoreCookieName, getPersistedStoreKeys, resetPersistedStoreKeys, buildStorePrePaintPayload, storeInitScriptGlobal, storeInitScriptTag } from '../runtime.js';",
     "",
     middlewareCode || "",
     registryCode,
@@ -48784,6 +49009,8 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
     paramsCode,
     htmlFnCode,
     "",
+    persistCode,
+    "",
     "export async function handle(request) {",
     "  const url = new URL(request.url);",
     "  const params = __paramsFor(url.pathname);",
@@ -50918,6 +51145,15 @@ async function startProdServer(outDir, options) {
       res.end(lines.join("\n") || "// no ssr data");
       return;
     }
+    if (url.pathname === "/store-init.js") {
+      const token = url.searchParams.get("t") || "";
+      const store = globalThis.__vsk_store_init_payload_store;
+      const payload = store?.[token];
+      if (payload) delete store[token];
+      res.writeHead(200, { "Content-Type": "application/javascript", "Cache-Control": "no-store" });
+      res.end(payload ?? "// no store init");
+      return;
+    }
     if (url.pathname === "/_vesk/runtime.js") {
       const clientFile = buildConfig?.assets?.client?.file || "client.js";
       const clientPath = resolve13(staticDir, clientFile);
@@ -51224,6 +51460,29 @@ async function resolveCompilerApi(name) {
   }
   return import(`@vesk/compiler/src/${name.replace(/\.js$/, "")}`);
 }
+function findRouteConflicts(routeTree, appDir) {
+  const projectRoot = resolve21(appDir, "..");
+  const byPath = /* @__PURE__ */ new Map();
+  const walk9 = (nodes) => {
+    for (const node of nodes) {
+      if (node.page) {
+        const pageFile = join15(node.sourceDir, "page.vsk");
+        const files = byPath.get(node.fullPath) ?? [];
+        files.push(relative4(projectRoot, pageFile));
+        byPath.set(node.fullPath, files);
+      }
+      if (node.children && node.children.length > 0)
+        walk9(node.children);
+    }
+  };
+  walk9(routeTree);
+  const conflicts = [];
+  for (const [fullPath, files] of byPath) {
+    if (files.length > 1)
+      conflicts.push({ fullPath, files });
+  }
+  return conflicts;
+}
 function filterActivePlugins2(plugins, records) {
   if (!records || records.length === 0)
     return plugins;
@@ -51357,6 +51616,14 @@ async function build2(appDir, options) {
     console.error("vesk build: no routes found in", appDir);
     return;
   }
+  const routeConflicts = findRouteConflicts(routeTree, appDir);
+  if (routeConflicts.length > 0) {
+    for (const conflict of routeConflicts) {
+      console.error(`vesk build: conflicting routes for ${conflict.fullPath}: ${conflict.files.join(", ")}`);
+    }
+    const first = routeConflicts[0];
+    throw new Error(`conflicting routes: ${first.fullPath} is claimed by both ${first.files.join(" and ")}`);
+  }
   const projectRoot = resolve21(appDir, "..");
   const componentsDir = resolve21(projectRoot, "components");
   const componentMap = scanComponents2(componentsDir);
@@ -52367,8 +52634,14 @@ function emitNode2(ctx2, node, tracked2, effectsVar, parentVar, compPrefix = "__
   if (node instanceof SlotNode) {
     if (!parentVar) {
       if (ctx2.hydrate) {
+        const promptExpr = ctx2.markerless && (regionBudget || skipK > 0) ? markerlessSkipExpr2(regionBudget, skipK) : null;
         ctx2.push(`if (props.children !== undefined && props.children !== null) {`);
         ctx2.push(`  if (typeof props.children === 'function') {`);
+        if (promptExpr) {
+          ctx2.push(`    ${ctx2.walker}.injectSkipK(${promptExpr});`);
+          if (regionBudget && ctx2.markerless)
+            ctx2.push(`    ${regionBudget} = 0;`);
+        }
         ctx2.push(`    __pendingChild = props.children(__hydrate);`);
         ctx2.push(`  } else if (__hydrate && __hydrate.root) {`);
         ctx2.push(`    __hydrate.root.appendChild(toDomNode(props.children));`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/vesk-cli",
-  "version": "0.2.59",
+  "version": "0.2.60",
   "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.59",
-    "@vesk/compiler": "^0.2.59",
-    "@vesk/plugin-tailwind": "^0.2.59",
-    "@vesk/runtime": "^0.2.59",
+    "@vesk/adapter": "^0.2.60",
+    "@vesk/compiler": "^0.2.60",
+    "@vesk/plugin-tailwind": "^0.2.60",
+    "@vesk/runtime": "^0.2.60",
     "esrap": "^2.3.0",
     "typescript": "^5.8.0",
     "ws": "^8.18.0",