zevairouter 1.0.67 → 1.0.69

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

@@ -1,6 +1,6 @@
 {
   "name": "zevairouter-cli",
-  "version": "1.0.67",
+  "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.67",
+  "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/bulkImportBrowserEngine.js

@@ -112,32 +112,25 @@ async function launchChromium({ proxyUrl, headless = true, windowSize = null } =
     await ensureHeadedDisplayOrThrow();
   }
 
+  // Prefer runtime helper first — under Next/webpack, dynamic import("playwright")
+  // often fails even when ~/.zevai/runtime has the package (Kiro mass-fail).
   let chromium = null;
   let importErr = null;
-  try {
-    chromium = await importPlaywright();
-  } catch (err) {
-    importErr = err;
+  const runtime = loadRuntimeHelper("playwrightRuntime");
+  if (runtime?.ensurePlaywrightRuntime) {
+    const ready = runtime.ensurePlaywrightRuntime({ silent: false });
+    if (ready.ok) {
+      const mod = ready.module || runtime.loadPlaywrightModule?.() || runtime.tryRequirePlaywright?.();
+      chromium = mod?.chromium ?? null;
+    } else if (ready.error) {
+      importErr = ready.error;
+    }
   }
-
   if (!chromium) {
-    const runtime = loadRuntimeHelper("playwrightRuntime");
-    if (runtime?.ensurePlaywrightRuntime) {
-      const ready = runtime.ensurePlaywrightRuntime({ silent: false });
-      if (ready.ok) {
-        try {
-          chromium = await importPlaywright();
-        } catch (err) {
-          importErr = err;
-        }
-        if (!chromium) {
-          const mod = ready.module || runtime.loadPlaywrightModule?.();
-          chromium = mod?.chromium ?? null;
-        }
-      } else if (ready.error) {
-        if (importErr) ready.error.cause = importErr;
-        throw ready.error;
-      }
+    try {
+      chromium = await importPlaywright();
+    } catch (err) {
+      importErr = err;
     }
   }
 
@@ -152,8 +145,11 @@ async function launchChromium({ proxyUrl, headless = true, windowSize = null } =
 
   const width = windowSize?.width || (wantHeadless ? 1920 : 900);
   const height = windowSize?.height || (wantHeadless ? 1080 : 700);
+  // Force bundled Chromium — never Google Chrome channel (/opt/google/chrome),
+  // which is missing on most VPS and caused "distribution 'chrome' is not found".
   const options = {
     headless: wantHeadless,
+    channel: undefined,
     args: [
       "--disable-blink-features=AutomationControlled",
       "--disable-features=IsolateOrigins,site-per-process,AutomationControlled",
@@ -173,6 +169,14 @@ async function launchChromium({ proxyUrl, headless = true, windowSize = null } =
     ],
     ignoreDefaultArgs: ["--enable-automation"],
   };
+  // Explicit bundled Chromium path when it exists (avoids channel=chrome hijack)
+  try {
+    const { existsSync } = await import("node:fs");
+    const exePath = typeof chromium.executablePath === "function" ? chromium.executablePath() : null;
+    if (exePath && existsSync(exePath)) options.executablePath = exePath;
+  } catch {
+    // ignore
+  }
   if (proxyUrl) {
     const { parsePlaywrightProxy } = await import("./proxyUtils.js");
     options.proxy = parsePlaywrightProxy(proxyUrl) || { server: proxyUrl };
@@ -188,6 +192,18 @@ async function launchChromium({ proxyUrl, headless = true, windowSize = null } =
       const browser = await chromium.launch(options);
       return wrapBrowserWithStealth(browser);
     }
+    // Retry without executablePath if channel/chrome confusion remains
+    if (/distribution ['\"]chrome['\"]|Executable doesn't exist|chrome-headless-shell/i.test(msg)) {
+      try {
+        const retryOpts = { ...options };
+        delete retryOpts.channel;
+        delete retryOpts.executablePath;
+        const browser = await chromium.launch(retryOpts);
+        return wrapBrowserWithStealth(browser);
+      } catch {
+        // fall through
+      }
+    }
     throw error;
   }
 }

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;
 }