qwenproxy-cli 1.6.4 → 1.6.5

package/dist/login.js

@@ -1892,6 +1892,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) {
@@ -1902,6 +1903,7 @@ var init_mutex = __esm({
           this.locked = false;
           this.lockedAt = 0;
           this.lockedByKey = "";
+          this.epoch++;
         }
         if (!this.locked) {
           this.locked = true;
@@ -1940,10 +1942,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();
         };
       }
@@ -2934,6 +2938,45 @@ 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}`;
+}
+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 getDefaultQwenUserAgent(major = getChromeMajor()) {
@@ -2954,6 +2997,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);
@@ -4590,6 +4634,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();
@@ -4877,7 +4937,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) {
@@ -4972,7 +5032,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) {
@@ -5253,7 +5313,7 @@ async function loginViaApi(page, email, password) {
     const signinUrl = "https://auth.qwen.ai/api/v2/auths/signin";
     const requestId = crypto3.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",
@@ -5265,7 +5325,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 })
@@ -5276,7 +5336,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(
@@ -5285,7 +5345,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",
@@ -5296,7 +5356,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 })
@@ -5307,7 +5367,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;
@@ -5639,7 +5699,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",
@@ -5649,7 +5709,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}`
               }
             });
@@ -5659,7 +5719,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) {
@@ -5697,6 +5757,7 @@ async function refreshAccountToken(accountId) {
           const cache = getHeaderCache(accountId);
           cache.headers.cookie = cookieStr;
           cache.lastRefresh = Date.now();
+          cookieCaches.set(accountId, { cookie: cookieStr, timestamp: Date.now() });
           markAccountHeadersReady(accountId);
           saveAuthSession2(accountId, {
             cookie: cookieStr,
@@ -5731,6 +5792,7 @@ async function refreshAccountToken(accountId) {
         const cache = getHeaderCache(accountId);
         cache.headers.cookie = cookieStr;
         cache.lastRefresh = Date.now();
+        cookieCaches.set(accountId, { cookie: cookieStr, timestamp: Date.now() });
         markAccountHeadersReady(accountId);
         saveAuthSession2(accountId, {
           cookie: cookieStr,
@@ -6785,11 +6847,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) {
@@ -6797,6 +6859,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;
@@ -7034,6 +7099,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;
@@ -7047,7 +7113,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();

package/dist/reset-cooldowns.js

@@ -2001,6 +2001,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) {
@@ -2011,6 +2012,7 @@ var init_mutex = __esm({
           this.locked = false;
           this.lockedAt = 0;
           this.lockedByKey = "";
+          this.epoch++;
         }
         if (!this.locked) {
           this.locked = true;
@@ -2049,10 +2051,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();
         };
       }
@@ -2715,6 +2719,45 @@ 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}`;
+}
+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 getDefaultQwenUserAgent(major = getChromeMajor()) {
@@ -2732,6 +2775,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);
@@ -4021,6 +4065,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();
@@ -4278,7 +4338,7 @@ async function loginViaApi(page, email, password) {
     const signinUrl = "https://auth.qwen.ai/api/v2/auths/signin";
     const requestId = crypto3.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",
@@ -4290,7 +4350,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 })
@@ -4301,7 +4361,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(
@@ -4310,7 +4370,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",
@@ -4321,7 +4381,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 })
@@ -4332,7 +4392,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;
@@ -4664,7 +4724,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",
@@ -4674,7 +4734,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}`
               }
             });
@@ -4684,7 +4744,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) {
@@ -4722,6 +4782,7 @@ async function refreshAccountToken(accountId) {
           const cache = getHeaderCache(accountId);
           cache.headers.cookie = cookieStr;
           cache.lastRefresh = Date.now();
+          cookieCaches.set(accountId, { cookie: cookieStr, timestamp: Date.now() });
           markAccountHeadersReady(accountId);
           saveAuthSession2(accountId, {
             cookie: cookieStr,
@@ -4756,6 +4817,7 @@ async function refreshAccountToken(accountId) {
         const cache = getHeaderCache(accountId);
         cache.headers.cookie = cookieStr;
         cache.lastRefresh = Date.now();
+        cookieCaches.set(accountId, { cookie: cookieStr, timestamp: Date.now() });
         markAccountHeadersReady(accountId);
         saveAuthSession2(accountId, {
           cookie: cookieStr,
@@ -5636,6 +5698,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;
@@ -5645,7 +5708,7 @@ var init_playwright = __esm({
     inFlightAccountInits = /* @__PURE__ */ new Map();
     headerCaches = /* @__PURE__ */ new Map();
     HEADER_CACHE_TTL = 24 * 60 * 60 * 1e3;
-    COOKIE_CACHE_TTL = 15 * 60 * 1e3;
+    COOKIE_CACHE_TTL = 60 * 1e3;
     cookieCaches = /* @__PURE__ */ new Map();
     lastAccountActivity = /* @__PURE__ */ new Map();
     lastKeepAliveNavigation = /* @__PURE__ */ new Map();
@@ -5927,7 +5990,7 @@ function clearPersonalizationDbCache(accountId) {
     return 0;
   }
 }
-var BROWSER_STREAM_BINDING, browserStreamStates, browserStreamBindingContexts, MODEL_CACHE_TTL_MS, lastSyncedPersonalizationHashes, activePersonalizationByAccount, QWEN_SAFE_SETTINGS_PATCH, QWEN_SAFE_SETTINGS_HASH, UPSTREAM_RESPONSE_PREVIEW_BYTES;
+var BROWSER_STREAM_BINDING, browserStreamStates, browserStreamBindingContexts, MODEL_CACHE_TTL_MS, lastSyncedPersonalizationHashes, activePersonalizationByAccount, STREAM_SLOT_MAX_HOLD_MS, QWEN_SAFE_SETTINGS_PATCH, QWEN_SAFE_SETTINGS_HASH, UPSTREAM_RESPONSE_PREVIEW_BYTES;
 var init_qwen = __esm({
   "src/services/qwen.ts"() {
     "use strict";
@@ -5945,6 +6008,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();
@@ -5960,6 +6024,7 @@ var init_qwen = __esm({
     MODEL_CACHE_TTL_MS = 60 * 60 * 1e3;
     lastSyncedPersonalizationHashes = /* @__PURE__ */ new Map();
     activePersonalizationByAccount = /* @__PURE__ */ new Map();
+    STREAM_SLOT_MAX_HOLD_MS = 30 * 60 * 1e3;
     QWEN_SAFE_SETTINGS_PATCH = {
       ui: {
         autoTags: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qwenproxy-cli",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "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": {

package/src/core/mutex.ts

@@ -14,6 +14,7 @@ export class Mutex {
   private locked = false;
   private lockedAt = 0;
   private lockedByKey = "";
+  private epoch = 0;
 
   constructor(
     public readonly name: string = "unnamed",
@@ -35,6 +36,7 @@ export class Mutex {
       this.locked = false;
       this.lockedAt = 0;
       this.lockedByKey = "";
+      this.epoch++;
     }
 
     if (!this.locked) {
@@ -78,10 +80,12 @@ export class Mutex {
   }
 
   private createRelease(): () => void {
+    const epoch = this.epoch;
     let released = false;
     return () => {
       if (released) return;
       released = true;
+      if (epoch !== this.epoch) return;
       this.release();
     };
   }

package/src/core/version.ts

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

package/src/routes/anthropic/translate.ts

@@ -316,9 +316,14 @@ export function translateOpenAIToAnthropic(
   };
 
   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: generateMessageId(),
@@ -498,11 +503,14 @@ export function translateStreamChunk(
       state.currentBlockType = null;
     }
 
-    const stopReason = state.hasEmittedToolUse
-      ? "tool_use"
-      : choice.finish_reason === "length"
+    const stopReason =
+      choice.finish_reason === "length"
         ? "max_tokens"
-        : "end_turn";
+        : choice.finish_reason === "content_filter"
+          ? "end_turn"
+          : state.hasEmittedToolUse
+            ? "tool_use"
+            : "end_turn";
 
     events.push(
       JSON.stringify({

package/src/routes/chat/helpers.ts

@@ -231,8 +231,10 @@ export function applyUpstreamUsage(
   if (!candidate || typeof candidate !== "object") return;
 
   const usage = candidate as Record<string, unknown>;
-  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) {