@vesk/adapter 0.2.58 → 0.2.60

package/dist/client-bundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-bundle.d.ts","sourceRoot":"","sources":["../src/client-bundle.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,kBAAkB,EAAmF,MAAM,yBAAyB,CAAC;AAoCnL;;;;;;;;;;;;;GAaG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CA4BhE;AAED;;;;;GAKG;AACH,UAAU,YAAY;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAC7B,EAAE,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACvB,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,IAAI,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE;gBAAE,IAAI,CAAC,EAAE,MAAM,CAAC;gBAAC,IAAI,CAAC,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;IACtH,WAAW,CAAC,EAAE;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAC1C,YAAY,CAAC,EAAE,KAAK,CAAC;YAAE,IAAI,CAAC,EAAE;gBAAE,IAAI,CAAC,EAAE,MAAM,CAAC;gBAAC,MAAM,CAAC,EAAE;oBAAE,IAAI,CAAC,EAAE,MAAM,CAAC;oBAAC,IAAI,CAAC,EAAE,MAAM,CAAA;iBAAE,CAAA;aAAE,CAAA;SAAE,CAAC,CAAC;KAC/F,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAmDD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAKzD;AAkCD;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA+B7D;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAyBlD;AA4MD;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA+B5D;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CASxD;AA4CD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,OAAO,GAAG,MAAM,CAoBnG;AAED,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,SAAS,EAAE,EACtB,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO,CAAC,kBAAkB,CAAC,CAie7B;AAMD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CA+B3D;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAUlE;AAoCD;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAI/F"}
+{"version":3,"file":"client-bundle.d.ts","sourceRoot":"","sources":["../src/client-bundle.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,kBAAkB,EAAmF,MAAM,yBAAyB,CAAC;AAoCnL;;;;;;;;;;;;;GAaG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CA4BhE;AAED;;;;;GAKG;AACH,UAAU,YAAY;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAC7B,EAAE,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACvB,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,IAAI,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE;gBAAE,IAAI,CAAC,EAAE,MAAM,CAAC;gBAAC,IAAI,CAAC,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;IACtH,WAAW,CAAC,EAAE;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAC1C,YAAY,CAAC,EAAE,KAAK,CAAC;YAAE,IAAI,CAAC,EAAE;gBAAE,IAAI,CAAC,EAAE,MAAM,CAAC;gBAAC,MAAM,CAAC,EAAE;oBAAE,IAAI,CAAC,EAAE,MAAM,CAAC;oBAAC,IAAI,CAAC,EAAE,MAAM,CAAA;iBAAE,CAAA;aAAE,CAAA;SAAE,CAAC,CAAC;KAC/F,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAmDD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAKzD;AAkCD;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA+B7D;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAyBlD;AAuQD;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA+B5D;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CASxD;AA4CD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,OAAO,GAAG,MAAM,CAoBnG;AAED,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,SAAS,EAAE,EACtB,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO,CAAC,kBAAkB,CAAC,CA0nB7B;AAMD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CA+B3D;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAUlE;AAoCD;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAI/F"}

package/dist/client-bundle.js

@@ -268,6 +268,48 @@ export function demoteExports(code) {
 function chunkHasImports(headLen, mergeAborted) {
     return headLen > 0 || mergeAborted;
 }
+/**
+ * Scans a module's own source for the names it imports from `@vesk/runtime*`.
+ * The shared-module pass needs them so the entry bundle publishes exactly the
+ * bindings the shared code will read back off `globalThis`.
+ */
+function runtimeImportsOf(filePath) {
+    let text;
+    try {
+        text = readFileSync(filePath, 'utf8');
+    }
+    catch {
+        return [];
+    }
+    const names = [];
+    const pattern = /import\s+(type\s+)?\{([^}]*)\}\s*from\s*['"]@vesk\/runtime[^'"]*['"]/g;
+    for (const match of text.matchAll(pattern)) {
+        if (match[1])
+            continue; // type-only imports are erased
+        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;
+}
+/**
+ * esbuild resolver that redirects `@vesk/runtime*` imports in the shared-module
+ * pass to a generated shim reading the ENTRY bundle's runtime off `globalThis`.
+ * `shimPath` is generated by the caller, which knows which names are needed.
+ */
+function sharedRuntimeResolver(shimPath) {
+    return {
+        name: 'vesk-shared-runtime',
+        setup(build) {
+            build.onResolve({ filter: /^@vesk\/runtime(\/.*)?$/ }, () => ({ path: shimPath }));
+        },
+    };
+}
 /**
  * Accumulates every import a code-split chunk needs and rebuilds it as a
  * single deduped import block.
@@ -401,6 +443,21 @@ class ChunkImports {
     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)
@@ -631,6 +688,9 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
     let cachedFileHits = 0;
     let compiledFiles = 0;
     let mainFromCache = false;
+    // Shared-module bundle inlined at the top of the entry chunk (code-split
+    // path only). Non-empty when app modules are shared between route chunks.
+    let sharedModuleBundle = '';
     function mustReuseWithoutStat(filePath) {
         return !!only && !only.has(filePath);
     }
@@ -899,7 +959,7 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
                         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) });
                 }
                 walkSplit(node.children || [], [..._chain, node]);
             }
@@ -917,9 +977,144 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
                 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) => `(()=>{\nconst __components = globalThis.__components || (globalThis.__components = {});\nconst __hydrators = globalThis.__hydrators || (globalThis.__hydrators = {});\n${body}\n})();\n`;
+        /**
+         * Modules imported by MORE THAN ONE chunk are bundled ONCE and shipped
+         * inside the main bundle, instead of being inlined into every chunk.
+         *
+         * Per-chunk bundling duplicates them, and a duplicated module means a
+         * duplicated module SCOPE: a module-scope `track()` cell in `auth/store.ts`
+         * exists once per chunk, so signing in through the login chunk left the
+         * portal chunk's copy of the session empty and the router rendered the
+         * signed-out view — silently, with a green build and no thrown error.
+         *
+         * The one copy lives in the entry bundle (loaded by every page before any
+         * route chunk exists) and publishes itself on `globalThis.__veskShared`;
+         * each route chunk imports a generated shim that reads its bindings from
+         * there. Keeping it in the MAIN bundle rather than a separate chunk is what
+         * makes it race-free: dynamically inserted classic scripts are async by
+         * default and do not execute in insertion order, so a shared chunk fetched
+         * alongside route chunks can — and did — lose that race.
+         *
+         * Only app-local modules qualify. A node_modules package used by several
+         * chunks is pure third-party code with no module state worth sharing, and
+         * hoisting one (a `lucide-vesk` barrel) would pull it into the entry
+         * bundle for every page.
+         */
+        const sharedUsage = 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(resolve(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 = '';
+        // Runtime bindings the shared modules need. The entry bundle publishes each
+        // of these on `globalThis`, and the shared bundle reads them back, so the
+        // app and its stores share ONE runtime instance.
+        const sharedRuntimeNames = new Set();
+        if (sharedSources.length > 0) {
+            const tmpBase = mkdtempSync(join(resolve(appDir, '..'), 'tmp-vesk-shared-'));
+            try {
+                // One entry that imports every shared module and publishes the whole
+                // map on a global, so esbuild emits a single deduped body.
+                const sharedEntry = join(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')} };`);
+                writeFileSync(sharedEntry, lines.join('\n'));
+                const appTsconfig = findTsconfigPath(appDir);
+                // Which runtime bindings do the shared modules need? The entry bundle
+                // publishes exactly these on `globalThis`; the shim reads them back.
+                const runtimeShim = join(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)});`);
+                }
+                writeFileSync(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;
+                // Per-chunk shims: `export const login = __veskShared['…'].login`.
+                // esbuild inlines these tiny stubs instead of the real module.
+                sharedSources.forEach((source, i) => {
+                    const named = 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 = join(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)}];`);
+                    }
+                    writeFileSync(shim, shimLines.join('\n') + '\n');
+                    chunkAlias[source] = shim;
+                });
+            }
+            catch (e) {
+                // A failed shared pass must never ship a half-shared graph: fall back
+                // to per-chunk inlining (the historical behaviour, duplicated modules
+                // and all) rather than to dangling bindings.
+                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(build) {
+                    build.onResolve({ filter: /.*/ }, (args) => {
+                        const mapped = chunkAlias[args.path];
+                        return mapped ? { path: mapped } : null;
+                    });
+                },
+            }
+            : null;
         for (const entry of chunkEntries) {
             if (!entry.code.trim())
                 continue;
@@ -955,6 +1150,13 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
                         // 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;
@@ -1018,14 +1220,22 @@ export async function generateClientBundle(routeTree, appDir, componentMap, opti
             }
         }
         annotate(routeTree);
