qwenproxy-cli 1.6.9 → 1.6.11

package/dist/reset-cooldowns.js

@@ -1236,6 +1236,26 @@ function clearAllAccountCooldowns() {
   cooldowns.clear();
   return count;
 }
+function getAccountCooldownInfo(accountId) {
+  const entry = cooldowns.get(accountId);
+  if (!entry) return null;
+  const remaining = entry.until - Date.now();
+  if (remaining <= 0) {
+    cooldowns.delete(accountId);
+    if (accountId !== "global") {
+      try {
+        updateAccountCooldown(accountId, 0, null);
+      } catch (err) {
+        console.error(
+          `\u274C [AccountManager] Failed to clear expired cooldown in DB:`,
+          err.message
+        );
+      }
+    }
+    return null;
+  }
+  return { onCooldown: true, remainingMs: remaining, reason: entry.reason };
+}
 function markAccountHeadersReady(accountId) {
   if (!accountId || accountId === "global") return;
   headersReadyAccounts.add(accountId);
@@ -3256,7 +3276,19 @@ async function isPageLoggedIn(page, timeoutMs = SESSION_PROBE_NAVIGATION_TIMEOUT
         if (localStorage.getItem("qwen_token_logged_out_marker")) {
           return false;
         }
-        const res = await fetch("/api/v1/auths/", { method: "GET" });
+        const lsToken = (localStorage.getItem("token") || "").trim();
+        if (lsToken && !/(?:^|;\s*)token=/.test(document.cookie || "")) {
+          try {
+            document.cookie = `token=${encodeURIComponent(lsToken)}; path=/; domain=.qwen.ai; max-age=31536000`;
+          } catch {
+          }
+        }
+        const authHeaders = lsToken ? { Authorization: `Bearer ${lsToken}` } : {};
+        const res = await fetch("/api/v1/auths/", {
+          method: "GET",
+          headers: authHeaders,
+          credentials: "include"
+        });
         if (res.status !== 200) return false;
         const json = await res.json().catch(() => null);
         if (!json) return false;
@@ -3274,6 +3306,7 @@ async function isPageLoggedIn(page, timeoutMs = SESSION_PROBE_NAVIGATION_TIMEOUT
         try {
           const settingsRes = await fetch("/api/v2/users/user/settings", {
             method: "GET",
+            headers: authHeaders,
             credentials: "include",
             signal: AbortSignal.timeout(3e3)
           });
@@ -3876,8 +3909,12 @@ async function initPlaywrightForAccount(rawAccount, headless = config.playwright
       if (accountPages.has(account.id)) {
         return;
       }
-      await evictIdlePlaywrightContextsToLimit().catch(() => {
-      });
+      if (config.playwright.maxActiveContexts > 0) {
+        await evictIdlePlaywrightContextsToLimit(
+          Math.max(1, config.playwright.maxActiveContexts - 1)
+        ).catch(() => {
+        });
+      }
       const profilePath = getAccountProfilePath(account.id);
       const fingerprint = getFingerprintProfile(account.id);
       const { engine, channel } = resolveBrowserEngine(browserType);
@@ -4102,8 +4139,15 @@ async function initPlaywrightForAccount(rawAccount, headless = config.playwright
         const hasAuthCookie = cookies.some(
           (c) => c.name.toLowerCase().includes("token") || c.name.toLowerCase().includes("session")
         );
+        let initialLoginAttempted = false;
         if (!hasAuthCookie && account.email && account.password) {
-          await loginToQwen(account.id, account.email, account.password);
+          initialLoginAttempted = true;
+          const loggedIn = await loginToQwen(account.id, account.email, account.password);
+          if (!loggedIn) {
+            throw new Error(
+              `Authentication failed for account ${maskEmail(account.email)}`
+            );
+          }
         }
         try {
           await acctPage.goto(qwenUrl("/"), {
@@ -4113,13 +4157,21 @@ async function initPlaywrightForAccount(rawAccount, headless = config.playwright
           await sleep2(1500);
           const currentUrl = acctPage.url();
           const isAuthUrl = currentUrl.includes("/auth") || currentUrl.includes("/login");
-          if (isAuthUrl && account.email && account.password) {
+          if (isAuthUrl && !initialLoginAttempted && account.email && account.password) {
             console.log(
               `[Playwright] Initial login needed for ${maskEmail(account.email)}, authenticating...`
             );
-            await loginToQwen(account.id, account.email, account.password);
+            const loggedIn = await loginToQwen(account.id, account.email, account.password);
+            if (!loggedIn) {
+              throw new Error(
+                `Authentication failed for account ${maskEmail(account.email)}`
+              );
+            }
           }
         } catch (err) {
+          if (err?.message?.includes("Authentication failed for account")) {
+            throw err;
+          }
           console.warn(
             `\u26A0\uFE0F  [Playwright] Initial navigation check for ${maskEmail(account.email)}: ${err.message}`
           );
@@ -4131,7 +4183,7 @@ async function initPlaywrightForAccount(rawAccount, headless = config.playwright
         if (!acctPage.isClosed()) {
           try {
             const currentUrl = new URL(acctPage.url());
-            if (currentUrl.origin !== qwenOrigin() || currentUrl.pathname !== "/") {
+            if (currentUrl.origin !== qwenOrigin() || currentUrl.pathname.includes("/auth") || currentUrl.pathname.includes("/login") || currentUrl.pathname.includes("_____tmd_____")) {
               await acctPage.goto(qwenUrl("/"), {
                 waitUntil: "domcontentloaded",
                 timeout: config.timeouts.navigation
@@ -4149,6 +4201,8 @@ async function initPlaywrightForAccount(rawAccount, headless = config.playwright
     } finally {
       release();
     }
+    await evictIdlePlaywrightContextsToLimit().catch(() => {
+    });
   })();
   try {
     await initPromise;
@@ -4262,10 +4316,30 @@ async function loginToQwen(accountId, email, password) {
     const uiResult = await loginViaUi(page, email, password);
     if (uiResult.success) {
       cookieCaches.delete(accountId);
-      await saveStorageState(page.context(), accountId);
       try {
-        const liveCookies = await page.context().cookies();
-        const tokenCookie = liveCookies.find((c) => c.name === "token");
+        let liveCookies = await page.context().cookies();
+        let tokenCookie = liveCookies.find((c) => c.name === "token");
+        if (!tokenCookie) {
+          const lsTok = uiResult.token || await page.evaluate(() => (localStorage.getItem("token") || "").trim()).catch(() => "");
+          if (lsTok) {
+            await page.context().addCookies([
+              {
+                name: "token",
+                value: lsTok,
+                domain: ".qwen.ai",
+                path: "/",
+                expires: Math.floor(Date.now() / 1e3) + 31536e3,
+                httpOnly: false,
+                secure: true,
+                sameSite: "Lax"
+              }
+            ]).catch(() => {
+            });
+            liveCookies = await page.context().cookies();
+            tokenCookie = liveCookies.find((c) => c.name === "token");
+          }
+        }
+        await saveStorageState(page.context(), accountId);
         if (tokenCookie) {
           const cookieStr = liveCookies.map((c) => `${c.name}=${c.value}`).join("; ");
           const cache = getHeaderCache(accountId);
@@ -4274,7 +4348,7 @@ async function loginToQwen(accountId, email, password) {
           markAccountHeadersReady(accountId);
           const { saveAuthSession: saveAuthSession2 } = await Promise.resolve().then(() => (init_database(), database_exports));
           const exp = parseJwtExpiry(tokenCookie.value);
-          let rTok = uiResult.refreshToken;
+          let rTok = uiResult.refreshToken || liveCookies.find((c) => c.name === "refresh_token")?.value;
           if (!rTok) {
             try {
               rTok = await page.evaluate(() => localStorage.getItem("refresh_token") || "") || void 0;
@@ -4355,8 +4429,9 @@ async function loginViaApi(page, email, password) {
     }
     const signinUrl = "https://auth.qwen.ai/api/v2/auths/signin";
     const requestId = crypto3.randomUUID();
+    const webVersion = getQwenWebVersion() || "0.3.26";
     const evalRes = await page.evaluate(
-      async ({ email: email2, password: password2, signinUrl: signinUrl2, requestId: requestId2, tz }) => {
+      async ({ email: email2, password: password2, signinUrl: signinUrl2, requestId: requestId2, tz, version }) => {
         try {
           const response = await fetch(signinUrl2, {
             method: "POST",
@@ -4366,7 +4441,7 @@ async function loginViaApi(page, email, password) {
               accept: "application/json, text/plain, */*",
               "content-type": "application/json",
               source: "web",
-              version: getQwenWebVersion() || "0.3.26",
+              version,
               "x-request-origin": "https://chat.qwen.ai",
               timezone: tz,
               "x-request-id": requestId2
@@ -4379,7 +4454,14 @@ async function loginViaApi(page, email, password) {
           return { ok: false, error: e.message };
         }
       },
-      { email, password: hashedPassword, signinUrl, requestId, tz: formatAsciiTimezone() }
+      {
+        email,
+        password: hashedPassword,
+        signinUrl,
+        requestId,
+        tz: formatAsciiTimezone(),
+        version: webVersion
+      }
     ).catch(() => null);
     let data = evalRes?.data;
     let signinSuccess = Boolean(
@@ -4388,7 +4470,7 @@ async function loginViaApi(page, email, password) {
     if (!signinSuccess && !data?.data?.code) {
       const fallbackUrl = qwenUrl("/api/v2/auths/signin");
       const fallbackRes = await page.evaluate(
-        async ({ email: email2, password: password2, fallbackUrl: fallbackUrl2, requestId: requestId2, tz }) => {
+        async ({ email: email2, password: password2, fallbackUrl: fallbackUrl2, requestId: requestId2, tz, version }) => {
           try {
             const response = await fetch(fallbackUrl2, {
               method: "POST",
@@ -4398,7 +4480,7 @@ async function loginViaApi(page, email, password) {
                 accept: "application/json, text/plain, */*",
                 "content-type": "application/json",
                 source: "web",
-                version: getQwenWebVersion() || "0.3.26",
+                version,
                 timezone: tz,
                 "x-request-id": requestId2
               },
@@ -4410,7 +4492,14 @@ async function loginViaApi(page, email, password) {
             return { ok: false, error: e.message };
           }
         },
-        { email, password: hashedPassword, fallbackUrl, requestId, tz: formatAsciiTimezone() }
+        {
+          email,
+          password: hashedPassword,
+          fallbackUrl,
+          requestId,
+          tz: formatAsciiTimezone(),
+          version: webVersion
+        }
       ).catch(() => null);
       if (fallbackRes?.data) {
         data = fallbackRes.data;
@@ -4635,28 +4724,34 @@ async function loginViaUi(page, email, password) {
     await sleep2(500);
     const submitSelector = 'button.qwenchat-auth-pc-submit-button, button[type="submit"], button:has-text("Log in"), button:has-text("Sign in"), button:has-text("Fazer login"), button:has-text("Entrar"), button:has-text("Iniciar sesi\xF3n"), button:has-text("\u767B\u5F55")';
     const submitButton = page.locator(submitSelector).first();
-    await page.evaluate((sel) => {
-      try {
-        const btn = document.querySelector(sel);
-        if (btn) {
-          btn.removeAttribute("disabled");
-          btn.classList.remove("ant-btn-disabled");
-          btn.click();
-        }
-      } catch {
-      }
-    }, submitSelector).catch(() => {
-    });
+    let submitted = false;
     try {
       if (await submitButton.isVisible({ timeout: 2e3 }).catch(() => false)) {
-        await submitButton.click({ force: true, timeout: 2e3 }).catch(() => {
+        await submitButton.click({ timeout: 2e3 }).catch(() => {
         });
+        submitted = true;
       }
     } catch {
     }
-    const passInput = page.locator(passwordSelector).first();
-    await passInput.press("Enter", { timeout: 2e3 }).catch(() => {
-    });
+    if (!submitted) {
+      await page.evaluate(() => {
+        try {
+          const btn = document.querySelector(
+            'button.qwenchat-auth-pc-submit-button, button[type="submit"]'
+          );
+          if (btn) {
+            btn.removeAttribute("disabled");
+            btn.classList.remove("ant-btn-disabled");
+            btn.click();
+          }
+        } catch {
+        }
+      }).catch(() => {
+      });
+      const passInput = page.locator(passwordSelector).first();
+      await passInput.press("Enter", { timeout: 2e3 }).catch(() => {
+      });
+    }
     const postSubmitDeadline = Date.now() + 15e3;
     while (Date.now() < postSubmitDeadline) {
       if (page.isClosed()) break;
@@ -4674,9 +4769,12 @@ async function loginViaUi(page, email, password) {
         ".ant-form-item-explain-error",
         ".ant-message-error",
         ".ant-message-notice",
+        ".ant-message-custom-content",
+        ".ant-notification-notice",
         '[role="alert"]',
         ".qwenchat-auth-error",
-        ".auth-error-message"
+        ".auth-error-message",
+        ".qwenchat-toast"
       ].join(", ");
       const errorEl = page.locator(errorSelector).first();
       if (await errorEl.isVisible().catch(() => false)) {
@@ -4690,7 +4788,15 @@ async function loginViaUi(page, email, password) {
           };
         }
       }
-      const codeSelector = 'input[placeholder*="code" i], input[placeholder*="c\xF3digo" i], input[name*="code" i]';
+      const codeSelector = [
+        'input[placeholder*="code" i]',
+        'input[placeholder*="c\xF3digo" i]',
+        'input[name*="code" i]',
+        ".qwenchat-verification-code-input",
+        ".qwenchat-verification-code-input-cell",
+        '[aria-label*="Verification code" i]',
+        '[aria-label*="c\xF3digo de verifica\xE7\xE3o" i]'
+      ].join(", ");
       const codeInput = page.locator(codeSelector).first();
       if (await codeInput.isVisible().catch(() => false)) {
         return {
@@ -4700,16 +4806,44 @@ async function loginViaUi(page, email, password) {
       }
       try {
         const liveCookies = await page.context().cookies();
-        if (liveCookies.some((c) => c.name === "token")) {
-          return { success: true };
+        const rTokCookie = liveCookies.find((c) => c.name === "refresh_token")?.value;
+        const tokCookie = liveCookies.find((c) => c.name === "token")?.value;
+        if (tokCookie) {
+          return { success: true, token: tokCookie, refreshToken: rTokCookie };
         }
-      } catch {
-      }
-      const currentUrl = page.url();
-      if (!currentUrl.includes("/auth") && !currentUrl.includes("/login")) {
-        if (await isPageLoggedIn(page, 3e3)) {
-          return { success: true };
+        const currentUrl = page.url();
+        if (!currentUrl.includes("/auth") && !currentUrl.includes("/login")) {
+          const lsTok = await page.evaluate(() => {
+            const t = (localStorage.getItem("token") || "").trim();
+            if (t) {
+              try {
+                document.cookie = `token=${encodeURIComponent(t)}; path=/; domain=.qwen.ai; max-age=31536000`;
+              } catch {
+              }
+            }
+            return t;
+          }).catch(() => "");
+          if (lsTok) {
+            await page.context().addCookies([
+              {
+                name: "token",
+                value: lsTok,
+                domain: ".qwen.ai",
+                path: "/",
+                expires: Math.floor(Date.now() / 1e3) + 31536e3,
+                httpOnly: false,
+                secure: true,
+                sameSite: "Lax"
+              }
+            ]).catch(() => {
+            });
+            return { success: true, token: lsTok, refreshToken: rTokCookie };
+          }
+          if (await isPageLoggedIn(page, 3e3)) {
+            return { success: true, refreshToken: rTokCookie };
+          }
         }
+      } catch {
       }
       await sleep2(1e3);
     }
@@ -4739,10 +4873,18 @@ async function refreshAccountToken(accountId) {
     } catch {
     }
   }
+  if (!refreshToken) {
+    try {
+      const liveCookies = await page.context().cookies();
+      refreshToken = liveCookies.find((c) => c.name === "refresh_token")?.value;
+    } catch {
+    }
+  }
   if (refreshToken) {
     try {
+      const webVersion = getQwenWebVersion() || "0.3.26";
       const refreshResult = await page.evaluate(
-        async ({ rTok, tz }) => {
+        async ({ rTok, tz, version }) => {
           try {
             const response = await fetch("https://auth.qwen.ai/api/v2/auths/refresh", {
               method: "GET",
@@ -4750,7 +4892,7 @@ async function refreshAccountToken(accountId) {
               headers: {
                 accept: "application/json, text/plain, */*",
                 source: "web",
-                version: getQwenWebVersion() || "0.3.26",
+                version,
                 "x-request-origin": "https://chat.qwen.ai",
                 timezone: tz,
                 authorization: `Bearer ${rTok}`
@@ -4762,7 +4904,7 @@ async function refreshAccountToken(accountId) {
             return { ok: false, error: e.message };
           }
         },
-        { rTok: refreshToken, tz: formatAsciiTimezone() }
+        { rTok: refreshToken, tz: formatAsciiTimezone(), version: webVersion }
       );
       const json = refreshResult?.data;
       if (json && json.success === true && json.data) {
@@ -5563,7 +5705,11 @@ function priorityOrderForEviction(accountIds) {
   const ranked = getAccountsByPriority(accountIds.map((id) => ({ id })));
   const rank = /* @__PURE__ */ new Map();
   for (const [index, account] of ranked.entries()) {
-    rank.set(account.id, index);
+    if (getAccountCooldownInfo(account.id)) {
+      rank.set(account.id, Number.MAX_SAFE_INTEGER);
+    } else {
+      rank.set(account.id, index);
+    }
   }
   return orderContextsForEviction(
     accountIds,
@@ -5571,14 +5717,15 @@ function priorityOrderForEviction(accountIds) {
     (id) => lastAccountActivity.get(id) ?? 0
   );
 }
-async function evictIdlePlaywrightContextsToLimit() {
-  const max = config.playwright.maxActiveContexts;
-  if (max <= 0) return 0;
+async function evictIdlePlaywrightContextsToLimit(targetLimit) {
+  const configuredMax = config.playwright.maxActiveContexts;
+  if (configuredMax <= 0) return 0;
+  const max = targetLimit !== void 0 ? Math.max(0, targetLimit) : configuredMax;
   if (accountPages.size <= max) return 0;
   const candidates = priorityOrderForEviction(
     Array.from(accountPages.keys()).filter((accountId) => {
       if (isAccountServingStream(accountId)) return false;
-      if (isAccountRecentlyActive(accountId, 3e4)) return false;
+      if (hasActiveAccountLease(accountId)) return false;
       const mutex = accountMutexes.get(accountId);
       return mutex?.isIdle();
     })
@@ -5591,6 +5738,7 @@ async function evictIdlePlaywrightContextsToLimit() {
   for (const candidate of candidates) {
     if (accountPages.size <= max) break;
     if (isAccountServingStream(candidate.accountId)) continue;
+    if (hasActiveAccountLease(candidate.accountId)) continue;
     const mutex = accountMutexes.get(candidate.accountId);
     if (!mutex?.isIdle()) continue;
     await closePlaywrightForAccount(candidate.accountId).catch((error) => {
@@ -5693,10 +5841,6 @@ async function closePlaywrightForAccount(accountId) {
     release();
   }
 }
-function isAccountRecentlyActive(accountId, maxIdleMs = 3e5) {
-  const last = lastAccountActivity.get(accountId) ?? 0;
-  return last > 0 && Date.now() - last < maxIdleMs;
-}
 var requireLocal, contextInitHooks, ACCOUNT_MUTEX_MAX_HOLD_MS, accountMutexes, accountContexts, accountPages, inFlightAccountInits, headerCaches, HEADER_CACHE_TTL, COOKIE_CACHE_TTL, cookieCaches, lastAccountActivity, lastKeepAliveNavigation, lastProactiveTokenRefresh, profileResetQueue, profileResetChain, closingAllPlaywright, sleep2, HEADER_CAPTURE_SETTLE_MS, PLAYWRIGHT_MUTEX_WAIT_MS, ACCOUNT_PAGE_OPERATION_TIMEOUT_MS, SESSION_PROBE_NAVIGATION_TIMEOUT_MS, HEADER_CAPTURE_TRIGGER_GRACE_MS, FIRST_TRIGGER_GRACE_MS, HEADER_CAPTURE_TRIGGER_ATTEMPTS, CHAT_INPUT_APPEAR_TIMEOUT_MS, CHAT_INPUT_ACTION_TIMEOUT_MS, PROFILE_RESET_TIMEOUT_MS;
 var init_playwright = __esm({
   "src/services/playwright.ts"() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qwenproxy-cli",
-  "version": "1.6.9",
+  "version": "1.6.11",
   "description": "High-performance OpenAI & Anthropic compatible API gateway for Qwen with multi-account rotation, interactive TUI, and resilient tool calling.",
   "main": "src/index.ts",
   "bin": {
@@ -58,7 +58,7 @@
   "bugs": {
     "url": "https://github.com/johngbl/qwenproxy/issues"
   },
-  "author": "johngbl <147551701+johngbl@users.noreply.github.com>",
+  "author": "johngbl",
   "license": "ISC",
   "dependencies": {
     "@hono/node-server": "^2.1.1",

package/src/api/server.ts

@@ -883,10 +883,14 @@ export async function startServer(options?: {
         void (async () => {
           const { ensureAccountInPriority } = await import("../core/account-priority.ts");
 
-          const targetWarmTotal = Math.min(
-            config.playwright.startupWarmAccounts,
-            totalAccounts,
-          );
+          const maxWarmCap =
+            config.playwright.maxActiveContexts > 0
+              ? Math.min(
+                  config.playwright.startupWarmAccounts,
+                  config.playwright.maxActiveContexts,
+                )
+              : config.playwright.startupWarmAccounts;
+          const targetWarmTotal = Math.min(maxWarmCap, totalAccounts);
           let currentReadyCount = readyAccountIds.size;
 
           if (currentReadyCount < targetWarmTotal && remainingAccounts.length > 0) {

package/src/core/version.ts

@@ -17,6 +17,6 @@ export function getAppVersion(): string {
       }
     }
   } catch {}
-  cachedVersion = "v1.6.9";
+  cachedVersion = "v1.6.11";
   return cachedVersion;
 }

package/src/core/watchdog.ts

@@ -148,14 +148,15 @@ export class Watchdog extends EventEmitter {
     // (idle mutex, no active stream, preserves the max-active-context minimum)
     // so the next health check sees the freed RSS.
     try {
-      const { closeIdlePlaywrightAccounts } = await import(
+      const { closeIdlePlaywrightAccounts, evictIdlePlaywrightContextsToLimit } = await import(
         "../services/playwright.js"
       );
+      const evicted = await evictIdlePlaywrightContextsToLimit(1);
       const closed = await closeIdlePlaywrightAccounts(
         config.sessionKeeper.idleMs,
       );
-      if (closed > 0) {
-        this.emit("recovery:ram:contexts-closed", closed);
+      if (evicted + closed > 0) {
+        this.emit("recovery:ram:contexts-closed", evicted + closed);
       }
     } catch {
       // Playwright may not be initialized (mock mode / pre-start); RSS relief

package/src/routes/chat/account.ts

@@ -8,6 +8,7 @@ import {
 } from "../../core/account-manager.ts";
 import { markAccountSuccessful, markAccountFailed, getAccountsByPriority } from "../../core/account-priority.ts";
 import { recordWafHardBlock, noteWafRecovery } from "../../core/waf-isolation.ts";
+import { isCaptchaRecoveryInBackoff } from "../../services/captcha-coordinator.ts";
 import { loadAccounts, type QwenAccount } from "../../core/accounts.ts";
 import { config, type ChatMode } from "../../core/config.ts";
 import { ClientAbortedError, UpstreamRateLimit, ValidationError } from "../../core/errors.ts";
@@ -1615,6 +1616,17 @@ async function tryCreateStreamWithRetry(
 			invalidateLogicalThreadParent(params.sessionId);
 		}
 
+		// If captcha recovery on this account already failed and is in its 30s
+		// backoff window, same-account retries will only hit `recovery_skipped`
+		// and waste time/RAM re-sending large payloads. Exit immediately so the
+		// outer loop quarantines this account and switches to a fresh one.
+		if (
+			policy.reason === "anti_bot" &&
+			isCaptchaRecoveryInBackoff(currentAccountId)
+		) {
+			return { success: false, error: err };
+		}
+
 		// A generic invalid_input is often a stale/corrupted upstream chat rather
 		// than an account failure. Rebuild it once on the same account first. If the
 		// fresh chat fails again, the normal policy is allowed to rotate.

package/src/routes/chat/streaming.ts

@@ -1259,8 +1259,8 @@ export async function processStreamingResponse(
       };
 
       const emitAnswerText = async (textChunk: string) => {
-        if (textChunk) emittedModelOutput = true;
         if (!toolParser) {
+          if (textChunk) emittedModelOutput = true;
           finalContent += textChunk;
           writeDeltaEvent({ content: textChunk });
           return;
@@ -1777,6 +1777,23 @@ export async function processStreamingResponse(
               .replace(/\\\\/g, "\\");
 
             if (unescaped) {
+              if (!emittedModelOutput && isOverloadMessage(unescaped)) {
+                const overloadErr = toRetryableStreamError(
+                  "server_overloaded",
+                  unescaped,
+                  {
+                    switchAccount: true,
+                    forceNewChat: true,
+                    reason: "server_busy",
+                    accountCooldownMs: OVERLOAD_COOLDOWN_MS,
+                    accountCooldownReason: "ServerOverloaded",
+                  },
+                );
+                if (await recoverFromStreamError(overloadErr)) {
+                  break;
+                }
+                throw overloadErr;
+              }
               const result = getIncrementalDelta(
                 lastRawContent,
                 unescaped,
@@ -1942,7 +1959,6 @@ export async function processStreamingResponse(
               if (vStr === "FINISHED") continue;
 
               if (isThinkingChunk) {
-                emittedModelOutput = true;
                 reasoningBuffer += vStr;
                 writeDeltaEvent({ reasoning_content: vStr });
               } else {

package/src/services/captcha-coordinator.ts

@@ -92,6 +92,12 @@ export async function solveChallengeOnPage(
  * a punish document that is never rendered; opening that document in the page
  * is what gives the solver a slider to drive.
  */
+export function isCaptchaRecoveryInBackoff(accountId: string | undefined): boolean {
+  if (!accountId) return false;
+  const lastFailure = lastFailedRecoveryAt.get(accountId) ?? 0;
+  return Date.now() - lastFailure < FAILED_RECOVERY_BACKOFF_MS;
+}
+
 export async function recoverBaxiaCaptcha(
   accountId: string | undefined,
   label: string,
@@ -126,19 +132,41 @@ export async function recoverBaxiaCaptcha(
 
   activeCaptchaRecoveries.add(accountId);
   try {
-    const { abortActiveBrowserStreamsForAccount } = await import("./qwen.ts");
-    abortActiveBrowserStreamsForAccount(
-      accountId,
-      "Account stream interrupted by captcha challenge recovery",
-    );
-  } catch {}
-  try {
+    const { hasActiveBrowserStreamsForAccount } = await import("./qwen.ts");
+    const hasConcurrentStream = hasActiveBrowserStreamsForAccount(accountId);
+
     // recoverOnTimeout: false ensures that if the captcha solve times out,
     // withAccountPage does NOT destructively kill the browser context, which
     // previously caused "Target page, context or browser has been closed" mid-slider.
     const solved = await withAccountPage(
       accountId,
-      (page) => solveChallengeOnPage(page, challengeUrl),
+      async (page) => {
+        // If another stream is actively running on this account's primary page,
+        // NEVER navigate `page` away (which would unload its DOM and kill the stream).
+        // Instead, try in-place modal solve first, or open an ephemeral tab in the
+        // same BrowserContext so cookies/x5sec are solved without touching `page`.
+        if (hasConcurrentStream) {
+          const solverOptions = {
+            maxAttempts: config.captcha.maxAttempts,
+            retryDelayMs: config.captcha.retryDelayMs,
+            settleMs: config.captcha.settleMs,
+          };
+          if (await solveBaxiaCaptcha(page, { ...solverOptions, waitForMs: 0 })) {
+            return true;
+          }
+          const ctx = typeof page.context === "function" ? page.context() : null;
+          if (ctx && typeof ctx.newPage === "function") {
+            const tempPage = await ctx.newPage();
+            try {
+              return await solveChallengeOnPage(tempPage, challengeUrl);
+            } finally {
+              await tempPage.close({ runBeforeUnload: false }).catch(() => {});
+            }
+          }
+          return false;
+        }
+        return await solveChallengeOnPage(page, challengeUrl);
+      },
       solverOperationTimeoutMs,
       solverOperationTimeoutMs,
       false,