zevairouter 1.0.68 → 1.0.70

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/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/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.68",
+  "version": "1.0.70",
   "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.68",
+  "version": "1.0.70",
   "description": "ZevaiRouter CLI - Start and manage ZevaiRouter server",
   "bin": {
     "zevai": "./cli.js"

package/package.json

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

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

@@ -17,6 +17,8 @@ const TERMINAL_ACCOUNT_STATUSES = new Set([
   "failed_invalid_credentials",
   "failed_exchange",
   "failed_timeout",
+  "failed_restricted",
+  "failed_browser_blocked",
   "cancelled",
 ]);
 
@@ -222,6 +224,8 @@ function getFailedCount(accounts) {
     || account.status === "failed_invalid_credentials"
     || account.status === "failed_exchange"
     || account.status === "failed_timeout"
+    || account.status === "failed_restricted"
+    || account.status === "failed_browser_blocked"
   )).length;
 }
 
@@ -299,7 +303,7 @@ function sanitizeAccount(account) {
     proxyUrl: maskProxyUrl(account.proxyUrl) || null,
     currentStep: account.currentStep || null,
     updatedAt: account.updatedAt || null,
-    logs: (account.logs || []).slice(-8),
+    logs: (account.logs || []).slice(-20),
     manualSessionAvailable: Boolean(account.manualSession?.page) && account.status === "needs_manual",
     manualSessionOpened: Boolean(account.manualSession?.opened),
   };
