zevairouter 1.0.68 → 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zevairouter",
-  "version": "1.0.68",
+  "version": "1.0.69",
   "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.69",
   "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.69",
   "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

@@ -830,23 +830,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 +1197,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 +1210,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

@@ -1222,12 +1222,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 +1240,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 +1254,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 +1271,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;
 }