zevairouter 1.0.94 → 1.0.95

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/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.94",
+  "version": "1.0.95",
   "description": "Self-hosted AI router: many providers, one OpenAI-compatible /v1 endpoint and dashboard",
   "bin": {
     "zevai": "./cli/cli.js"

package/cli/cli.js

@@ -172,31 +172,96 @@ One-shot install / reinstall (any device):
         process.exit(0);
       }
 
-      // VPS: prefer systemd so the unit picks up the new binary path.
-      if (process.platform === "linux") {
-        for (const unit of ["zevairouter.service", "zevai.service"]) {
+      // VPS: rewrite systemd unit to THIS Node + zevai, hard-stop old processes, restart.
+      // Without rewrite, unit can keep pointing at /usr/bin while nvm got the new package
+      // → currentVersion jumps but buildVersion stays on the old Next bundle.
+      if (process.platform === "linux" && process.getuid && process.getuid() === 0) {
+        const { execSync } = require("child_process");
+        const unitName = "zevairouter.service";
+        const unitPath = `/etc/systemd/system/${unitName}`;
+        const nodeBin = result.nodePath || process.execPath;
+        const nodeDir = path.dirname(nodeBin);
+        const zevaiBin = result.zevaiPath
+          || path.join(result.globalBin || path.dirname(nodeBin), "zevai");
+        const cliJs = result.globalRoot
+          ? path.join(result.globalRoot, "zevairouter", "cli", "cli.js")
+          : null;
+        const port = process.env.PORT || "1997";
+        // Prefer `node cli.js` over shim so the unit always runs the package we just installed.
+        const execStart = cliJs && fs.existsSync(cliJs)
+          ? `${nodeBin} ${cliJs} --port ${port} --no-browser --skip-update --log`
+          : `${nodeBin} ${zevaiBin} --port ${port} --no-browser --skip-update --log`;
+
+        try {
+          const unitBody = `[Unit]
+Description=ZevaiRouter
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=simple
+User=root
+WorkingDirectory=/root
+Environment="PATH=${nodeDir}:/usr/local/bin:/usr/bin:/bin"
+Environment="PORT=${port}"
+Environment="HOSTNAME=0.0.0.0"
+Environment="DISPLAY=:99"
+Environment="ZEVAI_MINIMAL_POSTINSTALL=1"
+Environment="ZEVAI_SERVER_MODE=1"
+Environment="ZEVAI_MAX_OLD_SPACE_SIZE=1536"
+MemoryMax=2G
+MemorySwapMax=0
+ExecStartPre=/bin/bash -c "pgrep -x Xvfb >/dev/null || (Xvfb :99 -screen 0 1280x900x24 -ac -nolisten tcp >/var/log/xvfb-zevai.log 2>&1 & sleep 0.8)"
+ExecStart=${execStart}
+Restart=always
+RestartSec=3
+StandardOutput=append:/var/log/zevairouter.log
+StandardError=append:/var/log/zevairouter.log
+
+[Install]
+WantedBy=multi-user.target
+`;
+          fs.writeFileSync(unitPath, unitBody);
+          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.
           try {
-            execFileSync("systemctl", ["cat", unit], { stdio: "ignore", timeout: 3000 });
-            console.log(`Restarting ${unit}…`);
-            try { execFileSync("systemctl", ["daemon-reload"], { stdio: "ignore", timeout: 10000 }); } catch { /* ignore */ }
-            execFileSync("systemctl", ["restart", unit], { stdio: "inherit", timeout: 30000 });
-            // Brief health check
+            execSync("pkill -f 'zevairouter/cli/cli.js' 2>/dev/null || true; pkill -f '/bin/zevai' 2>/dev/null || true", {
+              stdio: "ignore",
+              timeout: 5000,
+            });
+          } catch { /* ignore */ }
+          execFileSync("systemctl", ["daemon-reload"], { stdio: "ignore", timeout: 10000 });
+          execFileSync("systemctl", ["enable", unitName], { stdio: "ignore", timeout: 10000 });
+          console.log(`Starting ${unitName}…`);
+          execFileSync("systemctl", ["restart", unitName], { stdio: "inherit", timeout: 30000 });
+
+          let live = null;
+          for (let i = 0; i < 20; i++) {
+            execSync("sleep 1");
             try {
-              const { execSync } = require("child_process");
-              for (let i = 0; i < 15; i++) {
-                execSync("sleep 1");
-                try {
-                  const out = execSync("curl -sS -m 2 http://127.0.0.1:1997/api/version", { encoding: "utf8" });
-                  console.log(`✓ Live: ${out.trim()}`);
-                  process.exit(0);
-                } catch { /* wait */ }
-              }
-            } catch { /* ignore */ }
-            console.log(`✓ systemctl restart ${unit} done. Check: curl -s http://127.0.0.1:1997/api/version`);
+              const out = execSync(`curl -sS -m 2 http://127.0.0.1:${port}/api/version`, { encoding: "utf8" });
+              live = JSON.parse(out);
+              break;
+            } catch { /* wait */ }
+          }
+          if (live) {
+            console.log(`✓ Live: ${JSON.stringify(live)}`);
+            if (live.buildVersion && live.installedVersion && live.buildVersion !== live.installedVersion) {
+              console.warn(`! buildVersion (${live.buildVersion}) != installed (${live.installedVersion})`);
+              console.warn("  Still mixed install — check: systemctl cat zevairouter | grep ExecStart");
+              console.warn("  and:  ls -la $(npm root -g)/zevairouter/package.json");
+            } else {
+              console.log(`✓ Version consistent: ${live.currentVersion}`);
+            }
             process.exit(0);
-          } catch {
-            /* try next unit */
           }
+          console.warn("Service started but /api/version not responding yet.");
+          console.log(`Check: journalctl -u ${unitName} -n 40 --no-pager`);
+          process.exit(0);
+        } catch (e) {
+          console.warn(`systemd path failed (${e.message}) — falling back to direct relaunch`);
         }
       }
 

package/cli/package.json

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

package/package.json

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

package/src/app/api/version/route.js

@@ -156,16 +156,25 @@ function resolveInstalledVersion() {
 }
 
 export async function GET() {
-  const buildVersion = typeof pkg?.version === "string" ? pkg.version : null;
+  // Webpack-inlined at `next build` time (can lag if an old process is still up).
+  const webpackBuildVersion = typeof pkg?.version === "string" ? pkg.version : null;
   const installedVersion = resolveInstalledVersion();
   // What the dashboard should treat as "this server": prefer disk install, then build
-  const currentVersion = installedVersion || buildVersion || "0.0.0";
+  const currentVersion = installedVersion || webpackBuildVersion || "0.0.0";
+  // Expose webpack embed as buildVersion for diagnostics; UI should use currentVersion.
+  const buildVersion = webpackBuildVersion;
 
   const latestVersion = await fetchLatestVersion();
   const hasUpdate = latestVersion
     ? compareVersions(latestVersion, currentVersion) > 0
     : false;
 
+  const buildMismatch = Boolean(
+    installedVersion
+    && webpackBuildVersion
+    && installedVersion !== webpackBuildVersion,
+  );
+
   return Response.json(
     {
       currentVersion,
@@ -173,6 +182,9 @@ export async function GET() {
       buildVersion,
       latestVersion,
       hasUpdate,
+      // true when package.json is new but the running Next bundle is old
+      // (usually: systemd still on a different Node path, or process not fully restarted)
+      buildMismatch,
     },
     {
       headers: {