zevairouter 1.0.95 → 1.0.96

package/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/src/lib/terminal/ptyBridge.py

@@ -0,0 +1,163 @@
+#!/usr/bin/env python3
+"""
+Minimal PTY bridge for ZevaiRouter web terminal.
+
+stdin  -> PTY master (keystrokes)
+stdout <- PTY master (shell output), raw binary
+stderr  = control / errors (utf-8 text lines)
+
+Optional control on a side channel is not needed: resize arrives as
+OSC-like escape on stdin:  \\x1b]9999;<cols>;<rows>\\x07
+"""
+from __future__ import annotations
+
+import errno
+import fcntl
+import os
+import select
+import signal
+import struct
+import sys
+import termios
+
+
+def set_winsize(fd: int, rows: int, cols: int) -> None:
+    try:
+        packed = struct.pack("HHHH", max(5, rows), max(20, cols), 0, 0)
+        fcntl.ioctl(fd, termios.TIOCSWINSZ, packed)
+    except Exception:
+        pass
+
+
+def main() -> int:
+    cols = int(sys.argv[1]) if len(sys.argv) > 1 else 120
+    rows = int(sys.argv[2]) if len(sys.argv) > 2 else 40
+    shell = os.environ.get("SHELL") or ("/bin/bash" if os.path.exists("/bin/bash") else "/bin/sh")
+    cwd = os.path.expanduser("~")
+
+    pid, master = pty_fork = _fork_pty()
+    if pid == 0:
+        # child
+        try:
+            os.chdir(cwd)
+        except Exception:
+            pass
+        os.environ.setdefault("TERM", "xterm-256color")
+        os.environ.setdefault("COLORTERM", "truecolor")
+        os.environ.setdefault("FORCE_COLOR", "1")
+        try:
+            os.execv(shell, [shell, "-il"])
+        except Exception:
+            os.execv("/bin/sh", ["/bin/sh", "-i"])
+        return 1
+
+    set_winsize(master, rows, cols)
+
+    # Non-blocking master + stdin
+    for fd in (master, sys.stdin.fileno()):
+        fl = fcntl.fcntl(fd, fcntl.F_GETFL)
+        fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)
+
+    # Binary stdout
+    stdout = sys.stdout.buffer
+    stdin = sys.stdin.buffer
+
+    resize_buf = b""
+
+    def handle_resize_escape(chunk: bytes) -> bytes:
+        """Strip and apply embedded resize escapes, return remaining bytes."""
+        nonlocal resize_buf
+        data = resize_buf + chunk
+        out = bytearray()
+        i = 0
+        while i < len(data):
+            # ESC ] 9999 ; cols ; rows BEL
+            if data[i] == 0x1B and data[i : i + 6] == b"\x1b]9999;":
+                end = data.find(b"\x07", i + 6)
+                if end < 0:
+                    resize_buf = data[i:]
+                    return bytes(out)
+                payload = data[i + 6 : end].decode("ascii", "ignore")
+                try:
+                    c_s, r_s = payload.split(";", 1)
+                    set_winsize(master, int(r_s), int(c_s))
+                except Exception:
+                    pass
+                i = end + 1
+                resize_buf = b""
+                continue
+            out.append(data[i])
+            i += 1
+        resize_buf = b""
+        return bytes(out)
+
+    alive = True
+
+    def on_chld(signum, frame):  # noqa: ARG001
+        nonlocal alive
+        alive = False
+
+    signal.signal(signal.SIGCHLD, on_chld)
+
+    try:
+        while alive:
+            try:
+                r, _, _ = select.select([master, sys.stdin.fileno()], [], [], 0.25)
+            except InterruptedError:
+                continue
+
+            if master in r:
+                try:
+                    data = os.read(master, 8192)
+                except OSError as e:
+                    if e.errno in (errno.EIO, errno.EAGAIN, errno.EWOULDBLOCK):
+                        data = b""
+                    else:
+                        break
+                if not data:
+                    # EIO often means child exited
+                    if not alive:
+                        break
+                else:
+                    stdout.write(data)
+                    stdout.flush()
+
+            if sys.stdin.fileno() in r:
+                try:
+                    data = stdin.read(8192)
+                except Exception:
+                    data = b""
+                if data is None:
+                    data = b""
+                if data == b"" and not alive:
+                    break
+                if data:
+                    cleaned = handle_resize_escape(data)
+                    if cleaned:
+                        try:
+                            os.write(master, cleaned)
+                        except OSError:
+                            break
+    finally:
+        try:
+            os.close(master)
+        except Exception:
+            pass
+        try:
+            os.waitpid(pid, 0)
+        except Exception:
+            pass
+    return 0
+
+
+def _fork_pty():
+    import pty
+
+    return pty.fork()
+
+
+if __name__ == "__main__":
+    try:
+        raise SystemExit(main())
+    except KeyboardInterrupt:
+        raise SystemExit(0)

