zevairouter 1.0.67 → 1.0.69

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/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/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/cli/hooks/playwrightRuntime.js

@@ -1,10 +1,15 @@
 // Ensure Playwright + Chromium are usable at runtime. `npm i -g zevairouter`
-// installs the playwright npm package but does NOT trigger its postinstall
-// browser download under all package managers, so the first bulk-import
-// attempt fails with "Executable doesn't exist at .../chrome-headless-shell".
-// We download lazily on first launch so users who never touch automation
-// aren't billed ~150MB of disk.
+// may not ship a resolvable playwright package under webpack/standalone, and
+// does NOT always trigger browser download. We install into ~/.zevai/runtime
+// and resolve with real Node require (not webpack's registry).
+//
+// Bug we fix (Kiro bulk mass-fail):
+//   "playwright installed but cannot be required"
+//   → package exists under ~/.zevai/runtime/node_modules/playwright but
+//     bare require("playwright") is rewritten by webpack and throws.
+//   Same pattern as camoufoxRuntime: createRequire + __non_webpack_require__.
 const { spawnSync } = require("child_process");
+const { createRequire } = require("module");
 const fs = require("fs");
 const path = require("path");
 
@@ -13,19 +18,50 @@ const { runNpmInstall, getRuntimeDir, getRuntimeNodeModules } = require("./sqlit
 const PLAYWRIGHT_PACKAGE = "playwright";
 const PLAYWRIGHT_VERSION = "^1.54.2";
 
+// Webpack rewrites bare require(); __non_webpack_require__ stays real Node require.
+const nodeRequire =
+  typeof __non_webpack_require__ === "function" ? __non_webpack_require__ : require;
+
+function getRuntimeRequire() {
+  try {
+    const anchor = path.join(getRuntimeDir(), "noop.js");
+    return createRequire(anchor);
+  } catch {
+    return null;
+  }
+}
+
 let cachedReady = null;
 
 function tryRequirePlaywright() {
+  // 1) Runtime-anchored createRequire (works under webpack + any cwd)
   try {
-    return require(PLAYWRIGHT_PACKAGE);
+    const rreq = getRuntimeRequire();
+    const candidate = path.join(getRuntimeNodeModules(), PLAYWRIGHT_PACKAGE);
+    if (rreq && fs.existsSync(path.join(candidate, "package.json"))) {
+      return rreq(candidate);
+    }
+  } catch {}
+
+  // 2) Bare real require (global / NODE_PATH)
+  try {
+    return nodeRequire(PLAYWRIGHT_PACKAGE);
   } catch {}
+
+  // 3) Absolute path via nodeRequire
   try {
-    const runtimeNm = getRuntimeNodeModules();
-    const candidate = path.join(runtimeNm, PLAYWRIGHT_PACKAGE);
+    const candidate = path.join(getRuntimeNodeModules(), PLAYWRIGHT_PACKAGE);
     if (fs.existsSync(path.join(candidate, "package.json"))) {
-      return require(candidate);
+      return nodeRequire(candidate);
     }
   } catch {}
+
+  // 4) Resolve from process cwd node_modules (dev)
+  try {
+    const rreq = createRequire(path.join(process.cwd(), "package.json"));
+    return rreq(PLAYWRIGHT_PACKAGE);
+  } catch {}
+
   return null;
 }
 
@@ -45,11 +81,22 @@ function isChromiumBinaryAvailable() {
 function findCli() {
   const candidates = [];
   try {
-    const pwPkg = require.resolve("playwright/package.json");
+    const rreq = getRuntimeRequire();
+    if (rreq) {
+      try {
+        candidates.push(path.join(path.dirname(rreq.resolve(`${PLAYWRIGHT_PACKAGE}/package.json`)), "cli.js"));
+      } catch {}
+      try {
+        candidates.push(path.join(path.dirname(rreq.resolve("playwright-core/package.json")), "cli.js"));
+      } catch {}
+    }
+  } catch {}
+  try {
+    const pwPkg = nodeRequire.resolve("playwright/package.json");
     candidates.push(path.join(path.dirname(pwPkg), "cli.js"));
   } catch {}
   try {
-    const pwCorePkg = require.resolve("playwright-core/package.json");
+    const pwCorePkg = nodeRequire.resolve("playwright-core/package.json");
     candidates.push(path.join(path.dirname(pwCorePkg), "cli.js"));
   } catch {}
   try {
@@ -81,9 +128,17 @@ function ensurePlaywrightPackage({ silent = false } = {}) {
     };
   }
 
+  // Clear any half-state and re-resolve with createRequire
+  cachedReady = null;
   const installed = tryRequirePlaywright();
   if (!installed) {
-    return { ok: false, reason: "playwright installed but cannot be required" };
+    return {
+      ok: false,
+      reason:
+        "playwright installed into ~/.zevai/runtime but cannot be required " +
+        "(webpack/module path). Restart zevai after install, or run: " +
+        'node -e "require(require(\'path\').join(require(\'os\').homedir(),\'.zevai/runtime/node_modules/playwright\'))"',
+    };
   }
   return { ok: true, module: installed };
 }
@@ -96,10 +151,18 @@ function runInstall({ silent = false, timeout = 600_000 } = {}) {
 
   if (!silent) console.log("\u23f3 Downloading Playwright Chromium (first run, ~150MB)...");
 
+  // Never honor channel=chrome — Kiro bulk needs bundled Chromium, not /opt/google/chrome
+  const env = {
+    ...process.env,
+    PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: undefined,
+  };
+  delete env.PLAYWRIGHT_CHROMIUM_CHANNEL;
+
   const res = spawnSync(process.execPath, [cliPath, "install", "chromium"], {
     stdio: silent ? ["ignore", "pipe", "pipe"] : "inherit",
     timeout,
     encoding: "utf8",
+    env,
   });
 
   if (res.status === 0) {
@@ -118,14 +181,17 @@ function runInstall({ silent = false, timeout = 600_000 } = {}) {
 }
 
 function ensurePlaywrightRuntime({ silent = false, timeout } = {}) {
-  if (cachedReady === true) return { ok: true };
+  if (cachedReady === true) {
+    const mod = tryRequirePlaywright();
+    return { ok: true, module: mod };
+  }
 
   const pkg = ensurePlaywrightPackage({ silent });
   if (!pkg.ok) {
     cachedReady = false;
     const error = new Error(
       `Playwright not available. ${pkg.reason}. ` +
-      `Run "npm install -g playwright && npx playwright install chromium" manually, then retry.`
+        `Run "npm install -g playwright && npx playwright install chromium" manually, then retry.`
     );
     error.code = "PLAYWRIGHT_PACKAGE_MISSING";
     return { ok: false, error };
@@ -133,19 +199,19 @@ function ensurePlaywrightRuntime({ silent = false, timeout } = {}) {
 
   if (isChromiumBinaryAvailable()) {
     cachedReady = true;
-    return { ok: true, module: pkg.module };
+    return { ok: true, module: pkg.module || tryRequirePlaywright() };
   }
 
   const result = runInstall({ silent, timeout });
   if (result.ok && isChromiumBinaryAvailable()) {
     cachedReady = true;
-    return { ok: true, module: pkg.module };
+    return { ok: true, module: pkg.module || tryRequirePlaywright() };
   }
 
   cachedReady = false;
   const error = new Error(
     `Playwright Chromium not available. ${result.reason}. ` +
-    `Run "npx playwright install chromium" manually, then retry.`
+      `Run "npx playwright install chromium" manually, then retry.`
   );
   error.code = "PLAYWRIGHT_CHROMIUM_MISSING";
   return { ok: false, error };
@@ -165,4 +231,5 @@ module.exports = {
   isChromiumBinaryAvailable,
   resetCache,
   findPlaywrightCli: findCli,
+  tryRequirePlaywright,
 };

package/cli/app/package.json

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