-        const mainKey = JSON.stringify(routeTree) + '|' + [...runtimeImportNames].sort().join(',') + `|${!!options?.hmr}|${!!options?.importRuntime}|${options?.routeDataCache ?? ''}`;
+        // Publish shared modules from the ENTRY bundle so they exist before any
+        // route chunk is even requested (see the shared-module pass above).
+        sharedModuleBundle = sharedBundleCode;
+        // The shared modules read these runtime bindings back off `globalThis`, so
+        // the entry bundle must publish them even when no `.vsk` file imports them
+        // (a store-only app would otherwise get `undefined` for `track`).
+        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 (cache?.mainBundle && cache.mainBundle.key === mainKey) {
             mainFromCache = true;
             main = cache.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 (cache)
                 cache.mainBundle = { key: mainKey, code: main };
         }
@@ -1275,7 +1485,7 @@ function appendHmrGlobals(code) {
         "  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
         ? [...new Set([...baseRuntimeImports, ...runtimeImportNames])]
@@ -1392,6 +1602,11 @@ async function buildMainBundle(routeTree, runtimeDir, codeSplit, mono, hmr, impo
             'const __hydrators = globalThis.__hydrators || (globalThis.__hydrators = {});\n' +
             'const __runtime_comps = __components;\n\n' +
             runtimeGlobals + 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' +

package/dist/dev-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../src/dev-server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,MAAM,EAA6C,MAAM,WAAW,CAAC;AASjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAK7C,OAAO,KAAK,EAAa,gBAAgB,EAAwB,MAAM,yBAAyB,CAAC;AAgBjG;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,IAAI,GAAG,WAAW,GAAG,OAAO,GAAG,MAAM,CAAC;IAC9C,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACxD,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB;+EAC2E;IAC3E,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,mEAAmE;AACnE,wBAAgB,kBAAkB,IAAI,WAAW,CAEhD;AAuCD,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAIzE;AAkBD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,mHAAmH;IACnH,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC7B;;8BAE0B;IAC1B,MAAM,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,UAAU,GAAG,YAAY,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IACrE,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,WAAW,CAAC;IAChC,8EAA8E;IAC9E,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3E;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,wBAAwB,GAAG;IACvE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;CAChH,CAUA;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAa3C;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIrD;AA8CD,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwqBvG"}
+{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../src/dev-server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,MAAM,EAA6C,MAAM,WAAW,CAAC;AASjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAK7C,OAAO,KAAK,EAAa,gBAAgB,EAAwB,MAAM,yBAAyB,CAAC;AAgBjG;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,IAAI,GAAG,WAAW,GAAG,OAAO,GAAG,MAAM,CAAC;IAC9C,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACxD,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB;+EAC2E;IAC3E,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,mEAAmE;AACnE,wBAAgB,kBAAkB,IAAI,WAAW,CAEhD;AAuCD,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAIzE;AAkBD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,mHAAmH;IACnH,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC7B;;8BAE0B;IAC1B,MAAM,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,UAAU,GAAG,YAAY,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IACrE,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,WAAW,CAAC;IAChC,8EAA8E;IAC9E,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3E;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,wBAAwB,GAAG;IACvE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;CAChH,CAUA;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAa3C;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIrD;AA8CD,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAorBvG"}

package/dist/dev-server.js

@@ -567,6 +567,18 @@ export async function startDevServer(appDir, options) {
             res.end(lines.join('\n') || '// no ssr data');
             return;
         }
+        // Persisted-store pre-paint payload — same token-stash/consume contract as
+        // /ssr-data.js above so the dev SPA fallback never serves HTML as JS.
+        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.startsWith('/_vesk/static/')) {
             const relPath = url.pathname.slice('/_vesk/static/'.length);
             const staticPath = resolveWithin(resolve(devDir, 'static'), relPath);

package/dist/hmr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hmr.d.ts","sourceRoot":"","sources":["../src/hmr.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAUxC,OAAO,EAAsC,KAAK,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAEvG,OAAO,KAAK,EAAE,SAAS,EAAkB,MAAM,yBAAyB,CAAC;AAIzE;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gFAAgF;IAChF,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAaD,wBAAgB,WAAW,IAAI;IAC7B,MAAM,EAAE,IAAI,GAAG,QAAQ,CAAC;IACxB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,eAAe,GAAG,IAAI,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAQA;AAED,MAAM,WAAW,wBAAwB;IACvC,8EAA8E;IAC9E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wEAAwE;IACxE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,wBAA6B,GAClC,eAAe,CAsGjB;AAoSD,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC;IACD,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAClE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvH,WAAW,EAAE,MAAM,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;CACnD,CA6KA"}
+{"version":3,"file":"hmr.d.ts","sourceRoot":"","sources":["../src/hmr.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAUxC,OAAO,EAAsC,KAAK,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAEvG,OAAO,KAAK,EAAE,SAAS,EAAkB,MAAM,yBAAyB,CAAC;AAIzE;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gFAAgF;IAChF,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAaD,wBAAgB,WAAW,IAAI;IAC7B,MAAM,EAAE,IAAI,GAAG,QAAQ,CAAC;IACxB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,eAAe,GAAG,IAAI,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAQA;AAED,MAAM,WAAW,wBAAwB;IACvC,8EAA8E;IAC9E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wEAAwE;IACxE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,wBAA6B,GAClC,eAAe,CAsGjB;AAqTD,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC;IACD,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAClE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvH,WAAW,EAAE,MAAM,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;CACnD,CA6KA"}

package/dist/hmr.js

@@ -5,7 +5,7 @@ import { fileURLToPath } from 'node:url';
 import { compileClient } from '@vesk/compiler/src/client-codegen';
 import { buildHmrEvalSnippet } from './client-bundle';
 import { resolveComponentName, randomToken } from '@vesk/compiler/src/server-codegen';
-import { resolveErrorFile } from '@vesk/adapter/src/ssr-function';
+import { resolveErrorFile, persistedStoreSsrCode } from '@vesk/adapter/src/ssr-function';
 import { resolveCssUrls, hasBuiltGlobalCss } from '@vesk/adapter/src/css';
 import { isAllowedWsUpgrade } from '@vesk/adapter/src/paths';
 import { parseCompilerError, buildCodeframe } from '@vesk/adapter/src/error-codeframe';
@@ -363,6 +363,7 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
             // serialized by `renderFullPage` under another and the page would ship
             // with no ssr-data script.
             '  return withSsrStore(async () => {',
+            '  resetPersistedStoreKeys();',
             '  let page;',
             '  let caughtError = null;',
             '  try {',
@@ -382,7 +383,7 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
             "    if (_inner.head) _head = _inner.head + _head;",
             '  }',
             "  const html = await renderFullPage(_layoutSrcList[0], _layoutCompList[0], { params, children: _body }, __componentRegistry, { hydrate: true, cached: _layoutCompiledList[0]" + bakedOptions + clientScriptOption + dataScriptOption + ', pageHead: _head, sourcePath: _layoutPathList[0] });',
-            "  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 });",
             '  });',
         ].join('\n');
     }
@@ -390,6 +391,7 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
         renderCode = [
             '  return withSsrStore(async () => {',
             '  let stream;',
+            "  const __streamToken = globalThis.__vsk_ssr_token || '';",
             '  try {',
             '    stream = renderPageStream(_src, _comp, { params }, __componentRegistry, { hydrate: true, cached: _srcCompiled' + bakedOptions + clientScriptOption + dataScriptOption + ", sourcePath: _srcPath });",
             '  } catch (err) {',
@@ -398,13 +400,26 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
             "    const message = err && typeof err === 'object' && 'message' in err ? String(err.message) : String(err);",
             "    const stack = err && typeof err === 'object' && 'stack' in err ? String(err.stack) : '';",
             "    const html = await renderFullPage(_errorSrc, _errorComp, { params, statusCode: 500, error: message, stack, url: url.href }, __componentRegistry, { hydrate: true, cached: _errorCompiled" + bakedOptions + clientScriptOption + dataScriptOption + ', sourcePath: _errorPath });',
-            "    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);',
             '      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 {',
+            '        resetPersistedStoreKeys(__streamToken);',
             '      }',
             '      controller.close();',
             '    },',
@@ -424,10 +439,12 @@ function regenerateSsrFunction(routeNode, appDir, outDir, componentMap, options)
         '}',
     ].join('\n');
     const funcCode = [
-        "import { renderFullPage, renderPageStream, renderPage, compileFile, setVskHydrate, storeDataScriptGlobal, withSsrStore } from '../runtime.js';",
+        "import { renderFullPage, renderPageStream, renderPage, compileFile, setVskHydrate, storeDataScriptGlobal, withSsrStore, installPersistedStoreServerHooks, persistedStoreCookieName, getPersistedStoreKeys, resetPersistedStoreKeys, buildStorePrePaintPayload, storeInitScriptGlobal, storeInitScriptTag } from '../runtime.js';",
         '', registryCode, src, '',
         errorBodyFnCode,
         '',
+        persistedStoreSsrCode(),
+        '',
         'export async function handle(request) {',
         '  const url = new URL(request.url);',
         "  const urlParts = url.pathname.split('/').filter(Boolean);",

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EACe,YAAY,EAAE,WAAW,EAC7B,UAAU,EAChC,MAAM,yBAAyB,CAAC;AAiBjC;;;;;;GAMG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;CACjB;AACD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,iBAAiB,EAAE,CAAC;CAC9B;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,UAAU,EAAE,EACrB,OAAO,EAAE,iBAAiB,EAAE,GAAG,IAAI,GAAG,SAAS,GAC9C,UAAU,EAAE,CAQd;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,UAAU,EAAE,EACrB,KAAK,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GACxC,UAAU,EAAE,CAGd;AAkDD,wBAAsB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAsWpG;AAED,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAIhE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,yBAAyB,EACzB,eAAe,GAChB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,mBAAmB,EACnB,YAAY,EACZ,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,aAAa,GACd,MAAM,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EACe,YAAY,EAAE,WAAW,EAC7B,UAAU,EAChC,MAAM,yBAAyB,CAAC;AAoDjC;;;;;;GAMG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;CACjB;AACD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,iBAAiB,EAAE,CAAC;CAC9B;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,UAAU,EAAE,EACrB,OAAO,EAAE,iBAAiB,EAAE,GAAG,IAAI,GAAG,SAAS,GAC9C,UAAU,EAAE,CAQd;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,UAAU,EAAE,EACrB,KAAK,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GACxC,UAAU,EAAE,CAGd;AAkDD,wBAAsB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAiXpG;AAED,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAIhE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,yBAAyB,EACzB,eAAe,GAChB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,mBAAmB,EACnB,YAAY,EACZ,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,aAAa,GACd,MAAM,2BAA2B,CAAC"}

package/dist/index.js

@@ -28,6 +28,38 @@ async function resolveCompilerApi(name) {
     }
     return import(`@vesk/compiler/src/${name.replace(/\.js$/, '')}`);
 }
+/**
+ * Build gate against two page files claiming one URL.
+ *
+ * SSR routes are keyed by URL pattern (fullPath) — last write wins in the
+ * path->file map — while the client router walks the manifest tree first-match
+ * wins, so a group page and a root page both claiming `/` ship a document for
+ * one of them and hydrate the other. Both respond 200; the only symptom is a
+ * page whose claims land on the layout's elements. Refuse the build instead.
+ */
+function findRouteConflicts(routeTree, appDir) {
+    const projectRoot = resolve(appDir, '..');
+    const byPath = new Map();
+    const walk = (nodes) => {
+        for (const node of nodes) {
+            if (node.page) {
+                const pageFile = join(node.sourceDir, 'page.vsk');
+                const files = byPath.get(node.fullPath) ?? [];
+                files.push(relative(projectRoot, pageFile));
+                byPath.set(node.fullPath, files);
+            }
+            if (node.children && node.children.length > 0)
+                walk(node.children);
+        }
+    };
+    walk(routeTree);
+    const conflicts = [];
+    for (const [fullPath, files] of byPath) {
+        if (files.length > 1)
+            conflicts.push({ fullPath, files });
+    }
+    return conflicts;
+}
 /**
  * Defensive local mirror of the plugin-manager's `filterActivePlugins`
  * (`@vesk/adapter/src/plugins`): keep when there is no matching record, or the
@@ -214,6 +246,14 @@ export async function build(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 = resolve(appDir, '..');
     const componentsDir = resolve(projectRoot, 'components');
     const componentMap = scanComponents(componentsDir);

package/dist/platform-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform-handler.d.ts","sourceRoot":"","sources":["../src/platform-handler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAIvE,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,SAAS,EAAE,CAAC;IACvB,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iFAAiF;IACjF,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAMpD;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGrD;AAED,wBAAgB,IAAI,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAEtC;AAgBD;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,oBAAoB,GAAG,MAAM,CAwLjF;AAED,MAAM,WAAW,qBAAqB;IACpC,kEAAkE;IAClE,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsFzF;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,EAAE,CAAC;IACvB,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB"}
+{"version":3,"file":"platform-handler.d.ts","sourceRoot":"","sources":["../src/platform-handler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAIvE,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,SAAS,EAAE,CAAC;IACvB,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iFAAiF;IACjF,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAMpD;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGrD;AAED,wBAAgB,IAAI,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAEtC;AAgBD;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,oBAAoB,GAAG,MAAM,CAsMjF;AAED,MAAM,WAAW,qBAAqB;IACpC,kEAAkE;IAClE,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsFzF;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,EAAE,CAAC;IACvB,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB"}

package/dist/platform-handler.js

@@ -154,6 +154,20 @@ ${serverStoreLine}
     });
   }
 
+  // Persisted-store pre-paint payload (buildStorePrePaintPayload) — 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}) {

package/dist/prod-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prod-server.d.ts","sourceRoot":"","sources":["../src/prod-server.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2D,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AAiDjG,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAIzE;AAkGD,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAwdxI"}
+{"version":3,"file":"prod-server.d.ts","sourceRoot":"","sources":["../src/prod-server.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2D,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AAiDjG,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAIzE;AAkGD,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAqexI"}

package/dist/prod-server.js

@@ -290,6 +290,19 @@ export async function startProdServer(outDir, options) {
             res.end(lines.join('\n') || '// no ssr data');
             return;
         }
+        // Persisted-store pre-paint payload (buildStorePrePaintPayload), stashed by
+        // storeInitScriptGlobal under its own token store so consuming one never
+        // eats the page's /ssr-data.js handoff. Served once, consumed-and-deleted.
+        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;
+        }
         // Stable alias for the client runtime: the file on disk is content-hashed in
         // production, so the name is resolved from the manifest rather than assumed.
         if (url.pathname === '/_vesk/runtime.js') {

package/dist/runtime-bundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-bundle.d.ts","sourceRoot":"","sources":["../src/runtime-bundle.ts"],"names":[],"mappings":"AAuCA,wBAAsB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA4JnF"}
+{"version":3,"file":"runtime-bundle.d.ts","sourceRoot":"","sources":["../src/runtime-bundle.ts"],"names":[],"mappings":"AAuCA,wBAAsB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA+LnF"}

package/dist/runtime-bundle.js

@@ -42,6 +42,7 @@ export async function bundleRuntime(appDir, outDir) {
         `import { renderPage, renderFullPage, renderPageStream, compileFile, setRuntimeModule, setVskHydrate, hydratePrecompile, assertSameOrigin, withSsrStore } from ${JSON.stringify(resolve(compilerRoot, 'server-codegen.js'))};`,
         `import { parseCookies } from ${JSON.stringify(resolve(compilerRoot, 'server-cookies.js'))};`,
         `import * as __veskRuntime from ${JSON.stringify(resolve(runtimeRoot, 'index-server.js'))};`,
+        `import * as __persistence from ${JSON.stringify(resolve(runtimeRoot, 'store-persistence.js'))};`,
         '',
         '// Inject runtime module so server-codegen can find components like NavLink, Link, etc.',
         'setRuntimeModule(__veskRuntime);',
@@ -107,6 +108,40 @@ export 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;',

package/dist/ssr-function.d.ts

@@ -1,5 +1,10 @@
 import type { RouteNode, SsrFunctionOptions } from '@vesk/adapter/src/types';
 export declare function resolveErrorFile(sourceDir: string, appDir: string): string | null;
+/** Shared persisted-store SSR helper block emitted into every generated SSR
+ *  function (prod via ssr-function.ts, dev via hmr.ts — keep the two callers
+ *  in sync by calling this). Emit it AFTER the function declarations so the
+ *  module-level `installPersistedStoreServerHooks` call runs on import. */
+export declare function persistedStoreSsrCode(): string;
 export declare function generateSsrFunction(routeNode: RouteNode, appDir: string, outDir: string, componentMap?: Map<string, string>, options?: SsrFunctionOptions): {
     funcPath: string;
     funcCode: string;

package/dist/ssr-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-function.d.ts","sourceRoot":"","sources":["../src/ssr-function.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAkB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAI7F,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQjF;AAgED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,OAAO,CAAC,EAAE,kBAAkB,GAC3B;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAwZtD"}
+{"version":3,"file":"ssr-function.d.ts","sourceRoot":"","sources":["../src/ssr-function.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAkB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAI7F,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQjF;AAgED;;;2EAG2E;AAC3E,wBAAgB,qBAAqB,IAAI,MAAM,CA4C9C;AAED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,OAAO,CAAC,EAAE,kBAAkB,GAC3B;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CA4btD"}

package/dist/ssr-function.js

@@ -77,6 +77,55 @@ function buildParamExtraction(node, urlParts) {
     walk(node);
     return parts;
 }
+/** Shared persisted-store SSR helper block emitted into every generated SSR
+ *  function (prod via ssr-function.ts, dev via hmr.ts — keep the two callers
+ *  in sync by calling this). Emit it AFTER the function declarations so the
+ *  module-level `installPersistedStoreServerHooks` call runs on import. */
+export function persistedStoreSsrCode() {
+    return [
+        '// ── Persisted-store SSR continuity (createStore / createPathStore persist) ──',
+        '// 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');
+}
 export function generateSsrFunction(routeNode, appDir, outDir, componentMap, options) {
     const ancestorLayouts = options?.ancestorLayouts || [];
     const middlewareCode = options?.middlewareCode || null;
@@ -167,6 +216,7 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
             '',
             'async function __renderHtml(params, requestUrl) {',
             '  return withSsrStore(async () => {',
+            '  resetPersistedStoreKeys();',
             '  let page;',
             '  let caughtError = null;',
             "  const __expose = process.env.NODE_ENV !== 'production';",
@@ -187,7 +237,7 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
             '    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 });",
             '  });',
             '}',
             '',
@@ -207,25 +257,48 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
             '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) — 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();',
@@ -236,6 +309,12 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
             '',
         ].join('\n');
     }
+    // Persisted-store SSR continuity (createStore / createPathStore persist).
+    // The adapter-installed read hook pulls each store's cookie value through the
+    // request context; the tag the generated pages emit points at an origin-served
+    // /store-init.js?t=<token> file (CSP-safe, never inlined — see
+    // buildStorePrePaintPayload) so the client can pre-paint the user's value.
+    const persistCode = persistedStoreSsrCode();
     let dataCode;
     const exposeErr = "process.env.NODE_ENV !== 'production'";
     // SPA data-nav renders page + layouts through renderPage and never runs
@@ -254,6 +333,9 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
         // 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();',
         '    }',
     ];
     // The data-nav branch never runs renderFullPage/renderPageStream, so it needs
@@ -446,7 +528,7 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
         '',
     ].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,
@@ -455,6 +537,8 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
         paramsCode,
         htmlFnCode,
         '',
+        persistCode,
+        '',
         'export async function handle(request) {',
         '  const url = new URL(request.url);',
         '  const params = __paramsFor(url.pathname);',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/adapter",
-  "version": "0.2.58",
+  "version": "0.2.60",
   "type": "module",
   "description": "Vesk adapter — builds deployable .vesk/ output for Deno and Node serverless",
   "main": "./dist/index.js",
@@ -23,9 +23,9 @@
     "sharp": "^0.35.3"
   },
   "dependencies": {
-    "@vesk/compiler": "^0.2.58",
-    "@vesk/runtime": "^0.2.58",
-    "@vesk/types": "^0.2.58"
+    "@vesk/compiler": "^0.2.60",
+    "@vesk/runtime": "^0.2.60",
+    "@vesk/types": "^0.2.60"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",