@@ -354,7 +358,23 @@ export function buildLookupResponse(job, extras = {}) {
 
 async function defaultBrowserLauncher(job) {
   const { launchBulkImportBrowser } = await import("./bulkImportBrowserEngine.js");
-  return launchBulkImportBrowser({ engine: job?.engine || "chromium" });
+  const engine = job?.engine || "chromium";
+  // Google OAuth now rejects stock headless Chromium after email submit with
+  // /v3/signin/rejected ("This browser or app may not be secure"). That is the
+  // real reason Kiro bulk ends in needs_manual — not random captcha.
+  // Default: headed Chromium (Xvfb auto-starts on Linux). Camoufox can stay
+  // headless. Override with ZEVAI_KIRO_HEADLESS=0|1.
+  const envHeadless = process.env.ZEVAI_KIRO_HEADLESS;
+  let headless;
+  if (envHeadless === "1" || envHeadless === "true") headless = true;
+  else if (envHeadless === "0" || envHeadless === "false") headless = false;
+  else if (engine === "camoufox") headless = true;
+  else headless = false;
+  return launchBulkImportBrowser({
+    engine,
+    headless,
+    windowSize: { width: 1280, height: 900 },
+  });
 }
 
 async function defaultSocialExchange(args) {
@@ -830,23 +850,47 @@ export class KiroBulkImportManager {
     if (!job) return readJsonFile(getJobFile(jobId, this.storageDir));
 
     job.cancelRequested = true;
-    if (job.status === "queued") {
-      job.status = "cancelled";
-      job.finishedAt = nowIso();
-      job.accounts.forEach((account) => {
-        if (account.status === "queued") account.status = "cancelled";
-      });
+
+    // Immediately terminalize ALL open accounts — including needs_manual.
+    // Previously cancel only flipped "queued" jobs and closed the browser, so
+    // needs_manual followups waited on a dead callback promise forever and the
+    // UI stayed "running" / Cancel did nothing.
+    for (const account of job.accounts || []) {
+      if (
+        account.status === "queued"
+        || account.status === "running"
+        || account.status === "needs_manual"
+      ) {
+        const ms = account.manualSession;
+        const rs = account.runtimeSession;
+        const ctx = ms?.context || rs?.context || null;
+        const headed = ms?.headedBrowser || null;
+        if (ctx) void ctx.close().catch(() => null);
+        if (headed) void headed.close().catch(() => null);
+        account.manualSession = null;
+        account.runtimeSession = null;
+        this.finalizeAccount(account, "cancelled", {
+          error: "Job cancelled",
+          step: "cancelled",
+          message: "Job cancelled by user",
+        });
+      }
     }
 
     if (job.browser) {
       const browser = job.browser;
       job.browser = null;
-      // Prefer force-close: stuck proxy/nav can make browser.close() hang forever.
       void import("./bulkImportBrowserEngine.js")
         .then(({ forceCloseBrowser }) => forceCloseBrowser(browser))
         .catch(() => browser.close().catch(() => null));
     }
 
+    // Mark job cancelled immediately so UI unlocks; runJob finally still cleans up.
+    if (job.status === "queued" || job.status === "running") {
+      job.status = "cancelled";
+      job.finishedAt = job.finishedAt || nowIso();
+    }
+
     void this.persistJobSnapshot(job, { forcePreview: true });
 
     return sanitizeJob(job);
@@ -1173,7 +1217,11 @@ export class KiroBulkImportManager {
       if (job.cancelRequested) {
         job.status = "cancelled";
         job.accounts.forEach((account) => {
-          if (account.status === "queued" || account.status === "running") {
+          if (
+            account.status === "queued"
+            || account.status === "running"
+            || account.status === "needs_manual"
+          ) {
             this.finalizeAccount(account, "cancelled", {
               error: "Job cancelled",
               step: "cancelled",
@@ -1182,6 +1230,8 @@ export class KiroBulkImportManager {
           }
         });
       } else {
+        // If only needs_manual left and user never cancelled, still complete the job
+        // once followups settle — do not leave status stuck on "running".
         job.status = "completed";
       }
       await this.persistJobSnapshot(job, { forcePreview: true });

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

@@ -494,18 +494,34 @@ function isGoogleAuthPage(page) {
   }
 }
 
-// Google bounces flagged (headless) browsers to myaccount.google.com/not-supported
-// at the OAuth consent step; from there the page often drifts to about.google.
-// Newer flows use /v3/signin/rejected with "This browser or app may not be secure".
+// Google bounces flagged (headless) browsers:
+// - myaccount.google.com/not-supported
+// - accounts.google.com/v3/signin/rejected ("This browser or app may not be secure")
+// - about.google drift after consent
 function isBlockedBrowserPage(page) {
   try {
     const url = new URL(page.url());
     if (url.pathname.startsWith("/not-supported")) return true;
     if (url.pathname.includes("/signin/rejected")) return true;
-    return url.hostname === "about.google" || url.hostname.endsWith(".about.google");
+    if (url.pathname.includes("/rejected")) return true;
+    if (url.hostname === "about.google" || url.hostname.endsWith(".about.google")) return true;
   } catch {
-    return false;
+    // fall through to body text
   }
+  return false;
+}
+
+async function isBlockedBrowser(page) {
+  if (isBlockedBrowserPage(page)) return true;
+  const text = await readPageText(page).catch(() => "");
+  return includesAny(text, [
+    "browser or app may not be secure",
+    "try using a different browser",
+    "couldn't sign you in",
+    "couldn\u2019t sign you in",
+    "this browser or app may not be secure",
+    "browser is not secure",
+  ]);
 }
 
 function isProviderPage(page) {
@@ -1222,12 +1238,17 @@ export function createKiroCallbackMonitor(context, page, timeoutMs = DEFAULT_MAN
       const parsed = parseCallbackUrl(trackedPage.url?.() || "");
       if (parsed) settle(parsed);
     };
+    const onClose = () => {
+      // Cancel/force-close: unblock manual followup instead of hanging 15 min
+      settle(null, new Error("Browser session closed while waiting for Kiro callback"));
+    };
 
     trackedPage.on("framenavigated", onFrame);
     trackedPage.on("request", onRequest);
     trackedPage.on("requestfailed", onRequestFailed);
     trackedPage.on("domcontentloaded", onLoadState);
     trackedPage.on("load", onLoadState);
+    trackedPage.on("close", onClose);
 
     ownerCleanups.push(() => {
       trackedPage.off("framenavigated", onFrame);
@@ -1235,6 +1256,7 @@ export function createKiroCallbackMonitor(context, page, timeoutMs = DEFAULT_MAN
       trackedPage.off("requestfailed", onRequestFailed);
       trackedPage.off("domcontentloaded", onLoadState);
       trackedPage.off("load", onLoadState);
+      trackedPage.off("close", onClose);
     });
 
     const current = parseCallbackUrl(trackedPage.url?.() || "");
@@ -1248,8 +1270,13 @@ export function createKiroCallbackMonitor(context, page, timeoutMs = DEFAULT_MAN
     contextCleanups.set(ctx, cleanups);
 
     const onPage = (newPage) => registerPage(newPage, cleanups);
+    const onClose = () => {
+      settle(null, new Error("Browser context closed while waiting for Kiro callback"));
+    };
     ctx.on("page", onPage);
+    ctx.on("close", onClose);
     cleanups.push(() => ctx.off("page", onPage));
+    cleanups.push(() => ctx.off("close", onClose));
 
     if (pg) registerPage(pg, cleanups);
   }
@@ -1260,6 +1287,11 @@ export function createKiroCallbackMonitor(context, page, timeoutMs = DEFAULT_MAN
     if (newContext) bind(newContext, newPage);
   };
 
+  // Allow cancel path to force-reject without waiting for timeout
+  promise.abort = (reason = "Job cancelled") => {
+    settle(null, new Error(reason));
+  };
+
   return promise;
 }
 
@@ -1425,15 +1457,19 @@ export async function runGoogleAccountAutomation({
       continue;
     }
 
-    // Headless Chromium gets bounced to myaccount.google.com/not-supported at the
-    // OAuth consent step. From there the broad Google-button selectors wander onto
-    // about.google and loop until timeout. Detect the dead-end and bail to manual
-    // (the Camoufox engine avoids this by not being flagged as headless).
-    if (isBlockedBrowserPage(page)) {
-      reportStep("manual_assist_required", "Google blocked the automated browser (not-supported). Use the Camoufox engine or complete manually.");
+    // Headless Chromium is rejected after email submit → /v3/signin/rejected
+    // ("This browser or app may not be secure"). Fail fast — do not spin 90s.
+    if (await isBlockedBrowser(page)) {
+      const url = page.url?.() || "";
+      reportStep(
+        "browser_blocked_by_google",
+        `Google blocked this browser (url=${url.slice(0, 120)}). Headless Chromium is rejected — use headed mode or Camoufox.`,
+      );
       return {
-        status: "needs_manual",
-        error: "Google blocked the automated browser at the OAuth consent step (not-supported page). Switch to the Camoufox engine or finish this account manually.",
+        status: "failed_browser_blocked",
+        error:
+          "Google blocked the automated browser (\"This browser or app may not be secure\" / signin rejected). " +
+          "Kiro bulk must use headed Chromium (Xvfb on Linux) or the Camoufox engine — not headless Chrome.",
       };
     }
 
@@ -1517,14 +1553,42 @@ export async function runGoogleAccountAutomation({
       continue;
     }
 
-    reportStep("waiting_for_next_screen", `Waiting for the next Google or ${serviceLabel} screen`);
+    // Periodic diagnostics so jobs aren't opaque "waiting" spam
+    if (Math.floor((Date.now() - startTime) / 5000) !== Math.floor((Date.now() - startTime - 700) / 5000)) {
+      const url = page.url?.() || "";
+      const snippet = String(text || (await readPageText(page).catch(() => ""))).slice(0, 100).replace(/\s+/g, " ");
+      reportStep(
+        "waiting_for_next_screen",
+        `Waiting for the next Google or ${serviceLabel} screen (url=${url.slice(0, 100)} body=${snippet})`,
+      );
+    } else {
+      reportStep("waiting_for_next_screen", `Waiting for the next Google or ${serviceLabel} screen`);
+    }
     await page.waitForTimeout(700);
   }
 
-  reportStep("manual_assist_required", `Flow did not complete ${serviceLabel} authorization automatically`);
+  // Final blocked check before generic needs_manual
+  if (await isBlockedBrowser(page)) {
+    reportStep("browser_blocked_by_google", "Google blocked browser at end of automation window");
+    return {
+      status: "failed_browser_blocked",
+      error:
+        "Google blocked the automated browser (\"This browser or app may not be secure\"). " +
+        "Use headed Chromium (Xvfb) or Camoufox engine.",
+    };
+  }
+
+  const finalUrl = page.url?.() || "";
+  const finalBody = String(await readPageText(page).catch(() => "")).slice(0, 120).replace(/\s+/g, " ");
+  reportStep(
+    "manual_assist_required",
+    `Flow did not complete ${serviceLabel} authorization automatically (url=${finalUrl.slice(0, 100)} body=${finalBody})`,
+  );
   return {
     status: "needs_manual",
-    error: `Manual assist required in the browser session because the login flow did not complete ${serviceLabel} authorization automatically.`,
+    error:
+      `Manual assist required — ${serviceLabel} authorization did not finish automatically ` +
+      `(last url: ${finalUrl.slice(0, 140)}). If you see "browser may not be secure", switch to headed Chromium/Camoufox.`,
   };
 }