buildwithnexus 0.3.8 → 0.4.0

package/dist/bin.js

@@ -341,9 +341,9 @@ var init_secrets = __esm({
   "src/core/secrets.ts"() {
     "use strict";
     init_dlp();
-    NEXUS_HOME2 = path2.join(process.env.HOME || "~", ".buildwithnexus");
-    CONFIG_PATH = path2.join(NEXUS_HOME2, "config.json");
-    KEYS_PATH = path2.join(NEXUS_HOME2, ".env.keys");
+    NEXUS_HOME2 = process.env.NEXUS_HOME || path2.join(process.env.HOME || "~", ".buildwithnexus");
+    CONFIG_PATH = process.env.NEXUS_CONFIG_PATH || path2.join(NEXUS_HOME2, "config.json");
+    KEYS_PATH = process.env.NEXUS_KEYS_PATH || path2.join(NEXUS_HOME2, ".env.keys");
   }
 });
 
@@ -438,59 +438,59 @@ async function getPortBlocker(port) {
     return null;
   }
 }
+async function findFreePort(preferred, max = 20) {
+  for (let offset = 0; offset < max; offset++) {
+    if (await isPortFree(preferred + offset)) return preferred + offset;
+  }
+  throw new Error(`No free port found near ${preferred}`);
+}
 async function resolvePortConflicts(ports) {
   const labels = { ssh: "SSH", http: "HTTP", https: "HTTPS" };
   const resolved = { ...ports };
-  const claimed = /* @__PURE__ */ new Set();
   for (const [key, port] of Object.entries(ports)) {
-    if (await isPortFree(port) && !claimed.has(port)) {
-      claimed.add(port);
-      continue;
-    }
-    let altPort = null;
-    for (let offset = 1; offset <= 50; offset++) {
-      const candidate = port + offset;
-      if (!claimed.has(candidate) && await isPortFree(candidate)) {
-        altPort = candidate;
-        break;
-      }
+    if (await isPortFree(port)) continue;
+    const blocker = await getPortBlocker(port);
+    const desc = blocker ? `${blocker.process} (PID ${blocker.pid})` : "unknown process";
+    const altPort = await findFreePort(port + 1).catch(() => null);
+    const choices = [];
+    if (blocker) {
+      choices.push({
+        name: `Kill ${desc} and use port ${port}`,
+        value: "kill"
+      });
     }
     if (altPort) {
-      resolved[key] = altPort;
-      claimed.add(altPort);
-      const blocker = await getPortBlocker(port);
-      const desc = blocker ? `${blocker.process} (PID ${blocker.pid})` : "another process";
-      console.log(chalk5.yellow(`  \u26A0 Port ${port} (${labels[key]}) in use by ${desc} \u2192 using ${altPort}`));
-    } else {
-      const blocker = await getPortBlocker(port);
-      const desc = blocker ? `${blocker.process} (PID ${blocker.pid})` : "unknown process";
-      console.log("");
-      console.log(chalk5.red(`  \u2717 Port ${port} (${labels[key]}) is in use by ${desc} and no free port found nearby`));
-      const action = await select({
-        message: `No free ${labels[key]} port found. Kill ${desc} to free port ${port}?`,
-        choices: [
-          ...blocker ? [{ name: `Kill ${desc} and use port ${port}`, value: "kill" }] : [],
-          { name: "Abort init", value: "abort" }
-        ]
+      choices.push({
+        name: `Use alternate port ${altPort} instead`,
+        value: "alt"
       });
-      if (action === "kill" && blocker) {
-        try {
-          process.kill(blocker.pid, "SIGTERM");
-          await new Promise((r) => setTimeout(r, 1e3));
-          if (!await isPortFree(port)) {
-            process.kill(blocker.pid, "SIGKILL");
-            await new Promise((r) => setTimeout(r, 500));
-          }
-          claimed.add(port);
-          console.log(chalk5.green(`  \u2713 Killed ${desc}, port ${port} is now free`));
-        } catch {
-          console.log(chalk5.red(`  \u2717 Failed to kill PID ${blocker.pid}. Try: sudo kill ${blocker.pid}`));
-          process.exit(1);
+    }
+    choices.push({ name: "Abort init", value: "abort" });
+    console.log("");
+    console.log(chalk5.yellow(`  \u26A0 Port ${port} (${labels[key]}) is in use by ${desc}`));
+    const action = await select({
+      message: `How would you like to resolve the ${labels[key]} port conflict?`,
+      choices
+    });
+    if (action === "kill" && blocker) {
+      try {
+        process.kill(blocker.pid, "SIGTERM");
+        await new Promise((r) => setTimeout(r, 1e3));
+        if (!await isPortFree(port)) {
+          process.kill(blocker.pid, "SIGKILL");
+          await new Promise((r) => setTimeout(r, 500));
         }
-      } else {
-        console.log(chalk5.dim("  Init aborted."));
-        process.exit(0);
+        console.log(chalk5.green(`  \u2713 Killed ${desc}, port ${port} is now free`));
+      } catch {
+        console.log(chalk5.red(`  \u2717 Failed to kill PID ${blocker.pid}. Try: sudo kill ${blocker.pid}`));
+        process.exit(1);
       }
+    } else if (action === "alt" && altPort) {
+      resolved[key] = altPort;
+      console.log(chalk5.green(`  \u2713 Using port ${altPort} for ${labels[key]}`));
+    } else {
+      console.log(chalk5.dim("  Init aborted."));
+      process.exit(0);
     }
   }
   return resolved;
@@ -671,11 +671,13 @@ function addSshConfig(port) {
     fs4.writeFileSync(sshConfigPath, block, { mode: 384 });
   }
 }
-async function waitForSsh(port, timeoutMs = 6e5) {
+async function waitForSsh(port, timeoutMs = 3e5) {
   const start = Date.now();
+  let attempt = 0;
+  const backoffMs = (n) => Math.min(3e3 * Math.pow(2, n), 3e4);
   while (Date.now() - start < timeoutMs) {
+    const ssh = new NodeSSH();
     try {
-      const ssh = new NodeSSH();
       await ssh.connect({
         host: "localhost",
         port,
@@ -687,7 +689,14 @@ async function waitForSsh(port, timeoutMs = 6e5) {
       ssh.dispose();
       return true;
     } catch {
-      await new Promise((r) => setTimeout(r, 5e3));
+      try {
+        ssh.dispose();
+      } catch {
+      }
+      const delay = backoffMs(attempt++);
+      const remaining = timeoutMs - (Date.now() - start);
+      if (remaining <= 0) break;
+      await new Promise((r) => setTimeout(r, Math.min(delay, remaining)));
     }
   }
   return false;
@@ -737,7 +746,6 @@ var init_ssh = __esm({
 
 // src/cli.ts
 import { Command as Command14 } from "commander";
-import { createRequire } from "module";
 
 // src/commands/init.ts
 init_banner();
@@ -777,6 +785,13 @@ var log = {
   },
   detail(label, value) {
     console.log(chalk3.dim("    " + label + ": ") + value);
+  },
+  progress(current, total, label) {
+    const pct = Math.round(current / total * 100);
+    const filled = Math.round(current / total * 20);
+    const bar = chalk3.cyan("\u2588".repeat(filled)) + chalk3.dim("\u2591".repeat(20 - filled));
+    process.stdout.write(`\r  [${bar}] ${chalk3.bold(`${pct}%`)} ${chalk3.dim(label)}`);
+    if (current >= total) process.stdout.write("\n");
   }
 };
 
@@ -939,13 +954,13 @@ async function renderCloudInit(data, templateContent) {
   }
   const safeData = { ...data, sshPubKey: yamlEscape(trimmedPubKey), keys: safeKeys };
   const rendered = ejs.render(templateContent, safeData);
-  const outputPath = path5.join(CONFIGS_DIR, "user-data");
+  const outputPath = path5.join(CONFIGS_DIR, "user-data.yaml");
   fs5.writeFileSync(outputPath, rendered, { mode: 384 });
-  audit("cloudinit_rendered", "user-data written");
+  audit("cloudinit_rendered", "user-data.yaml written");
   return outputPath;
 }
 async function createCloudInitIso(userDataPath) {
-  const metaDataPath = path5.join(CONFIGS_DIR, "meta-data");
+  const metaDataPath = path5.join(CONFIGS_DIR, "meta-data.yaml");
   fs5.writeFileSync(metaDataPath, "instance-id: nexus-vm-1\nlocal-hostname: nexus-vm\n", { mode: 384 });
   const isoPath = path5.join(IMAGES_DIR2, "init.iso");
   const env = scrubEnv();
@@ -1006,7 +1021,7 @@ async function createCloudInitIso(userDataPath) {
       fs5.unlinkSync(metaDataPath);
     } catch {
     }
-    audit("cloudinit_plaintext_deleted", "user-data and meta-data removed");
+    audit("cloudinit_plaintext_deleted", "user-data.yaml and meta-data.yaml removed");
   }
 }
 
@@ -1018,7 +1033,12 @@ async function checkHealth(port, vmRunning) {
     sshReady: false,
     dockerReady: false,
     serverHealthy: false,
-    tunnelUrl: null
+    tunnelUrl: null,
+    dockerVersion: null,
+    serverVersion: null,
+    diskUsagePercent: null,
+    uptimeSeconds: null,
+    lastChecked: (/* @__PURE__ */ new Date()).toISOString()
   };
   if (!vmRunning) return status;
   try {
@@ -1028,13 +1048,33 @@ async function checkHealth(port, vmRunning) {
     return status;
   }
   try {
-    const { code } = await sshExec(port, "docker version --format '{{.Server.Version}}'");
-    status.dockerReady = code === 0;
+    const { stdout, code } = await sshExec(port, "docker version --format '{{.Server.Version}}'");
+    status.dockerReady = code === 0 && stdout.trim().length > 0;
+    if (status.dockerReady) status.dockerVersion = stdout.trim();
   } catch {
   }
   try {
     const { stdout, code } = await sshExec(port, "curl -sf http://localhost:4200/health");
     status.serverHealthy = code === 0 && stdout.includes("ok");
+    if (status.serverHealthy) {
+      try {
+        const parsed = JSON.parse(stdout);
+        if (typeof parsed.version === "string") status.serverVersion = parsed.version;
+      } catch {
+      }
+    }
+  } catch {
+  }
+  try {
+    const { stdout } = await sshExec(port, "df / --output=pcent | tail -1 | tr -dc '0-9'");
+    const pct = parseInt(stdout.trim(), 10);
+    if (!isNaN(pct)) status.diskUsagePercent = pct;
+  } catch {
+  }
+  try {
+    const { stdout } = await sshExec(port, "awk '{print int($1)}' /proc/uptime 2>/dev/null");
+    const up = parseInt(stdout.trim(), 10);
+    if (!isNaN(up)) status.uptimeSeconds = up;
   } catch {
   }
   try {
@@ -1046,9 +1086,11 @@ async function checkHealth(port, vmRunning) {
   }
   return status;
 }
-async function waitForServer(port, timeoutMs = 36e5) {
+async function waitForServer(port, timeoutMs = 9e5) {
   const start = Date.now();
   let lastLog = 0;
+  let attempt = 0;
+  const backoffMs = (n) => Math.min(3e3 * Math.pow(2, n), 3e4);
   while (Date.now() - start < timeoutMs) {
     try {
       const { stdout, code } = await sshExec(port, "curl -sf http://localhost:4200/health");
@@ -1066,13 +1108,18 @@ async function waitForServer(port, timeoutMs = 36e5) {
       } catch {
       }
     }
-    await new Promise((r) => setTimeout(r, 5e3));
+    const delay = backoffMs(attempt++);
+    const remaining = timeoutMs - (Date.now() - start);
+    if (remaining <= 0) break;
+    await new Promise((r) => setTimeout(r, Math.min(delay, remaining)));
   }
   return false;
 }
-async function waitForCloudInit(port, timeoutMs = 72e5) {
+async function waitForCloudInit(port, timeoutMs = 18e5) {
   const start = Date.now();
   let lastLog = 0;
+  let attempt = 0;
+  const backoffMs = (n) => Math.min(3e3 * Math.pow(2, n), 3e4);
   while (Date.now() - start < timeoutMs) {
     try {
       const { code } = await sshExec(port, "test -f /var/lib/cloud/instance/boot-finished");
@@ -1090,7 +1137,10 @@ async function waitForCloudInit(port, timeoutMs = 72e5) {
       } catch {
       }
     }
-    await new Promise((r) => setTimeout(r, 2e4));
+    const delay = backoffMs(attempt++);
+    const remaining = timeoutMs - (Date.now() - start);
+    if (remaining <= 0) break;
+    await new Promise((r) => setTimeout(r, Math.min(delay, remaining)));
   }
   return false;
 }
@@ -1306,8 +1356,6 @@ var phases = [
     name: "VM Provisioning",
     run: async (ctx, spinner) => {
       const { config, keys, tarballPath } = ctx;
-      const pinPath = path6.join(process.env.HOME || "~", ".buildwithnexus", "ssh", "vm_host_key.pin");
-      if (fs6.existsSync(pinPath)) fs6.unlinkSync(pinPath);
       spinner.text = "Waiting for SSH...";
       spinner.start();
       const sshReady = await waitForSsh(config.sshPort);
@@ -1340,7 +1388,7 @@ var phases = [
       spinner.start();
       const cloudInitDone = await waitForCloudInit(config.sshPort);
       if (!cloudInitDone) {
-        fail(spinner, "Cloud-init timed out after 2 hours");
+        fail(spinner, "Cloud-init timed out after 30 minutes");
         log.warn("Check progress: buildwithnexus ssh  \u2192  tail -f /var/log/cloud-init-output.log");
         throw new Error("Cloud-init timed out");
       }
@@ -1565,9 +1613,13 @@ var statusCommand = new Command4("status").description("Check NEXUS runtime heal
   console.log("");
   console.log(`  ${check(health.vmRunning)}  VM         ${health.vmRunning ? chalk7.green("running") + chalk7.dim(` (PID ${getVmPid()})`) : chalk7.red("stopped")}`);
   console.log(`  ${check(health.sshReady)}  SSH        ${health.sshReady ? chalk7.green("connected") + chalk7.dim(` (port ${config.sshPort})`) : chalk7.red("unreachable")}`);
-  console.log(`  ${check(health.dockerReady)}  Docker     ${health.dockerReady ? chalk7.green("ready") : chalk7.red("not ready")}`);
-  console.log(`  ${check(health.serverHealthy)}  Server     ${health.serverHealthy ? chalk7.green("healthy") + chalk7.dim(` (port ${config.httpPort})`) : chalk7.red("unhealthy")}`);
+  console.log(`  ${check(health.dockerReady)}  Docker     ${health.dockerReady ? chalk7.green("ready") + (health.dockerVersion ? chalk7.dim(` v${health.dockerVersion}`) : "") : chalk7.red("not ready")}`);
+  console.log(`  ${check(health.serverHealthy)}  Server     ${health.serverHealthy ? chalk7.green("healthy") + chalk7.dim(` (port ${config.httpPort})`) + (health.serverVersion ? chalk7.dim(` v${health.serverVersion}`) : "") : chalk7.red("unhealthy")}`);
   console.log(`  ${check(!!health.tunnelUrl)}  Tunnel     ${health.tunnelUrl ? chalk7.green(health.tunnelUrl) : chalk7.dim("not active")}`);
+  if (health.diskUsagePercent !== null) {
+    const diskOk = health.diskUsagePercent < 85;
+    console.log(`  ${check(diskOk)}  Disk       ${diskOk ? chalk7.green(`${health.diskUsagePercent}% used`) : chalk7.yellow(`${health.diskUsagePercent}% used \u2014 consider cleanup`)}`);
+  }
   console.log("");
   if (health.serverHealthy) {
     log.success(`NEXUS CLI ready \u2014 connect via: buildwithnexus ssh`);
@@ -2399,9 +2451,18 @@ var EventStream = class {
   lastId = "0";
   onEvent;
   pollInterval = null;
+  consecutiveErrors = 0;
+  lastError = null;
   constructor(onEvent) {
     this.onEvent = onEvent;
   }
+  getStatus() {
+    return {
+      active: this.active,
+      consecutiveErrors: this.consecutiveErrors,
+      lastError: this.lastError
+    };
+  }
   async start() {
     this.active = true;
     const config = loadConfig();
@@ -2414,13 +2475,23 @@ var EventStream = class {
           `curl -sf -H 'Last-Event-ID: ${this.lastId}' http://localhost:4200/events?timeout=1 2>/dev/null || true`
         );
         if (code === 0 && stdout.trim()) {
+          this.consecutiveErrors = 0;
+          this.lastError = null;
           const events = parseSSEData(stdout);
           for (const event of events) {
             if (event.id) this.lastId = event.id;
             this.onEvent(event);
           }
         }
-      } catch {
+      } catch (err) {
+        this.consecutiveErrors++;
+        this.lastError = err instanceof Error ? err.message : String(err);
+        if (this.consecutiveErrors >= 5) {
+          this.onEvent({
+            type: "error",
+            content: `Event stream disconnected after ${this.consecutiveErrors} attempts: ${this.lastError}`
+          });
+        }
       }
     }, 2e3);
   }
@@ -2835,9 +2906,7 @@ var shellCommand2 = new Command13("shell").description("Launch the interactive N
 });
 
 // src/cli.ts
-var require2 = createRequire(import.meta.url);
-var { version } = require2("../package.json");
-var cli = new Command14().name("buildwithnexus").description("Auto-scaffold and launch a fully autonomous NEXUS runtime").version(version);
+var cli = new Command14().name("buildwithnexus").description("Auto-scaffold and launch a fully autonomous NEXUS runtime").version("0.3.1");
 cli.addCommand(initCommand);
 cli.addCommand(startCommand);
 cli.addCommand(stopCommand);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "buildwithnexus",
-  "version": "0.3.8",
+  "version": "0.4.0",
   "description": "Launch an autonomous AI runtime with triple-nested VM isolation in one command",
   "type": "module",
   "bin": {
@@ -19,7 +19,7 @@
     "test": "vitest run",
     "test:watch": "vitest",
     "test:coverage": "vitest run --coverage",
-    "prepublishOnly": "npm run build && npm run bundle"
+    "prepublishOnly": "npm run build"
   },
   "engines": {
     "node": ">=18"