@volter/twin-world 0.1.4 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/twin-world",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "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",

package/src/resources.ts

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, statfsSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, statfsSync, statSync, writeFileSync } from 'node:fs';
 import { createHash } from 'node:crypto';
 import { homedir, hostname, totalmem } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
@@ -13,6 +13,7 @@ export const DEFAULT_WORLD_RESOURCES: WorldResourceRequirements = {
 
 export type WorldResourceClaim = {
   world: string;
+  root?: string;
   identity: string;
   ownerPid: number;
   holderPids: number[];
@@ -77,7 +78,17 @@ function writePrivate(path: string, contents: string): void {
   writeFileSync(path, contents, { mode: 0o600 });
 }
 
-function capacity(root: string, claims: WorldResourceClaim[]): WorldResourceRequirements {
+/** Resolve old claims without rewriting them. Unknown locations stay charged on every
+ * filesystem rather than silently allowing a reservation we cannot locate. */
+function sharesStorage(root: string, claim: WorldResourceClaim): boolean {
+  try {
+    const claimRoot = claim.root ?? resolve(dirname(claim.log), '../../..');
+    if (claimIdentity(claimRoot, claim.world) !== claim.identity) return true;
+    return statSync(claimRoot).dev === statSync(root).dev;
+  } catch { return true; }
+}
+
+export function worldResourceCapacity(root: string, claims: WorldResourceClaim[]): WorldResourceRequirements {
   const fs = statfsSync(resolve(root));
   const diskFreeMiB = Math.floor((Number(fs.bavail) * Number(fs.bsize)) / MIB);
   const memoryTotalMiB = Math.floor(totalmem() / MIB);
@@ -85,7 +96,8 @@ function capacity(root: string, claims: WorldResourceClaim[]): WorldResourceRequ
   const diskTotalMiB = Math.floor((Number(fs.blocks) * Number(fs.bsize)) / MIB);
   const diskSafetyMiB = Math.max(512, Math.min(2048, Math.floor(diskTotalMiB * 0.05)));
   const reservedMemoryMiB = claims.reduce((sum, claim) => sum + claim.resources.memoryMiB, 0);
-  const reservedDiskMiB = claims.reduce((sum, claim) => sum + claim.resources.writableStorageMiB, 0);
+  const reservedDiskMiB = claims.filter((claim) => sharesStorage(root, claim))
+    .reduce((sum, claim) => sum + claim.resources.writableStorageMiB, 0);
   return {
     memoryMiB: Math.max(0, memoryTotalMiB - memorySafetyMiB - reservedMemoryMiB),
     writableStorageMiB: Math.max(0, diskFreeMiB - diskSafetyMiB - reservedDiskMiB),
@@ -106,7 +118,7 @@ export function claimWorldResources(root: string, world: string, requested: Worl
   return withFileLock(join(dir, 'claims.lock'), () => {
     const identity = claimIdentity(root, world);
     const claims = liveClaims(identity);
-    const available = capacity(root, claims);
+    const available = worldResourceCapacity(root, claims);
     const shortages: string[] = [];
     if (requested.memoryMiB > available.memoryMiB) shortages.push(`memory requires ${requested.memoryMiB} MiB, ${available.memoryMiB} MiB available`);
     if (requested.writableStorageMiB > available.writableStorageMiB) {
@@ -120,6 +132,7 @@ export function claimWorldResources(root: string, world: string, requested: Worl
     }
     const claim: WorldResourceClaim = {
       world,
+      root: resolve(root),
       identity,
       ownerPid: process.pid,
       holderPids: [],

package/src/runtime.ts

@@ -2125,7 +2125,7 @@ function worldAttachedCommandEnv(name: string, root: string): { instance: Return
     if (sealed) throw new Error(`sealed world "${name}": attachment proxy failed; refusing to run the command (${error instanceof Error ? error.message : String(error)})`);
     // Keep env-only redirect if the ambient proxy cannot start.
   }
-  return { instance: status, env: { ...admittedEnv(stripEnvOf(status.env)), ...status.env, ...proxyEnv } };
+  return { instance: status, env: { ...admittedEnv(stripEnvOf(status.env)), ...status.env, ...proxyEnv, VOLTER_WORLD: name } };
 }
 
 export function runWithWorldEnv(name: string, command: string[], root = process.cwd(), options: { cwd?: string } = {}): number {