@volter/world-runtime 2.0.44 → 2.0.46

package/dist/src/served-world.js

@@ -31,7 +31,7 @@ import { APP_READ_ENDPOINT_ENV } from "./init.js";
 import { grantOf, presentedSecrets, sameSecret, spentPasses, verifyPass } from '@volter/world-access';
 import { createHash } from 'node:crypto';
 import { dirname, join, resolve } from 'node:path';
-import { appendActionIfAbsent, branchEntries, branchLogPath, branchMetaPath, changesetContentHash, confirmAction, parentLogPath, readTree, stateDirName, wholeLog, worldNow, parentEntries, rebaseBranch, } from '@volter/world-core';
+import { appendActionIfAbsent, branchEntries, branchLogPath, branchMetaPath, changesetContentHash, confirmAction, parentLogPath, readTree, stateDirName, wholeLog, worldNow, parentEntries, readBranchMeta, rebaseBranch, } from '@volter/world-core';
 import { approveWorldChangeset, createWorldChangeset, diffWorld, findWorldChangeset, listWorldChangesets, pushWorldChangeset, verifyWorldChangeset, worldChangesetsDir } from "./changeset.js";
 import { fetchFromOrigin } from "./origin.js";
 import { CONSOLE_BASE, consoleRedirect, serveConsoleApart } from "./console-apart.js";
@@ -1315,8 +1315,31 @@ export class WorldDoors {
             const store = getActiveWorldStore();
             const key = () => { const t = store.read(tokenPath)?.trim(); if (!t)
                 throw new Error(`${this.served} has no origin — PUT /-/${this.served}/origin { url, token }`); return t; };
-            if (!name && request.method === 'GET')
-                return Response.json({ origin: statusWorld(this.name, this.worldRoot).origin ?? null });
+            if (!name && request.method === 'GET') {
+                const origin = statusWorld(this.name, this.worldRoot).origin ?? null;
+                if (!origin)
+                    return Response.json({ origin: null });
+                // git's "ahead, behind" for this World and its origin, from what is here: ahead, the changes not cut and the
+                // changesets not pushed; behind, per twin, what the last fetch brought that this branch has not taken (a pull
+                // rebases onto it). As of the last fetch: what the origin gained since is known at the next one.
+                const changes = diffWorld(this.name, { root: this.worldRoot }).actions.length;
+                const changesets = listWorldChangesets({ root: this.worldRoot, world: this.name }).filter((l) => !l.changeset.applied || l.changeset.applied.outcome === 'refused').length;
+                const behind = {};
+                for (const twin of Object.keys(this.up().services)) {
+                    const meta = readBranchMeta(this.stateOf(twin), this.controlRoot(twin));
+                    // nothing fetched since the branch took it (a pull, a push or a rebase clears it) is nothing behind
+                    const fetched = meta?.fetchedOrigin;
+                    const on = meta?.origin ?? meta?.parent;
+                    if (!fetched || !on) {
+                        behind[twin] = 0;
+                        continue;
+                    }
+                    const gained = fetched.position - on.position;
+                    // a same-length history rewritten is drift too, read as the fetch reads it (a path origin has no remote view)
+                    behind[twin] = gained > 0 ? gained : (fetched.remoteView ?? fetched.view) !== (on.remoteView ?? on.view) ? 1 : 0;
+                }
+                return Response.json({ origin, ahead: { changes, changesets }, behind, asOf: origin.fetchedAt ?? null });
+            }
             if (!name && request.method === 'PUT') {
                 const body = (await request.json());
                 const at = /^(https?:\/\/[^/]+)\/([a-z0-9][a-z0-9_-]*\/[a-z0-9][a-z0-9_-]*)\/?$/i.exec(body.url ?? '');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/world-runtime",
-  "version": "2.0.44",
+  "version": "2.0.46",
   "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",
@@ -67,14 +67,14 @@
     "node": ">=22.3"
   },
   "peerDependencies": {
-    "@volter/world-core": "2.0.26",
+    "@volter/world-core": "2.0.28",
     "@volter/world-console": "2.0.13"
   },
   "dependencies": {
     "@electric-sql/pglite": "0.5.8",
     "@electric-sql/pglite-pgvector": "0.0.9",
     "@volter/world-access": "2.0.2",
-    "@volter/world-core": "2.0.26",
+    "@volter/world-core": "2.0.28",
     "pg-gateway": "0.3.0-beta.4",
     "smol-toml": "^1.8.0"
   },
@@ -84,6 +84,6 @@
     }
   },
   "optionalDependencies": {
-    "@volter/twin-mongodb": "0.1.26"
+    "@volter/twin-mongodb": "0.1.28"
   }
 }

package/src/served-world.ts

@@ -33,7 +33,7 @@ import { createHash } from 'node:crypto';
 import { dirname, join, resolve } from 'node:path';
 import {
   appendActionIfAbsent, branchEntries, branchLogPath, branchMetaPath, changesetContentHash, confirmAction, parentLogPath, readTree, stateDirName, wholeLog, worldNow,
-  parentEntries, rebaseBranch, type Changeset, type Entry, type Receipt, type RootConfig,
+  parentEntries, readBranchMeta, rebaseBranch, type Changeset, type Entry, type Receipt, type RootConfig,
 } from '@volter/world-core';
 import { approveWorldChangeset, createWorldChangeset, diffWorld, findWorldChangeset, listWorldChangesets, pushWorldChangeset, verifyWorldChangeset, worldChangesetsDir } from './changeset.ts';
 import { fetchFromOrigin } from './origin.ts';
@@ -1131,7 +1131,26 @@ export class WorldDoors {
       const tokenPath = join(this.worldRoot, stateDirName(), 'origin.token');
       const store = getActiveWorldStore();
       const key = (): string => { const t = store.read(tokenPath)?.trim(); if (!t) throw new Error(`${this.served} has no origin — PUT /-/${this.served}/origin { url, token }`); return t; };
-      if (!name && request.method === 'GET') return Response.json({ origin: statusWorld(this.name, this.worldRoot).origin ?? null });
+      if (!name && request.method === 'GET') {
+        const origin = statusWorld(this.name, this.worldRoot).origin ?? null;
+        if (!origin) return Response.json({ origin: null });
+        // git's "ahead, behind" for this World and its origin, from what is here: ahead, the changes not cut and the
+        // changesets not pushed; behind, per twin, what the last fetch brought that this branch has not taken (a pull
+        // rebases onto it). As of the last fetch: what the origin gained since is known at the next one.
+        const changes = diffWorld(this.name, { root: this.worldRoot }).actions.length;
+        const changesets = listWorldChangesets({ root: this.worldRoot, world: this.name }).filter((l) => !l.changeset.applied || l.changeset.applied.outcome === 'refused').length;
+        const behind: Record<string, number> = {};
+        for (const twin of Object.keys(this.up().services)) {
+          const meta = readBranchMeta(this.stateOf(twin), this.controlRoot(twin));
+          // nothing fetched since the branch took it (a pull, a push or a rebase clears it) is nothing behind
+          const fetched = meta?.fetchedOrigin; const on = meta?.origin ?? meta?.parent;
+          if (!fetched || !on) { behind[twin] = 0; continue; }
+          const gained = fetched.position - on.position;
+          // a same-length history rewritten is drift too, read as the fetch reads it (a path origin has no remote view)
+          behind[twin] = gained > 0 ? gained : (fetched.remoteView ?? fetched.view) !== (on.remoteView ?? on.view) ? 1 : 0;
+        }
+        return Response.json({ origin, ahead: { changes, changesets }, behind, asOf: origin.fetchedAt ?? null });
+      }
       if (!name && request.method === 'PUT') {
         const body = (await request.json()) as { url?: string; token?: string; views?: Record<string, HistoryReference> };
         const at = /^(https?:\/\/[^/]+)\/([a-z0-9][a-z0-9_-]*\/[a-z0-9][a-z0-9_-]*)\/?$/i.exec(body.url ?? '');