buildwithnexus 0.3.8 → 0.4.1

package/dist/bin.js

@@ -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,7 +671,7 @@ 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();
   while (Date.now() - start < timeoutMs) {
     try {
@@ -737,7 +737,6 @@ var init_ssh = __esm({
 
 // src/cli.ts
 import { Command as Command14 } from "commander";
-import { createRequire } from "module";
 
 // src/commands/init.ts
 init_banner();
@@ -939,13 +938,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 +1005,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");
   }
 }
 
@@ -1046,7 +1045,7 @@ 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;
   while (Date.now() - start < timeoutMs) {
@@ -1070,7 +1069,7 @@ async function waitForServer(port, timeoutMs = 36e5) {
   }
   return false;
 }
-async function waitForCloudInit(port, timeoutMs = 72e5) {
+async function waitForCloudInit(port, timeoutMs = 18e5) {
   const start = Date.now();
   let lastLog = 0;
   while (Date.now() - start < timeoutMs) {
@@ -1306,8 +1305,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 +1337,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");
       }
@@ -2835,9 +2832,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.1",
   "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 && NEXUS_SRC=/Users/garretteaglin/Projects/nexus npm run bundle"
   },
   "engines": {
     "node": ">=18"