@volter/world-runtime 3.0.34 → 3.0.36

package/dist/src/local-branches.js

@@ -3,9 +3,9 @@
 // parent through its own doors (its history cut at an instant, when one is asked), its clock frozen at
 // that instant so no twin's catch-up walks it forward, and removed when its time runs out. world-host
 // and `volter world view` both make them with this; a hosted World's supervisor makes its own.
-import { cpSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { cpSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
-import { stateDirName, withStateRemoval } from '@volter/world-core/runtime';
+import { readBranchMeta, stateDirName, withHistoryLock, withStateRemoval, worldPaths, worldStateRoot, writeBranchMeta } from '@volter/world-core/runtime';
 import { inheritWorldBrowsers, materializeBrowserFiles } from "./browsers.js";
 import { clockFile, statusWorld } from "./runtime.js";
 import { loadWorldConfig } from "./configs.js";
@@ -169,7 +169,25 @@ export class LocalBranches {
                 writeFileSync(file, `${clock}\n`);
             }
             const child = statusWorld(id, root);
-            inheritWorldBrowsers(statusWorld(world, from.root).dirs.data, child.dirs.data);
+            // The HTTP clone holds the history view here, but its URL parent holds no local resources.
+            // Retain the actual parent's state through the kernel's pointer/pin protocol: blob reads can
+            // follow it without copying uploads, while history keeps using the downloaded immutable view.
+            const base = statusWorld(world, from.root);
+            for (const service of Object.keys(child.services)) {
+                const control = join(child.dirs.data, service);
+                for (const state of readdirSync(worldStateRoot(control), { withFileTypes: true })) {
+                    if (!state.isDirectory())
+                        continue;
+                    const directory = worldPaths(state.name, control).dir;
+                    withHistoryLock(directory, () => {
+                        const meta = readBranchMeta(state.name, control);
+                        if (!meta?.parent)
+                            throw new Error(`cloning ${parent}: ${service}/${state.name} has no parent`);
+                        writeBranchMeta(state.name, { ...meta, parent: { ...meta.parent, at: join(base.dirs.data, service), viewDirectory: directory } }, control);
+                    });
+                }
+            }
+            inheritWorldBrowsers(base.dirs.data, child.dirs.data);
             materializeBrowserFiles(child.dirs.data, root, id, child.config);
             const createdAt = new Date().toISOString();
             const expiresAt = ttlSeconds === null ? null : new Date(Date.now() + ttlSeconds * 1000).toISOString();

package/dist/src/served-world.js

@@ -659,6 +659,9 @@ export class WorldDoors {
             }
             const answer = await this.site(request, site, browser, held);
             const out = new Headers(answer.headers);
+            // A document belongs to this live page session and browser state, not an earlier opening of its URL.
+            if (out.get('content-type')?.split(';', 1)[0]?.trim().toLowerCase() === 'text/html')
+                out.set('cache-control', 'private, no-store');
             out.append('content-security-policy', `frame-ancestors 'self'${held.framer ? ` ${held.framer}` : ''}`);
             this.keepCookiesHere(answer, out);
             return new Response(answer.body, { status: answer.status, statusText: answer.statusText, headers: out });
@@ -1153,7 +1156,7 @@ export class WorldDoors {
         }
         putBrowserLoad(this.up().dirs.data, loadId, { name, site, version: browser.version, cookies: cookies.filter(c => !protectedCookie(c.name)).map(c => ({ name: c.name, path: c.path })) });
         headers.append('set-cookie', `${marker}=${loadId}; Path=/; HttpOnly; Secure; SameSite=None; Partitioned`);
-        const script = `localStorage.clear(); for (const entry of ${JSON.stringify(storage).replace(/</g, '\\u003c')}) localStorage.setItem(entry.name, entry.value); location.replace(location.href);`;
+        const script = `localStorage.clear(); for (const entry of ${JSON.stringify(storage).replace(/</g, '\\u003c')}) localStorage.setItem(entry.name, entry.value); location.reload();`;
         const hash = createHash('sha256').update(script).digest('base64');
         const framer = this.pageSession(request, url, site, name)?.framer;
         headers.set('content-security-policy', `default-src 'none'; script-src 'sha256-${hash}'; base-uri 'none'; frame-ancestors 'self'${framer ? ` ${framer}` : ''}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/world-runtime",
-  "version": "3.0.34",
+  "version": "3.0.36",
   "description": "World configs for twins: boot named local runtimes, allocate ports, generate world.env/instance.json, and run apps against fake-key twin worlds.",
   "keywords": [
     "twin",
@@ -68,14 +68,14 @@
     "node": ">=22.3"
   },
   "peerDependencies": {
-    "@volter/world-core": "3.0.34",
-    "@volter/world-console": "3.0.29"
+    "@volter/world-core": "3.0.36",
+    "@volter/world-console": "3.0.31"
   },
   "dependencies": {
     "@electric-sql/pglite": "0.5.8",
     "@electric-sql/pglite-pgvector": "0.0.9",
     "@volter/world-access": "3.0.1",
-    "@volter/world-core": "3.0.34",
+    "@volter/world-core": "3.0.36",
     "pg-gateway": "0.3.0-beta.4",
     "smol-toml": "^1.8.0",
     "yaml": "2.9.0"

package/src/local-branches.ts

@@ -3,9 +3,9 @@
 // parent through its own doors (its history cut at an instant, when one is asked), its clock frozen at
 // that instant so no twin's catch-up walks it forward, and removed when its time runs out. world-host
 // and `volter world view` both make them with this; a hosted World's supervisor makes its own.
-import { cpSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { cpSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
-import { stateDirName, withStateRemoval } from '@volter/world-core/runtime';
+import { readBranchMeta, stateDirName, withHistoryLock, withStateRemoval, worldPaths, worldStateRoot, writeBranchMeta } from '@volter/world-core/runtime';
 import { inheritWorldBrowsers, materializeBrowserFiles } from './browsers.ts';
 import { clockFile, statusWorld } from './runtime.ts';
 import { loadWorldConfig } from './configs.ts';
@@ -162,7 +162,23 @@ export class LocalBranches {
       const clock = at.instant ?? this.frozenClock(from) ?? (at.live ? null : new Date().toISOString());
       if (clock) { const file = clockFile(root, id); mkdirSync(dirname(file), { recursive: true }); writeFileSync(file, `${clock}\n`); }
       const child = statusWorld(id, root);
-      inheritWorldBrowsers(statusWorld(world, from.root).dirs.data, child.dirs.data);
+      // The HTTP clone holds the history view here, but its URL parent holds no local resources.
+      // Retain the actual parent's state through the kernel's pointer/pin protocol: blob reads can
+      // follow it without copying uploads, while history keeps using the downloaded immutable view.
+      const base = statusWorld(world, from.root);
+      for (const service of Object.keys(child.services)) {
+        const control = join(child.dirs.data, service);
+        for (const state of readdirSync(worldStateRoot(control), { withFileTypes: true })) {
+          if (!state.isDirectory()) continue;
+          const directory = worldPaths(state.name, control).dir;
+          withHistoryLock(directory, () => {
+            const meta = readBranchMeta(state.name, control);
+            if (!meta?.parent) throw new Error(`cloning ${parent}: ${service}/${state.name} has no parent`);
+            writeBranchMeta(state.name, { ...meta, parent: { ...meta.parent, at: join(base.dirs.data, service), viewDirectory: directory } }, control);
+          });
+        }
+      }
+      inheritWorldBrowsers(base.dirs.data, child.dirs.data);
       materializeBrowserFiles(child.dirs.data, root, id, child.config);
       const createdAt = new Date().toISOString();
       const expiresAt = ttlSeconds === null ? null : new Date(Date.now() + ttlSeconds * 1000).toISOString();

package/src/served-world.ts

@@ -645,6 +645,8 @@ export class WorldDoors {
       }
       const answer = await this.site(request, site, browser, held);
       const out = new Headers(answer.headers);
+      // A document belongs to this live page session and browser state, not an earlier opening of its URL.
+      if (out.get('content-type')?.split(';', 1)[0]?.trim().toLowerCase() === 'text/html') out.set('cache-control', 'private, no-store');
       out.append('content-security-policy', `frame-ancestors 'self'${held.framer ? ` ${held.framer}` : ''}`);
       this.keepCookiesHere(answer, out);
       return new Response(answer.body, { status: answer.status, statusText: answer.statusText, headers: out });
@@ -1043,7 +1045,7 @@ export class WorldDoors {
     }
     putBrowserLoad(this.up().dirs.data, loadId, { name, site, version: browser.version, cookies: cookies.filter(c => !protectedCookie(c.name)).map(c => ({ name: c.name, path: c.path })) });
     headers.append('set-cookie', `${marker}=${loadId}; Path=/; HttpOnly; Secure; SameSite=None; Partitioned`);
-    const script = `localStorage.clear(); for (const entry of ${JSON.stringify(storage).replace(/</g, '\\u003c')}) localStorage.setItem(entry.name, entry.value); location.replace(location.href);`;
+    const script = `localStorage.clear(); for (const entry of ${JSON.stringify(storage).replace(/</g, '\\u003c')}) localStorage.setItem(entry.name, entry.value); location.reload();`;
     const hash = createHash('sha256').update(script).digest('base64');
     const framer = this.pageSession(request, url, site, name)?.framer;
     headers.set('content-security-policy', `default-src 'none'; script-src 'sha256-${hash}'; base-uri 'none'; frame-ancestors 'self'${framer ? ` ${framer}` : ''}`);