openclaw-navigator 5.2.2 → 5.3.0

package/cli.mjs

@@ -62,6 +62,10 @@ const validTokens = new Set();
 // OC Web UI reverse proxy target (configurable via --ui-port or env)
 let ocUIPort = parseInt(process.env.OPENCLAW_UI_PORT ?? "4000", 10);
 
+// OC Web UI directory — the pre-installed Next.js app
+const OC_UI_DIR = process.env.OPENCLAW_UI_DIR ?? join(homedir(), "openclaw-ui");
+let uiProcess = null;
+
 // OC Gateway port — where sessions API + WebSocket live (separate from web UI)
 let ocGatewayPort = parseInt(process.env.OPENCLAW_GATEWAY_PORT ?? "18789", 10);
 
@@ -144,6 +148,77 @@ function writeJSON(filePath, data) {
   writeFileSync(filePath, JSON.stringify(data, null, 2) + "\n", "utf8");
 }
 
+// ── OC Web UI lifecycle ───────────────────────────────────────────────────
+
+/** Kill any process listening on a port (best-effort, macOS/Linux) */
+async function killPort(port) {
+  const { execSync } = await import("node:child_process");
+  try {
+    // macOS: lsof -ti :PORT gives PIDs
+    const pids = execSync(`lsof -ti :${port} 2>/dev/null`, { encoding: "utf8" }).trim();
+    if (pids) {
+      for (const pid of pids.split("\n")) {
+        try {
+          execSync(`kill -9 ${pid.trim()} 2>/dev/null`);
+          info(`  Killed process ${pid.trim()} on port ${port}`);
+        } catch {}
+      }
+      // Wait a beat for the port to free up
+      await new Promise((r) => setTimeout(r, 500));
+    }
+  } catch {
+    // No process on that port, or lsof not available — that's fine
+  }
+}
+
+/** Start the OC Web UI (Next.js) as a child process */
+function startWebUI() {
+  if (!existsSync(join(OC_UI_DIR, "package.json"))) {
+    warn(`OC Web UI not found at ${OC_UI_DIR} — /ui/ proxy will return 502`);
+    info(`  Set OPENCLAW_UI_DIR to the correct path, or install openclaw-ui there`);
+    return;
+  }
+
+  if (uiProcess) {
+    uiProcess.kill();
+    uiProcess = null;
+  }
+
+  uiProcess = spawn("npx", ["next", "start", "-p", String(ocUIPort)], {
+    cwd: OC_UI_DIR,
+    stdio: ["ignore", "pipe", "pipe"],
+    env: { ...process.env, PORT: String(ocUIPort), NODE_ENV: "production" },
+  });
+
+  uiProcess.stdout.on("data", (data) => {
+    const line = data.toString().trim();
+    if (line) {
+      info(`  [ui] ${line}`);
+    }
+  });
+
+  uiProcess.stderr.on("data", (data) => {
+    const line = data.toString().trim();
+    if (line && !line.includes("ExperimentalWarning")) {
+      info(`  [ui] ${line}`);
+    }
+  });
+
+  uiProcess.on("error", (err) => {
+    warn(`OC Web UI failed to start: ${err.message}`);
+    uiProcess = null;
+  });
+
+  uiProcess.on("exit", (code) => {
+    if (code !== null && code !== 0) {
+      warn(`OC Web UI exited with code ${code}`);
+    }
+    uiProcess = null;
+  });
+
+  ok(`OC Web UI starting on port ${ocUIPort} (PID ${uiProcess.pid}) from ${OC_UI_DIR}`);
+}
+
 // Pairing code state
 let pairingCode = null;
 let pairingData = null;
@@ -1204,6 +1279,11 @@ module.exports = {
 
   ok(`Bridge server running on ${bindHost}:${port}`);
 
+  // ── Step 1.5: Start OC Web UI ──────────────────────────────────────
+  // Kill anything on the UI port, then start the Next.js app as a child process.
+  await killPort(ocUIPort);
+  startWebUI();
+
   // ── Step 2: Persistent identity ─────────────────────────────────────
   // Reuse the same pairing code + token across restarts so Navigator
   // doesn't need to re-pair. The code resolves to the NEW tunnel URL
@@ -1907,6 +1987,10 @@ module.exports = {
   // ── Graceful shutdown ─────────────────────────────────────────────────
   const shutdown = () => {
     console.log(`\n${DIM}Shutting down bridge...${RESET}`);
+    if (uiProcess) {
+      uiProcess.kill();
+      uiProcess = null;
+    }
     if (mcpProcess) {
       mcpProcess.kill();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-navigator",
-  "version": "5.2.2",
+  "version": "5.3.0",
   "description": "One-command bridge + tunnel for the Navigator browser — works on any machine, any OS",
   "keywords": [
     "browser",