qwenproxy-cli 1.6.3 → 1.6.5

package/dist/index.js

@@ -2816,6 +2816,7 @@ var init_mutex = __esm({
       locked = false;
       lockedAt = 0;
       lockedByKey = "";
+      epoch = 0;
       async acquire(timeoutMs = 3e5, key = "") {
         const holdLimitMs = this.maxHoldMs;
         if (this.locked && Date.now() - this.lockedAt > holdLimitMs) {
@@ -2826,6 +2827,7 @@ var init_mutex = __esm({
           this.locked = false;
           this.lockedAt = 0;
           this.lockedByKey = "";
+          this.epoch++;
         }
         if (!this.locked) {
           this.locked = true;
@@ -2864,10 +2866,12 @@ var init_mutex = __esm({
         }
       }
       createRelease() {
+        const epoch = this.epoch;
         let released = false;
         return () => {
           if (released) return;
           released = true;
+          if (epoch !== this.epoch) return;
           this.release();
         };
       }
@@ -4016,6 +4020,49 @@ var init_waf_isolation = __esm({
   }
 });
 
+// src/utils/timezone.ts
+function formatAsciiTimezone(date = /* @__PURE__ */ new Date()) {
+  const dayName = DAYS[date.getDay()];
+  const monthName = MONTHS[date.getMonth()];
+  const day = String(date.getDate()).padStart(2, "0");
+  const year = date.getFullYear();
+  const hours = String(date.getHours()).padStart(2, "0");
+  const minutes = String(date.getMinutes()).padStart(2, "0");
+  const seconds = String(date.getSeconds()).padStart(2, "0");
+  const offsetMinutes = -date.getTimezoneOffset();
+  const sign = offsetMinutes >= 0 ? "+" : "-";
+  const absOffset = Math.abs(offsetMinutes);
+  const offsetHours = String(Math.floor(absOffset / 60)).padStart(2, "0");
+  const offsetMins = String(absOffset % 60).padStart(2, "0");
+  const tzOffset = `GMT${sign}${offsetHours}${offsetMins}`;
+  return `${dayName} ${monthName} ${day} ${year} ${hours}:${minutes}:${seconds} ${tzOffset}`;
+}
+function sanitizeHeaderForFetch(val) {
+  if (typeof val !== "string") return "";
+  return val.replace(/[^\x00-\xFF]/g, "");
+}
+var DAYS, MONTHS;
+var init_timezone = __esm({
+  "src/utils/timezone.ts"() {
+    "use strict";
+    DAYS = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+    MONTHS = [
+      "Jan",
+      "Feb",
+      "Mar",
+      "Apr",
+      "May",
+      "Jun",
+      "Jul",
+      "Aug",
+      "Sep",
+      "Oct",
+      "Nov",
+      "Dec"
+    ];
+  }
+});
+
 // src/services/qwen-headers.ts
 import { v4 as uuidv4 } from "uuid";
 function getSystemAcceptLanguage(customLocale) {
@@ -4059,8 +4106,8 @@ function buildQwenRequestHeaders(opts) {
     "bx-v": opts.bxV || "2.5.37",
     source: "web",
     version: opts.version || getQwenWebVersion(),
-    timezone: opts.extra?.timezone || opts.extra?.Timezone || (/* @__PURE__ */ new Date()).toString().split(" (")[0],
-    Timezone: opts.extra?.Timezone || opts.extra?.timezone || (/* @__PURE__ */ new Date()).toString().split(" (")[0],
+    timezone: opts.extra?.timezone || opts.extra?.Timezone || formatAsciiTimezone(),
+    Timezone: opts.extra?.Timezone || opts.extra?.timezone || formatAsciiTimezone(),
     // Use the real browser client-hints when captured (anti-hardcoded); fall
     // back to the static fingerprint otherwise.
     "sec-ch-ua": opts.secChUa || `"Google Chrome";v="${getChromeMajor()}", "Chromium";v="${getChromeMajor()}", "Not.A/Brand";v="99"`,
@@ -4087,6 +4134,7 @@ var init_qwen_headers = __esm({
     init_qwen_url();
     init_config();
     init_fingerprint();
+    init_timezone();
     dynamicWebVersion = null;
     QWEN_WEB_VERSION = config.qwen.webVersion;
     DEFAULT_QWEN_USER_AGENT = getDefaultQwenUserAgent(151);
@@ -4323,6 +4371,7 @@ __export(playwright_exports, {
   closeIdlePlaywrightAccounts: () => closeIdlePlaywrightAccounts,
   closePlaywrightForAccount: () => closePlaywrightForAccount,
   evictIdlePlaywrightContextsToLimit: () => evictIdlePlaywrightContextsToLimit,
+  getAccountMutex: () => getAccountMutex,
   getActivePlaywrightAccountIds: () => getActivePlaywrightAccountIds,
   getBasicHeaders: () => getBasicHeaders,
   getCookies: () => getCookies,
@@ -4472,9 +4521,10 @@ function getAccountMutex(accountId) {
 async function recoverStuckAccountMutex(accountId, mutex, key) {
   if (accountMutexes.get(accountId) !== mutex) return;
   const lockState = mutex.state();
-  if (lockState.heldForMs < PLAYWRIGHT_MUTEX_WAIT_MS || lockState.heldBy.startsWith("init:") || isAccountServingStream(accountId)) {
+  const minLockTimeout = Math.max(PLAYWRIGHT_MUTEX_WAIT_MS, config.timeouts.headers);
+  if (lockState.heldForMs < minLockTimeout || lockState.heldBy.startsWith("init:") || lockState.heldBy.startsWith("headers:") || lockState.heldBy.startsWith("refresh:") || lockState.heldBy.startsWith("profile-reset:") || isAccountServingStream(accountId)) {
     logger.warn(
-      `[Playwright] Skipping destructive mutex recovery | account=${accountId} | heldBy=${lockState.heldBy} | heldFor=${lockState.heldForMs}ms | limit=${PLAYWRIGHT_MUTEX_WAIT_MS}ms | servingStream=${isAccountServingStream(accountId)}`
+      `[Playwright] Skipping destructive mutex recovery | account=${accountId} | heldBy=${lockState.heldBy} | heldFor=${lockState.heldForMs}ms | limit=${minLockTimeout}ms | servingStream=${isAccountServingStream(accountId)}`
     );
     return;
   }
@@ -5276,7 +5326,8 @@ async function getBasicHeaders(accountId) {
   }
   const release = await acquireAccountMutex(
     accountId,
-    `headers:${accountId.substring(0, 12)}`
+    `headers:${accountId.substring(0, 12)}`,
+    Math.max(PLAYWRIGHT_MUTEX_WAIT_MS, config.timeouts.headers + 3e4)
   );
   try {
     touchAccountActivity(accountId);
@@ -5369,8 +5420,10 @@ async function getBasicHeaders(accountId) {
         return { cookie: cookie2, userAgent, bxV: bxV2, bxUa: bxUa2, bxUmidtoken: bxUmidtoken2, ...clientHints };
       }
     }
+    let refreshedInThisCall = false;
     if (headersAge > HEADER_CACHE_TTL && !cache3.refreshInProgress) {
       try {
+        refreshedInThisCall = true;
         await refreshHeadersInternal(accountId);
       } catch (error) {
         if (!hadUsableHeaders) throw error;
@@ -5439,7 +5492,7 @@ async function getBasicHeaders(accountId) {
       } catch {
       }
     }
-    if (!hasRequiredQwenHeaders(cache3.headers)) {
+    if (!hasRequiredQwenHeaders(cache3.headers) && !refreshedInThisCall) {
       console.log(
         `\u{1F504} [Playwright] Missing required anti-bot headers for ${accountId}, triggering header interception...`
       );
@@ -5718,6 +5771,22 @@ async function initPlaywrightForAccount(rawAccount, headless = config.playwright
               }
             }
           }
+          const currentCache = getHeaderCache(account.id);
+          const currentCookie = currentCache?.headers?.cookie || "";
+          if (currentCookie && isTokenExpiringSoon(currentCookie, 5)) {
+            try {
+              const refreshRes = await refreshAccountToken(account.id);
+              if (refreshRes.success) {
+                console.log(
+                  `\u26A1 [Playwright] Silently refreshed expired token restored from DB for ${maskEmail(account.email)}`
+                );
+              }
+            } catch (err) {
+              console.warn(
+                `\u26A0\uFE0F  [Playwright] Failed to proactively refresh expired token from DB for ${maskEmail(account.email)}: ${err?.message || err}`
+              );
+            }
+          }
           return;
         }
         const cookies = await acctContext.cookies();
@@ -6005,7 +6074,7 @@ async function startEmailOtpLogin(email, options = {}) {
         email: normalizedEmail,
         requestId,
         version: getQwenWebVersion() || "0.3.12",
-        timezone: (/* @__PURE__ */ new Date()).toString().split(" (")[0]
+        timezone: formatAsciiTimezone()
       }
     ).catch((err) => ({ ok: false, error: err?.message || String(err) }));
     if (!evalRes.ok || evalRes.data?.success !== true) {
@@ -6100,7 +6169,7 @@ async function verifyEmailOtpLogin(sessionId, code) {
       code: cleanCode,
       requestId,
       version: getQwenWebVersion() || "0.3.12",
-      timezone: (/* @__PURE__ */ new Date()).toString().split(" (")[0]
+      timezone: formatAsciiTimezone()
     }
   ).catch((err) => ({ ok: false, error: err?.message || String(err) }));
   if (!evalRes.ok || evalRes.data?.success !== true || !evalRes.data?.data) {
@@ -6381,7 +6450,7 @@ async function loginViaApi(page, email, password) {
     const signinUrl = "https://auth.qwen.ai/api/v2/auths/signin";
     const requestId = crypto5.randomUUID();
     const evalRes = await page.evaluate(
-      async ({ email: email2, password: password2, signinUrl: signinUrl2, requestId: requestId2 }) => {
+      async ({ email: email2, password: password2, signinUrl: signinUrl2, requestId: requestId2, tz }) => {
         try {
           const response = await fetch(signinUrl2, {
             method: "POST",
@@ -6393,7 +6462,7 @@ async function loginViaApi(page, email, password) {
               source: "web",
               version: "0.3.11",
               "x-request-origin": "https://chat.qwen.ai",
-              timezone: (/* @__PURE__ */ new Date()).toString().split(" (")[0],
+              timezone: tz,
               "x-request-id": requestId2
             },
             body: JSON.stringify({ email: email2, password: password2 })
@@ -6404,7 +6473,7 @@ async function loginViaApi(page, email, password) {
           return { ok: false, error: e.message };
         }
       },
-      { email, password: hashedPassword, signinUrl, requestId }
+      { email, password: hashedPassword, signinUrl, requestId, tz: formatAsciiTimezone() }
     ).catch(() => null);
     let data = evalRes?.data;
     let signinSuccess = Boolean(
@@ -6413,7 +6482,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 }) => {
+        async ({ email: email2, password: password2, fallbackUrl: fallbackUrl2, requestId: requestId2, tz }) => {
           try {
             const response = await fetch(fallbackUrl2, {
               method: "POST",
@@ -6424,7 +6493,7 @@ async function loginViaApi(page, email, password) {
                 "content-type": "application/json",
                 source: "web",
                 version: "0.3.11",
-                timezone: (/* @__PURE__ */ new Date()).toString().split(" (")[0],
+                timezone: tz,
                 "x-request-id": requestId2
               },
               body: JSON.stringify({ email: email2, password: password2 })
@@ -6435,7 +6504,7 @@ async function loginViaApi(page, email, password) {
             return { ok: false, error: e.message };
           }
         },
-        { email, password: hashedPassword, fallbackUrl, requestId }
+        { email, password: hashedPassword, fallbackUrl, requestId, tz: formatAsciiTimezone() }
       ).catch(() => null);
       if (fallbackRes?.data) {
         data = fallbackRes.data;
@@ -6767,7 +6836,7 @@ async function refreshAccountToken(accountId) {
   if (refreshToken) {
     try {
       const refreshResult = await page.evaluate(
-        async ({ rTok }) => {
+        async ({ rTok, tz }) => {
           try {
             const response = await fetch("https://auth.qwen.ai/api/v2/auths/refresh", {
               method: "GET",
@@ -6777,7 +6846,7 @@ async function refreshAccountToken(accountId) {
                 source: "web",
                 version: "0.3.11",
                 "x-request-origin": "https://chat.qwen.ai",
-                timezone: (/* @__PURE__ */ new Date()).toString().split(" (")[0],
+                timezone: tz,
                 authorization: `Bearer ${rTok}`
               }
             });
@@ -6787,7 +6856,7 @@ async function refreshAccountToken(accountId) {
             return { ok: false, error: e.message };
           }
         },
-        { rTok: refreshToken }
+        { rTok: refreshToken, tz: formatAsciiTimezone() }
       );
       const json = refreshResult?.data;
       if (json && json.success === true && json.data) {
@@ -6825,6 +6894,7 @@ async function refreshAccountToken(accountId) {
           const cache3 = getHeaderCache(accountId);
           cache3.headers.cookie = cookieStr;
           cache3.lastRefresh = Date.now();
+          cookieCaches.set(accountId, { cookie: cookieStr, timestamp: Date.now() });
           markAccountHeadersReady(accountId);
           saveAuthSession2(accountId, {
             cookie: cookieStr,
@@ -6859,6 +6929,7 @@ async function refreshAccountToken(accountId) {
         const cache3 = getHeaderCache(accountId);
         cache3.headers.cookie = cookieStr;
         cache3.lastRefresh = Date.now();
+        cookieCaches.set(accountId, { cookie: cookieStr, timestamp: Date.now() });
         markAccountHeadersReady(accountId);
         saveAuthSession2(accountId, {
           cookie: cookieStr,
@@ -7913,11 +7984,11 @@ async function keepAlivePlaywrightAccount(accountId) {
     const now = Date.now();
     const currentUrl = page.url();
     const lastRefreshAttempt = lastProactiveTokenRefresh.get(accountId) ?? 0;
-    const cookie = await getCookies(accountId);
+    const cookie = await getCookies(accountId, true);
     if (cookie && isTokenExpiringSoon(cookie, 5) && now - lastRefreshAttempt > 6e4) {
       lastProactiveTokenRefresh.set(accountId, now);
-      console.log(
-        `\u{1F493} [SessionKeeper] Account ${accountId} access token expiring soon (<5m); silently refreshing...`
+      logger.debug(
+        `[SessionKeeper] Account ${accountId} access token expiring soon (<5m); silently refreshing...`
       );
       const res = await refreshAccountToken(accountId);
       if (res.success) {
@@ -7925,6 +7996,9 @@ async function keepAlivePlaywrightAccount(accountId) {
         touchAccountActivity(accountId);
         return true;
       }
+      logger.warn(
+        `[SessionKeeper] Failed to silently refresh expiring token for ${accountId}: ${res.error || "unknown error"}`
+      );
     }
     const lastNavigation = lastKeepAliveNavigation.get(accountId) ?? 0;
     const shouldNavigate = !currentUrl.startsWith(qwenOrigin()) || now - lastNavigation > config.sessionKeeper.navigationIntervalMs;
@@ -8162,6 +8236,7 @@ var init_playwright = __esm({
     init_qwen_headers();
     init_paths();
     init_jwt();
+    init_timezone();
     requireLocal = createRequire(import.meta.url);
     contextInitHooks = [];
     ACCOUNT_MUTEX_MAX_HOLD_MS = 18e4;
@@ -8175,7 +8250,7 @@ var init_playwright = __esm({
     headerCaches = /* @__PURE__ */ new Map();
     HEADER_CACHE_TTL = 24 * 60 * 60 * 1e3;
     HEADER_REFRESH_THRESHOLD = 0.8;
-    COOKIE_CACHE_TTL = 15 * 60 * 1e3;
+    COOKIE_CACHE_TTL = 60 * 1e3;
     cookieCaches = /* @__PURE__ */ new Map();
     lastAccountActivity = /* @__PURE__ */ new Map();
     lastKeepAliveNavigation = /* @__PURE__ */ new Map();
@@ -9594,8 +9669,8 @@ function createUsageAccumulator(estimatedPromptTokens) {
 function applyUpstreamUsage(accumulator, candidate) {
   if (!candidate || typeof candidate !== "object") return;
   const usage = candidate;
-  const promptTokens = asFiniteNumber(usage.input_tokens);
-  const completionTokens = asFiniteNumber(usage.output_tokens);
+  const promptTokens = asFiniteNumber(usage.input_tokens) ?? asFiniteNumber(usage.prompt_tokens);
+  const completionTokens = asFiniteNumber(usage.output_tokens) ?? asFiniteNumber(usage.completion_tokens);
   const totalTokens = asFiniteNumber(usage.total_tokens);
   if (promptTokens !== null) {
     accumulator.promptTokens = promptTokens;
@@ -9825,7 +9900,7 @@ function isModelNotFoundError(err) {
 function isNetworkLikeError(err) {
   if (err instanceof QwenNetworkError) return true;
   const message = errMessage(err).toLowerCase();
-  return message === "network error" || message.includes("failed to fetch") || message.includes("fetch failed") || message.includes("network connection was lost") || message.includes("connection reset") || message.includes("connection closed") || message.includes("socket hang up") || message.includes("econnreset") || message.includes("econnrefused") || message.includes("etimedout");
+  return message === "network error" || message.includes("failed to fetch") || message.includes("fetch failed") || message.includes("network connection was lost") || message.includes("connection reset") || message.includes("connection closed") || message.includes("socket hang up") || message.includes("econnreset") || message.includes("econnrefused") || message.includes("etimedout") || message.includes("stream ended before response headers") || message.includes("timed out waiting for response headers");
 }
 function isCorruptedChatHistoryError(err) {
   const message = errMessage(err).toLowerCase();
@@ -11627,6 +11702,8 @@ __export(qwen_exports, {
   QwenUpstreamError: () => QwenUpstreamError,
   QwenUpstreamUnavailableError: () => QwenUpstreamUnavailableError,
   RetryableQwenStreamError: () => RetryableQwenStreamError,
+  STREAM_SLOT_MAX_HOLD_MS: () => STREAM_SLOT_MAX_HOLD_MS,
+  acquireAccountStreamLock: () => acquireAccountStreamLock,
   acquireNewQwenChatSession: () => acquireNewQwenChatSession,
   buildCapturedQwenHeaders: () => buildCapturedQwenHeaders,
   buildChatNewBody: () => buildChatNewBody,
@@ -11640,10 +11717,13 @@ __export(qwen_exports, {
   deleteAllQwenChats: () => deleteAllQwenChats,
   deleteSingleQwenChat: () => deleteSingleQwenChat,
   disableNativeTools: () => disableNativeTools,
+  ensureStaleSlotSweeperStarted: () => ensureStaleSlotSweeperStarted,
   fetchQwenModels: () => fetchQwenModels,
   fetchRemoteQwenChats: () => fetchRemoteQwenChats,
   flushLogicalThreadState: () => flushLogicalThreadState,
+  getAccountStreamMutex: () => getAccountStreamMutex,
   getAnyCachedQwenModels: () => getAnyCachedQwenModels,
+  getBrowserFetchHeaders: () => getBrowserFetchHeaders,
   getInFlightPersonalizationCount: () => getInFlightPersonalizationCount,
   getLogicalThreadState: () => getLogicalThreadState,
   getQwenErrorCode: () => getQwenErrorCode,
@@ -11659,6 +11739,8 @@ __export(qwen_exports, {
   requestQwenSettingsDirectFetch: () => requestQwenSettingsDirectFetch,
   requestQwenTextInBrowser: () => requestQwenTextInBrowser,
   setToolCapNotice: () => setToolCapNotice,
+  stopStaleSlotSweeperForTests: () => stopStaleSlotSweeperForTests,
+  sweepStaleAccountStreamSlots: () => sweepStaleAccountStreamSlots,
   syncQwenRequestPersonalization: () => syncQwenRequestPersonalization,
   updateLogicalThreadParent: () => updateLogicalThreadParent,
   updateLogicalThreadState: () => updateLogicalThreadState,
@@ -11945,7 +12027,7 @@ function buildCapturedQwenHeaders(headers, options = {}) {
 function getAccountStreamMutex(accountId) {
   let slots2 = accountStreamMutexes.get(accountId);
   if (!slots2) {
-    slots2 = { active: 0, queue: [] };
+    slots2 = { activeSlots: /* @__PURE__ */ new Map(), queue: [] };
     accountStreamMutexes.set(accountId, slots2);
   }
   return slots2;
@@ -11953,27 +12035,71 @@ function getAccountStreamMutex(accountId) {
 function streamSlotCapacity() {
   return Math.max(1, config.concurrency.maxStreamsPerAccount);
 }
-function createStreamSlotRelease(slots2) {
+function createStreamSlotRelease(slots2, slotId) {
   let released = false;
   return () => {
     if (released) return;
     released = true;
-    slots2.active -= 1;
+    slots2.activeSlots.delete(slotId);
     const next = slots2.queue.shift();
     if (next) {
-      slots2.active += 1;
-      next();
+      const nextId = nextStreamSlotId++;
+      slots2.activeSlots.set(nextId, Date.now());
+      next(createStreamSlotRelease(slots2, nextId));
     }
   };
 }
+function sweepStaleAccountStreamSlots(maxHoldMs = STREAM_SLOT_MAX_HOLD_MS) {
+  const now = Date.now();
+  let sweptCount = 0;
+  for (const [accountId, slots2] of accountStreamMutexes.entries()) {
+    for (const [slotId, startedAt] of Array.from(slots2.activeSlots.entries())) {
+      if (now - startedAt >= maxHoldMs) {
+        logger.warn(
+          `[Qwen] Force-releasing stale stream slot | account=${accountId} | slotId=${slotId} | heldFor=${now - startedAt}ms | maxHold=${maxHoldMs}ms`
+        );
+        slots2.activeSlots.delete(slotId);
+        sweptCount++;
+        const next = slots2.queue.shift();
+        if (next) {
+          const nextId = nextStreamSlotId++;
+          slots2.activeSlots.set(nextId, now);
+          next(createStreamSlotRelease(slots2, nextId));
+        }
+      }
+    }
+  }
+  return sweptCount;
+}
+function ensureStaleSlotSweeperStarted() {
+  if (staleSlotSweeperTimer) return;
+  staleSlotSweeperTimer = setInterval(() => {
+    try {
+      sweepStaleAccountStreamSlots();
+    } catch (err) {
+      logger.error("[Qwen] Error in stale stream slot sweeper", {
+        error: err instanceof Error ? err.message : String(err)
+      });
+    }
+  }, 6e4);
+  staleSlotSweeperTimer.unref();
+}
+function stopStaleSlotSweeperForTests() {
+  if (staleSlotSweeperTimer) {
+    clearInterval(staleSlotSweeperTimer);
+    staleSlotSweeperTimer = null;
+  }
+}
 async function acquireAccountStreamLock(accountId) {
+  ensureStaleSlotSweeperStarted();
   const slots2 = getAccountStreamMutex(accountId);
-  if (slots2.active < streamSlotCapacity()) {
-    slots2.active += 1;
-    return Promise.resolve(createStreamSlotRelease(slots2));
+  if (slots2.activeSlots.size < streamSlotCapacity()) {
+    const slotId = nextStreamSlotId++;
+    slots2.activeSlots.set(slotId, Date.now());
+    return Promise.resolve(createStreamSlotRelease(slots2, slotId));
   }
   return new Promise((resolve) => {
-    slots2.queue.push(() => resolve(createStreamSlotRelease(slots2)));
+    slots2.queue.push((releaseFn) => resolve(releaseFn));
   });
 }
 function buildQwenSettingsUpdatePayload(currentSettings, instruction) {
@@ -12047,7 +12173,7 @@ async function withQwenBrowserPage(accountId, fn, targetPath, operationTimeoutMs
       return fn(page);
     },
     operationTimeoutMs,
-    Math.min(config.timeouts.page, 3e4),
+    Math.max(6e4, operationTimeoutMs),
     recoverOnTimeout
   );
 }
@@ -12065,11 +12191,13 @@ function getBrowserFetchHeaders(headers) {
     "x-request-id",
     "x-accel-buffering"
   ]);
-  return Object.fromEntries(
-    Object.entries(headers).filter(
-      ([name]) => browserAllowedHeaders.has(name.toLowerCase())
-    )
-  );
+  const result = {};
+  for (const [name, value] of Object.entries(headers)) {
+    if (browserAllowedHeaders.has(name.toLowerCase())) {
+      result[name] = sanitizeHeaderForFetch(String(value ?? ""));
+    }
+  }
+  return result;
 }
 async function requestQwenTextInBrowser(accountId, method, path21, headers, body, options = {}) {
   const url = qwenUrl(path21);
@@ -12090,7 +12218,7 @@ async function requestQwenTextInBrowser(accountId, method, path21, headers, body
     browserHeaders["Content-Type"] = "application/json";
   }
   const evaluateRequest = (page) => page.evaluate(
-    async ({ url: url2, method: method2, headers: headers2, body: body2, referrer, timeoutMs }) => {
+    async ({ url: url2, method: method2, headers: headers2, body: body2, referrer, timeoutMs, tz }) => {
       const controller = new AbortController();
       const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
       try {
@@ -12114,7 +12242,7 @@ async function requestQwenTextInBrowser(accountId, method, path21, headers, body
                   source: "web",
                   version: "0.3.11",
                   "x-request-origin": "https://chat.qwen.ai",
-                  timezone: (/* @__PURE__ */ new Date()).toString().split(" (")[0],
+                  timezone: tz,
                   authorization: `Bearer ${rTok}`
                 },
                 signal: AbortSignal.timeout(5e3)
@@ -12159,7 +12287,8 @@ async function requestQwenTextInBrowser(accountId, method, path21, headers, body
       headers: browserHeaders,
       body,
       referrer: options.referrer,
-      timeoutMs: options.timeoutMs ?? Math.min(config.timeouts.page, 2e4)
+      timeoutMs: options.timeoutMs ?? Math.min(config.timeouts.page, 2e4),
+      tz: formatAsciiTimezone()
     }
   );
   const recoverOnTimeout = !options.noMutexRecovery;
@@ -12837,7 +12966,7 @@ async function disableNativeTools(accountId) {
           async (page) => {
             const requestId = crypto7.randomUUID();
             const response = await page.evaluate(
-              async ({ payload: payload2, timeoutMs, requestId: requestId2 }) => {
+              async ({ payload: payload2, timeoutMs, requestId: requestId2, tz }) => {
                 const controller = new AbortController();
                 const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
                 try {
@@ -12849,7 +12978,7 @@ async function disableNativeTools(accountId) {
                         accept: "application/json, text/plain, */*",
                         "content-type": "application/json",
                         "x-request-id": requestId2,
-                        timezone: (/* @__PURE__ */ new Date()).toString().split(" (")[0],
+                        timezone: tz,
                         source: "web"
                       },
                       body: JSON.stringify(payload2),
@@ -12861,7 +12990,7 @@ async function disableNativeTools(accountId) {
                   clearTimeout(timeoutId);
                 }
               },
-              { payload, timeoutMs: config.timeouts.http, requestId }
+              { payload, timeoutMs: config.timeouts.http, requestId, tz: formatAsciiTimezone() }
             );
             return response;
           }
@@ -13078,7 +13207,7 @@ async function deleteSingleQwenChat(accountId, chatId) {
   const requestHeaders = {
     source: "web",
     version: "0.2.89",
-    timezone: (/* @__PURE__ */ new Date()).toString().split(" (")[0],
+    timezone: formatAsciiTimezone(),
     "x-request-id": crypto7.randomUUID(),
     Referer: qwenUrl(`/c/${encodeURIComponent(chatId)}`)
   };
@@ -13122,7 +13251,7 @@ async function fetchRemoteQwenChats(accountId) {
   }
   const requestHeaders = {
     version: "0.2.89",
-    timezone: (/* @__PURE__ */ new Date()).toString().split(" (")[0],
+    timezone: formatAsciiTimezone(),
     "x-request-id": crypto7.randomUUID(),
     Referer: qwenUrl("/settings/chats")
   };
@@ -13174,7 +13303,7 @@ async function fetchQwenModels(accountId) {
         async (page) => {
           const requestId = crypto7.randomUUID();
           const response2 = await page.evaluate(
-            async ({ timeoutMs, requestId: requestId2 }) => {
+            async ({ timeoutMs, requestId: requestId2, tz }) => {
               const controller = new AbortController();
               const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
               try {
@@ -13183,7 +13312,7 @@ async function fetchQwenModels(accountId) {
                   headers: {
                     accept: "application/json, text/plain, */*",
                     "x-request-id": requestId2,
-                    timezone: (/* @__PURE__ */ new Date()).toString().split(" (")[0],
+                    timezone: tz,
                     source: "web"
                   },
                   signal: controller.signal
@@ -13193,7 +13322,7 @@ async function fetchQwenModels(accountId) {
                 clearTimeout(timeoutId);
               }
             },
-            { timeoutMs: config.timeouts.http, requestId }
+            { timeoutMs: config.timeouts.http, requestId, tz: formatAsciiTimezone() }
           );
           return response2;
         }
@@ -13232,7 +13361,7 @@ async function fetchQwenModels(accountId) {
       bxUa,
       bxUmidtoken,
       extra: {
-        timezone: (/* @__PURE__ */ new Date()).toString()
+        timezone: formatAsciiTimezone()
       }
     }),
     void 0,
@@ -13995,7 +14124,7 @@ async function createQwenStreamInternal(prompt, enableThinking, modelId, forcedP
     clearTimeout(timeoutId);
   }
 }
-var sleep5, BROWSER_STREAM_BINDING, BROWSER_ABORTERS_KEY, BROWSER_STREAM_FLUSH_BYTES, BROWSER_STREAM_FLUSH_MS, METADATA_TIMEOUT_PER_PAYLOAD_MB_MS, POST_CAPTCHA_METADATA_GRACE_MS, browserStreamStates, browserStreamBindingPages, browserStreamBindingContexts, MODEL_CACHE_TTL_MS, modelsCache, nativeToolsDisabled, disablingNativeToolsInProgress, lastSyncedPersonalizationHashes, directSettingsFetchConsecutiveFailures, DIRECT_SETTINGS_FETCH_BLOCK_THRESHOLD, directSettingsFetchBlocked, DIRECT_SETTINGS_FETCH_TIMEOUT_MS, activePersonalizationByAccount, accountStreamMutexes, QWEN_SAFE_SETTINGS_PATCH, QWEN_SAFE_SETTINGS_HASH, inFlightPersonalizationSyncs, DISABLE_TOOLS_MAX_RETRIES, DISABLE_TOOLS_BACKOFF_MS, UPSTREAM_RESPONSE_PREVIEW_BYTES;
+var sleep5, BROWSER_STREAM_BINDING, BROWSER_ABORTERS_KEY, BROWSER_STREAM_FLUSH_BYTES, BROWSER_STREAM_FLUSH_MS, METADATA_TIMEOUT_PER_PAYLOAD_MB_MS, POST_CAPTCHA_METADATA_GRACE_MS, browserStreamStates, browserStreamBindingPages, browserStreamBindingContexts, MODEL_CACHE_TTL_MS, modelsCache, nativeToolsDisabled, disablingNativeToolsInProgress, lastSyncedPersonalizationHashes, directSettingsFetchConsecutiveFailures, DIRECT_SETTINGS_FETCH_BLOCK_THRESHOLD, directSettingsFetchBlocked, DIRECT_SETTINGS_FETCH_TIMEOUT_MS, activePersonalizationByAccount, STREAM_SLOT_MAX_HOLD_MS, accountStreamMutexes, nextStreamSlotId, staleSlotSweeperTimer, QWEN_SAFE_SETTINGS_PATCH, QWEN_SAFE_SETTINGS_HASH, inFlightPersonalizationSyncs, DISABLE_TOOLS_MAX_RETRIES, DISABLE_TOOLS_BACKOFF_MS, UPSTREAM_RESPONSE_PREVIEW_BYTES;
 var init_qwen = __esm({
   "src/services/qwen.ts"() {
     "use strict";
@@ -14013,6 +14142,7 @@ var init_qwen = __esm({
     init_captcha_coordinator();
     init_captcha_solver();
     init_account_concurrency();
+    init_timezone();
     init_qwen_errors();
     init_qwen_thread_state();
     init_qwen_chat_pool();
@@ -14042,7 +14172,10 @@ var init_qwen = __esm({
     directSettingsFetchBlocked = /* @__PURE__ */ new Set();
     DIRECT_SETTINGS_FETCH_TIMEOUT_MS = 1e4;
     activePersonalizationByAccount = /* @__PURE__ */ new Map();
+    STREAM_SLOT_MAX_HOLD_MS = 30 * 60 * 1e3;
     accountStreamMutexes = /* @__PURE__ */ new Map();
+    nextStreamSlotId = 1;
+    staleSlotSweeperTimer = null;
     QWEN_SAFE_SETTINGS_PATCH = {
       ui: {
         autoTags: false,
@@ -16772,7 +16905,7 @@ function buildContextMeterSnapshot(input, options = getContextMeterOptions()) {
 function enrichUsageWithContextMeter(usage, snapshot, options = getContextMeterOptions()) {
   if (!snapshot || !options.enabled) return usage;
   const upstreamPromptTokens = Number.isFinite(usage.prompt_tokens) && usage.prompt_tokens > 0 ? usage.prompt_tokens : null;
-  const reportedPromptTokens = options.reportUsage ? upstreamPromptTokens ?? snapshot.estimatedContextTokens : usage.prompt_tokens;
+  const reportedPromptTokens = options.reportUsage ? upstreamPromptTokens ?? usage.prompt_tokens : usage.prompt_tokens;
   const contextMeter = {
     ...snapshot,
     upstreamPromptTokens,
@@ -20400,6 +20533,35 @@ var init_parser = __esm({
   }
 });
 
+// src/tools/tool-call-heuristics.ts
+function isToolHesitationText(text) {
+  if (!text) return false;
+  return /\btools?\b[^.\n]{0,24}?\b(?:does\s*n[o']?t|do\s*n[o']?t|does\s*not|do\s*not)\b[^.\n]{0,12}?\bexist/i.test(
+    text
+  );
+}
+function decideMissingToolCallRetry(input) {
+  const {
+    declaredToolCount,
+    successfulToolCallCount,
+    malformedToolCallCount,
+    emittedToolCallCount,
+    text
+  } = input;
+  if (declaredToolCount <= 0) return { retry: false, reason: null };
+  if (successfulToolCallCount > 0) return { retry: false, reason: null };
+  if (malformedToolCallCount > 0) return { retry: true, reason: "malformed" };
+  if (emittedToolCallCount === 0 && isToolHesitationText(text)) {
+    return { retry: true, reason: "no_call" };
+  }
+  return { retry: false, reason: null };
+}
+var init_tool_call_heuristics = __esm({
+  "src/tools/tool-call-heuristics.ts"() {
+    "use strict";
+  }
+});
+
 // src/routes/chat/errors.ts
 function isWafChallenge(value) {
   const normalized = value.toLowerCase();
@@ -21099,10 +21261,17 @@ async function processNonStreamingResponse(params) {
       message.tool_calls = toolCallsOut;
     }
     const finishReason = toolCallsOut.length ? "tool_calls" : "stop";
-    const allToolsFailed = toolParser && toolParser.getMalformedToolCalls().length > 0 && toolCallsOut.length === 0;
+    const retryDecision = toolParser ? decideMissingToolCallRetry({
+      declaredToolCount: declaredTools.length,
+      successfulToolCallCount: toolParser.getSuccessfulToolCallCount(),
+      malformedToolCallCount: toolParser.getMalformedToolCalls().length,
+      emittedToolCallCount: toolParser.getEmittedToolCallCount(),
+      text: finalContent
+    }) : { retry: false, reason: null };
+    const allToolsFailed = retryDecision.retry;
     const malformedRetryCount = midStreamRetry?.malformedRetryCount ?? 0;
     if (allToolsFailed && config.retry.autoRetryMalformedTools !== false && midStreamRetry && malformedRetryCount < config.retry.autoRetryMalformedToolsMax) {
-      const malformedCalls = toolParser.getMalformedToolCalls();
+      const malformedCalls = toolParser?.getMalformedToolCalls() ?? [];
       const malformedCount = malformedCalls.length;
       const undeclaredNames = malformedCalls.flatMap((mc) => mc.undeclaredNames || []).filter((name, index, self) => self.indexOf(name) === index);
       const availableToolNames = declaredTools.map((t) => t.type === "function" ? t.function?.name : t.name).filter((n) => !!n);
@@ -21110,7 +21279,9 @@ async function processNonStreamingResponse(params) {
 
 Available tools: ${availableToolNames.join(", ")}` : "";
       let errorMessage;
-      if (undeclaredNames.length > 0) {
+      if (retryDecision.reason === "no_call") {
+        errorMessage = `You did not emit any tool call. Respond with a single tool-call block using one of the declared tools.${toolsHint}`;
+      } else if (undeclaredNames.length > 0) {
         errorMessage = `Your previous ${malformedCount} tool call(s) used undeclared tool names: ${undeclaredNames.join(", ")}. Only declared tools can be executed. Please retry with valid tool names.${toolsHint}`;
       } else {
         const previews = malformedCalls.slice(0, 3).map((mc) => mc.contentPreview?.substring(0, 100) || "(empty)").join("\n  - ");
@@ -21186,7 +21357,7 @@ Please retry your tool call(s) with correct JSON and valid tool names from the a
           new Error("client aborted during malformed-tool retry")
         );
       }
-      console.log(`\u{1F504} [Chat] Auto-retry (${malformedRetryCount + 1}/${config.retry.autoRetryMalformedToolsMax}) | ${newStreamResult.activeAccountLabel} | ${body.model} | chat=${newStreamResult.uiSessionId.substring(0, 12)} | reason=malformed_tool_calls`);
+      console.log(`\u{1F504} [Chat] Auto-retry (${malformedRetryCount + 1}/${config.retry.autoRetryMalformedToolsMax}) | ${newStreamResult.activeAccountLabel} | ${body.model} | chat=${newStreamResult.uiSessionId.substring(0, 12)} | reason=${retryDecision.reason === "no_call" ? "missing_tool_call" : "malformed_tool_calls"}`);
       return processNonStreamingResponse({
         ...params,
         stream: newStreamResult.stream,
@@ -22282,7 +22453,14 @@ async function processStreamingResponse(params) {
         let activeRetryStream = null;
         while (malformedRetryCount < maxMalformedRetries) {
           if (!toolParser) break;
-          const allToolsFailed = toolParser.getMalformedToolCalls().length > 0 && toolParser.getSuccessfulToolCallCount() === 0;
+          const retryDecision = decideMissingToolCallRetry({
+            declaredToolCount: declaredTools.length,
+            successfulToolCallCount: toolParser.getSuccessfulToolCallCount(),
+            malformedToolCallCount: toolParser.getMalformedToolCalls().length,
+            emittedToolCallCount: toolParser.getEmittedToolCallCount(),
+            text: finalContent
+          });
+          const allToolsFailed = retryDecision.retry;
           if (!allToolsFailed) break;
           const malformedCalls = toolParser.getMalformedToolCalls();
           const malformedCount = malformedCalls.length;
@@ -22292,7 +22470,9 @@ async function processStreamingResponse(params) {
 
 Available tools: ${availableToolNames.join(", ")}` : "";
           let errorMessage;
-          if (undeclaredNames.length > 0) {
+          if (retryDecision.reason === "no_call") {
+            errorMessage = `You did not emit any tool call. Respond with a single tool-call block using one of the declared tools.${toolsHint}`;
+          } else if (undeclaredNames.length > 0) {
             errorMessage = `Your previous ${malformedCount} tool call(s) used undeclared tool names: ${undeclaredNames.join(", ")}. Only declared tools can be executed. Please retry with valid tool names.${toolsHint}`;
           } else {
             const previews = malformedCalls.slice(0, 3).map((mc) => mc.contentPreview?.substring(0, 100) || "(empty)").join("\n  - ");
@@ -22369,7 +22549,7 @@ Please retry your tool call(s) with correct JSON and valid tool names from the a
             break;
           }
           console.log(
-            `\u{1F504} [Chat] Auto-retry (${malformedRetryCount + 1}/${maxMalformedRetries}) | ${newStreamResult.activeAccountLabel} | ${body.model} | chat=${newStreamResult.uiSessionId.substring(0, 12)} | reason=malformed_tool_calls`
+            `\u{1F504} [Chat] Auto-retry (${malformedRetryCount + 1}/${maxMalformedRetries}) | ${newStreamResult.activeAccountLabel} | ${body.model} | chat=${newStreamResult.uiSessionId.substring(0, 12)} | reason=${retryDecision.reason === "no_call" ? "missing_tool_call" : "malformed_tool_calls"}`
           );
           const retryEntry = getStream(newStreamResult.completionId);
           removeStream(newStreamResult.completionId);
@@ -22870,6 +23050,7 @@ var init_streaming = __esm({
     init_retry_policy();
     init_account();
     init_parser();
+    init_tool_call_heuristics();
     init_stream_registry();
     init_metrics();
     init_logger();
@@ -24278,7 +24459,7 @@ function chatCompletionsToResponses(chatRes, requestModel, originalRequest) {
       cached_tokens: chatRes.usage.prompt_tokens_details?.cached_tokens ?? 0
     },
     output_tokens_details: {
-      reasoning_tokens: chatRes.usage.completion_tokens_details?.reasoning_tokens ?? 0
+      reasoning_tokens: chatRes.usage.completion_tokens_details?.reasoning_tokens ?? chatRes.usage.output_tokens_details?.reasoning_tokens ?? 0
     },
     ...chatRes.usage.context_meter ? { context_meter: chatRes.usage.context_meter } : {}
   };
@@ -25739,7 +25920,7 @@ function translateOpenAIToAnthropic(openaiResponse, requestModel) {
     content_filter: "end_turn"
   };
   const hasToolUse = content.some((b) => b.type === "tool_use");
-  const stopReason = hasToolUse ? "tool_use" : stopReasonMap[choice.finish_reason || "stop"] || "end_turn";
+  const stopReason = choice.finish_reason === "length" ? "max_tokens" : choice.finish_reason === "content_filter" ? "end_turn" : hasToolUse ? "tool_use" : stopReasonMap[choice.finish_reason || "stop"] || "end_turn";
   return {
     id: generateMessageId2(),
     type: "message",
@@ -25877,7 +26058,7 @@ function translateStreamChunk(chunk, state) {
       state.contentBlockIndex++;
       state.currentBlockType = null;
     }
-    const stopReason = state.hasEmittedToolUse ? "tool_use" : choice.finish_reason === "length" ? "max_tokens" : "end_turn";
+    const stopReason = choice.finish_reason === "length" ? "max_tokens" : choice.finish_reason === "content_filter" ? "end_turn" : state.hasEmittedToolUse ? "tool_use" : "end_turn";
     events.push(
       JSON.stringify({
         type: "message_delta",
@@ -26823,7 +27004,7 @@ function getAppVersion() {
     }
   } catch {
   }
-  cachedVersion = "v1.6.3";
+  cachedVersion = "v1.6.5";
   return cachedVersion;
 }
 var cachedVersion;