package/cli/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zevairouter",
-  "version": "1.0.95",
+  "version": "1.0.96",
   "description": "Self-hosted AI router: many providers, one OpenAI-compatible /v1 endpoint and dashboard",
   "bin": {
     "zevai": "./cli/cli.js"

package/cli/cli.js

@@ -225,16 +225,23 @@ WantedBy=multi-user.target
           console.log(`Wrote ${unitPath}`);
           console.log(`  ExecStart=${execStart}`);
           try { execFileSync("systemctl", ["stop", unitName], { stdio: "ignore", timeout: 15000 }); } catch { /* ignore */ }
-          // Kill any leftover (old nvm / tray / orphan) so port is free.
+          // Kill leftovers INCLUDING orphan next-server (holds :1997 after parent dies).
           try {
-            execSync("pkill -f 'zevairouter/cli/cli.js' 2>/dev/null || true; pkill -f '/bin/zevai' 2>/dev/null || true", {
-              stdio: "ignore",
-              timeout: 5000,
-            });
+            execSync(
+              "pkill -9 -f 'zevairouter/cli/cli.js' 2>/dev/null || true; " +
+              "pkill -9 -f '/bin/zevai' 2>/dev/null || true; " +
+              "pkill -9 -f next-server 2>/dev/null || true; " +
+              `fuser -k ${port}/tcp 2>/dev/null || true`,
+              { stdio: "ignore", timeout: 8000 },
+            );
           } catch { /* ignore */ }
+          try { freePortHard(Number(port) || 1997); } catch { /* freePortHard defined later — inline fallback */ }
           execFileSync("systemctl", ["daemon-reload"], { stdio: "ignore", timeout: 10000 });
           execFileSync("systemctl", ["enable", unitName], { stdio: "ignore", timeout: 10000 });
+          // Give port a moment after fuser
+          try { execSync("sleep 1"); } catch { /* ignore */ }
           console.log(`Starting ${unitName}…`);
+          execFileSync("systemctl", ["reset-failed", unitName], { stdio: "ignore", timeout: 5000 });
           execFileSync("systemctl", ["restart", unitName], { stdio: "inherit", timeout: 30000 });
 
           let live = null;
@@ -708,6 +715,55 @@ function isRouterHealthy(checkPort) {
   }
 }
 
