zevairouter 1.0.89 → 1.0.90

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

package/cli/package.json

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

package/package.json

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

package/src/lib/oauth/services/cloudflareAiBulkImportManager.js

@@ -22,10 +22,23 @@ const CLOUDFLARE_AI_LABEL = "Cloudflare Workers AI";
 const CF_LOGIN_URL = "https://dash.cloudflare.com/login";
 const CF_HARVEST_TIMEOUT_MS = 4 * 60_000;
 
-function wait(ms) {
+function yieldMs(ms = 50) {
   return new Promise((r) => setTimeout(r, ms));
 }
 
+async function waitUntil(checkFn, { timeout = 8_000, interval = 80 } = {}) {
+  const deadline = Date.now() + timeout;
+  while (Date.now() < deadline) {
+    try {
+      if (await checkFn()) return true;
+    } catch {
+      /* retry */
+    }
+    await yieldMs(interval);
+  }
+  return false;
+}
+
 function isCloudflareDashboard(url) {
   try {
     const u = new URL(url);
@@ -52,11 +65,11 @@ async function dismissCloudflarePostLogin(page) {
   for (const re of labels) {
     try {
       const btn = page.getByRole("button", { name: re }).first();
-      if (await btn.isVisible({ timeout: 300 }).catch(() => false)) {
+      if (await btn.isVisible({ timeout: 200 }).catch(() => false)) {
         const text = ((await btn.innerText().catch(() => "")) || "").toLowerCase();
         if (/google/.test(text)) continue;
         await btn.click({ timeout: 3_000 }).catch(() => null);
-        await wait(400);
+        // No fixed sleep — caller re-checks URL / harvest immediately.
         return true;
       }
     } catch {
@@ -144,23 +157,36 @@ function createCloudflareHarvestPromise(page, { timeoutMs = CF_HARVEST_TIMEOUT_M
   return (async () => {
     const start = Date.now();
     let lastErr = "";
+    let failBackoffMs = 100;
     while (Date.now() - start < timeoutMs) {
       if (cancelCheck?.()) throw new Error("Job cancelled during Cloudflare harvest");
       const url = page.url?.() || "";
-      if (isCloudflareDashboard(url)) {
-        await dismissCloudflarePostLogin(page);
-        try {
-          onStep?.("harvesting_cf_token", "Creating Cloudflare Workers AI API token");
-          const result = await harvestCloudflareWorkersAiToken(page);
-          if (result?.apiKey && result?.accountId) return result;
-        } catch (e) {
-          lastErr = String(e?.message || e);
-          onStep?.("harvest_retry", lastErr.slice(0, 140));
-        }
-      } else {
+
+      if (!isCloudflareDashboard(url)) {
         await dismissCloudflarePostLogin(page);
+        // Event-driven: wait for dash (not a blind 1.2s sleep).
+        const landed = await waitUntil(
+          () => isCloudflareDashboard(page.url?.() || ""),
+          { timeout: 900, interval: 80 },
+        );
+        if (!landed) await yieldMs(80);
+        continue;
+      }
+
+      await dismissCloudflarePostLogin(page);
+      try {
+        onStep?.("harvesting_cf_token", "Creating Cloudflare Workers AI API token");
+        const result = await harvestCloudflareWorkersAiToken(page);
+        if (result?.apiKey && result?.accountId) return result;
+      } catch (e) {
+        lastErr = String(e?.message || e);
+        onStep?.("harvest_retry", lastErr.slice(0, 140));
+        // Session may still be settling — short backoff only on error.
+        await yieldMs(failBackoffMs);
+        failBackoffMs = Math.min(failBackoffMs + 100, 600);
+        continue;
       }
-      await wait(1_200);
+      await yieldMs(80);
     }
     throw new Error(
       lastErr

package/src/lib/oauth/services/kiroGoogleAutomation.js

@@ -560,8 +560,9 @@ function isGoogleAuthPage(page) {
   }
 }
 
+/** Fast bulk path: skip multi-second sleeps (Grok, Cloudflare, etc.). */
 function isGrokish(serviceLabel) {
-  return /grok/i.test(String(serviceLabel || ""));
+  return /grok|cloudflare/i.test(String(serviceLabel || ""));
 }
 
 // Google bounces flagged (headless) browsers: