@volter/world-runtime 2.0.10 → 2.0.12

package/dist/src/branch.js

@@ -46,7 +46,38 @@ export async function branchWorld(base, name, options = {}) {
         throw new Error(`volter-world branch: ${base} has a managed database, which keeps no history to branch from at an instant or position; branch from its current state`);
     }
     refuseLiveDatabases(from, databases);
-    const instance = await upWorld(existsSync(from.configPath) ? from.configPath : from.config, { name, root, mode: from.mode, envFile });
+    // a branch that fails to boot (a twin whose mounted version breaks the config's pin) leaves no half-made branch behind:
+    // its record without a fork would check out later as an empty World
+    const existed = (() => { try {
+        statusWorld(name, root);
+        return true;
+    }
+    catch {
+        return false;
+    } })();
+    let instance;
+    try {
+        instance = await upWorld(existsSync(from.configPath) ? from.configPath : from.config, { name, root, mode: from.mode, envFile });
+    }
+    catch (error) {
+        let recorded = false;
+        if (!existed) {
+            try {
+                statusWorld(name, root);
+                recorded = true;
+            }
+            catch { /* the boot recorded nothing */ }
+        }
+        if (recorded) {
+            try {
+                await downWorld(name, root, { purge: true });
+            }
+            catch (cleanup) {
+                throw new Error(`${error instanceof Error ? error.message : String(error)} (and the half-made branch ${name} could not be removed: ${cleanup instanceof Error ? cleanup.message : String(cleanup)})`);
+            }
+        }
+        throw error;
+    }
     const forked = {};
     try {
         if (from.origin) {

package/dist/src/served-world.js

@@ -37,7 +37,7 @@ import { fetchFromOrigin } from "./origin.js";
 import { CONSOLE_BASE, consoleRedirect, serveConsoleApart } from "./console-apart.js";
 import { loadWorldConfig } from "./configs.js";
 import { adaptersFor, credentialPath, packMirror, credentialPayloadFrom, deployTwin, deployWorld, loadWorldChecks, twinSigningSecret, materializeRoots, refreshPosture, refreshTwin, rootForControlRoot, sealTwinCredential, sealedCredentialInfo, setTwinRoot, spanMs } from "./root.js";
-import { clockFile, downWorld, statusWorld, upWorld } from "./runtime.js";
+import { clockFile, downWorld, listWorlds, statusWorld, upWorld } from "./runtime.js";
 export const TOKEN_HEADER = 'x-volter-token';
 /** The header the injector carries a hosted World's token in (inject.cjs, VOLTER_TWINS_KEY). */
 export const TWINS_KEY_HEADER = 'x-twins-key';
@@ -1429,8 +1429,16 @@ export class WorldDoors {
         const branches = this.host.branches;
         if (!branches)
             return Response.json({ error: `this host makes no branches of ${this.served}` }, { status: 404 });
-        if (rest.length === 0 && request.method === 'GET')
-            return Response.json({ world: this.served, branches: await branches.list() });
+        if (rest.length === 0 && request.method === 'GET') {
+            // beside the host's snapshots, the World's own NAMED branches (`volter world branch`): one runs at a time, and
+            // `checkedOut` is the one this serve holds, so a page never names the World for the branch it shows
+            let named = [];
+            try {
+                named = listWorlds(this.worldRoot).map((w) => ({ name: w.name, running: w.running }));
+            }
+            catch { /* a World with no local branches */ }
+            return Response.json({ world: this.served, branches: await branches.list(), checkedOut: this.name, named });
+        }
         if (rest.length === 0 && request.method === 'POST') {
             const body = (await request.json().catch(() => null));
             const instant = body?.at?.instant;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/world-runtime",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "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,7 +68,7 @@
   },
   "peerDependencies": {
     "@volter/world-core": "2.0.7",
-    "@volter/world-console": "2.0.6"
+    "@volter/world-console": "2.0.7"
   },
   "dependencies": {
     "@electric-sql/pglite": "0.5.8",

package/src/branch.ts

@@ -48,7 +48,22 @@ export async function branchWorld(base: string, name: string, options: BranchOpt
     throw new Error(`volter-world branch: ${base} has a managed database, which keeps no history to branch from at an instant or position; branch from its current state`);
   }
   refuseLiveDatabases(from, databases);
-  const instance = await upWorld(existsSync(from.configPath) ? from.configPath : from.config, { name, root, mode: from.mode, envFile });
+  // a branch that fails to boot (a twin whose mounted version breaks the config's pin) leaves no half-made branch behind:
+  // its record without a fork would check out later as an empty World
+  const existed = (() => { try { statusWorld(name, root); return true; } catch { return false; } })();
+  let instance: WorldInstance;
+  try {
+    instance = await upWorld(existsSync(from.configPath) ? from.configPath : from.config, { name, root, mode: from.mode, envFile });
+  } catch (error) {
+    let recorded = false;
+    if (!existed) { try { statusWorld(name, root); recorded = true; } catch { /* the boot recorded nothing */ } }
+    if (recorded) {
+      try { await downWorld(name, root, { purge: true }); } catch (cleanup) {
+        throw new Error(`${error instanceof Error ? error.message : String(error)} (and the half-made branch ${name} could not be removed: ${cleanup instanceof Error ? cleanup.message : String(cleanup)})`);
+      }
+    }
+    throw error;
+  }
   const forked: Record<string, string[]> = {};
   try {
     if (from.origin) { instance.origin = { ...from.origin }; saveWorldInstance(instance); }

package/src/served-world.ts

@@ -40,7 +40,7 @@ import { fetchFromOrigin } from './origin.ts';
 import { CONSOLE_BASE, consoleRedirect, serveConsoleApart, type ConsoleMount } from './console-apart.ts';
 import { loadWorldConfig } from './configs.ts';
 import { adaptersFor, credentialPath, packMirror, type PackMirror, credentialPayloadFrom, deployTwin, deployWorld, loadWorldChecks, twinSigningSecret, materializeRoots, refreshPosture, refreshTwin, rootForControlRoot, sealTwinCredential, sealedCredentialInfo, setTwinRoot, spanMs } from './root.ts';
-import { clockFile, downWorld, statusWorld, upWorld } from './runtime.ts';
+import { clockFile, downWorld, listWorlds, statusWorld, upWorld } from './runtime.ts';
 import type { WorldInstance } from './schema.ts';
 
 export const TOKEN_HEADER = 'x-volter-token';
@@ -1225,7 +1225,13 @@ export class WorldDoors {
   private async branchesDoor(request: Request, url: URL, rest: string[], via: 'token' | 'key' | 'session' | null): Promise<Response> {
     const branches = this.host.branches;
     if (!branches) return Response.json({ error: `this host makes no branches of ${this.served}` }, { status: 404 });
-    if (rest.length === 0 && request.method === 'GET') return Response.json({ world: this.served, branches: await branches.list() });
+    if (rest.length === 0 && request.method === 'GET') {
+      // beside the host's snapshots, the World's own NAMED branches (`volter world branch`): one runs at a time, and
+      // `checkedOut` is the one this serve holds, so a page never names the World for the branch it shows
+      let named: Array<{ name: string; running: boolean }> = [];
+      try { named = listWorlds(this.worldRoot).map((w) => ({ name: w.name, running: w.running })); } catch { /* a World with no local branches */ }
+      return Response.json({ world: this.served, branches: await branches.list(), checkedOut: this.name, named });
+    }
     if (rest.length === 0 && request.method === 'POST') {
       const body = (await request.json().catch(() => null)) as { at?: { instant?: unknown }; ttl?: unknown; live?: unknown; label?: unknown } | null;
       const instant = body?.at?.instant;