+/** Live /api/version JSON or null. */
+function getLiveVersionInfo(checkPort) {
+  try {
+    const out = execSync(
+      `curl -sS --max-time 2 "http://127.0.0.1:${checkPort}/api/version"`,
+      { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 4000 }
+    ).trim();
+    return JSON.parse(out);
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * True when something is healthy on :port but it's an OLD build / wrong package.
+ * That is the classic VPS trap: orphan next-server survives kill of cli.js →
+ * bare `zevai` attaches and exits 0 → systemd Restart=always loops forever.
+ */
+function isStaleRouterOnPort(checkPort) {
+  if (!isRouterHealthy(checkPort)) return false;
+  const live = getLiveVersionInfo(checkPort);
+  if (!live) return true; // health OK but no version → treat as stale/foreign
+  const liveVer = live.buildVersion || live.currentVersion || live.installedVersion;
+  if (!liveVer) return true;
+  // Mismatch vs this binary's package version → must take over the port
+  if (liveVer !== pkg.version) return true;
+  if (live.buildMismatch === true) return true;
+  return false;
+}
+
+/** Free TCP port hard (orphans next-server that hold :1997 after parent die). */
+function freePortHard(checkPort) {
+  if (process.platform === "win32") {
+    try {
+      execSync(
+        `powershell -NonInteractive -WindowStyle Hidden -Command "Get-NetTCPConnection -LocalPort ${checkPort} -ErrorAction SilentlyContinue | ForEach-Object { Stop-Process -Id $_.OwningProcess -Force -ErrorAction SilentlyContinue }"`,
+        { stdio: "ignore", windowsHide: true, timeout: 5000 }
+      );
+    } catch { /* ignore */ }
+    return;
+  }
+  try {
+    execSync(`fuser -k ${checkPort}/tcp 2>/dev/null || true`, { stdio: "ignore", timeout: 5000 });
+  } catch { /* ignore */ }
+  try {
+    execSync(`pkill -9 -f next-server 2>/dev/null || true`, { stdio: "ignore", timeout: 5000 });
+  } catch { /* ignore */ }
+}
+
 /** Linux: zevairouter.service managed by systemd (Restart=always). */
 function isSystemdServiceActive() {
   if (process.platform === "win32" || process.platform === "darwin") return false;
@@ -770,11 +826,15 @@ function attachToRunningRouter(latestVersion) {
       while (true) {
         const choice = await showInterfaceMenu(latestVersion);
         if (choice === "update") {
-          console.log("\nUpdate while attached to a live server:");
-          console.log(`  ${INSTALL_CMD_LATEST}`);
-          console.log("  then: systemctl restart zevairouter   # or zevai --force-restart\n");
-          const { pause } = require("./src/cli/utils/input");
-          await pause("Press Enter to go back...");
+          console.log("\nRunning: zevai update …\n");
+          // Re-exec as update so user doesn't need a second command.
+          const { spawnSync } = require("child_process");
+          const r = spawnSync(process.execPath, [__filename, "update"], {
+            stdio: "inherit",
+            env: process.env,
+          });
+          process.exit(r.status || 0);
+          return;
         } else if (choice === "web") {
           openBrowser(url);
           const { pause } = require("./src/cli/utils/input");
@@ -800,26 +860,41 @@ function attachToRunningRouter(latestVersion) {
 
 // Check for updates FIRST, then start server (or attach if already healthy)
 checkForUpdate().then((latestVersion) => {
-  // Bare `zevai` while systemd already serves :1997 → attach, don't double-boot.
-  // Double next-server on ~1–2GB VPS → kernel OOM → shell prints "Killed".
-  if (!forceRestart && isRouterHealthy(port)) {
+  const underSystemd = Boolean(process.env.INVOCATION_ID) || process.env.ZEVAI_SERVER_MODE === "1";
+  const stale = isStaleRouterOnPort(port);
+  const healthy = isRouterHealthy(port);
+
+  // Bare `zevai` while a *matching* server already serves :1997 → attach.
+  // If the listener is an OLD orphan next-server (buildVersion lag), take over.
+  // Never attach when launched by systemd / server mode — parent must stay alive.
+  if (!forceRestart && !underSystemd && healthy && !stale) {
     attachToRunningRouter(latestVersion);
     return;
   }
 
+  if (stale && healthy) {
+    console.log(
+      `Port :${port} has a stale/old router (need v${pkg.version}) — taking over…`,
+    );
+  }
+
   // Force restart under systemd: stop unit first so Restart=always doesn't thrash
-  if (forceRestart || !isRouterHealthy(port)) {
-    if (isSystemdServiceActive()) {
+  if (forceRestart || stale || !healthy) {
+    if (isSystemdServiceActive() && !underSystemd) {
       console.log("Stopping systemd zevairouter.service before start…");
       stopSystemdService();
     }
   }
 
-  killAllAppProcesses(port).then(() => {
-    return killProcessOnPort(port);
-  }).then(() => {
-    startServer(latestVersion);
-  });
+  killAllAppProcesses(port)
+    .then(() => killProcessOnPort(port))
+    .then(() => {
+      freePortHard(port);
+      return new Promise((r) => setTimeout(r, 400));
+    })
+    .then(() => {
+      startServer(latestVersion);
+    });
 });
 
 // Show interface selection menu

package/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zevairouter-cli",
-  "version": "1.0.95",
+  "version": "1.0.96",
   "description": "ZevaiRouter CLI - Start and manage ZevaiRouter server",
   "bin": {
     "zevai": "./cli.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zevairouter",
-  "version": "1.0.95",
+  "version": "1.0.96",
   "description": "Self-hosted AI router: many providers, one OpenAI-compatible /v1 endpoint and dashboard",
   "bin": {
     "zevai": "./cli/cli.js"