Merge branch 'feat/window-counters'

CHANGELOG.md

@@ -8,6 +8,8 @@
 
 ### Added
 
+- 每窗口使用量计数器：Dashboard 主显示当前窗口内的请求数和 Token 用量，累计总量降为次要灰色小字；窗口过期时自动归零（时间驱动，零 API 开销），后端同步作为双保险校正
+- 窗口时长显示：从后端同步 `limit_window_seconds`，AccountCard header 显示窗口时长 badge（如 `3h`），重置时间行追加窗口时长文字
 - Dashboard 账号列表新增手动刷新按钮：点击重新拉取额度数据，刷新中按钮旋转并禁用；独立 `refreshing` 状态确保刷新时列表不清空；标题行右侧显示"更新于 HH:MM:SS"时间戳（桌面端可见）
 - 空响应计数器：每个账号追踪 `empty_response_count`，通过 `GET /auth/accounts` 可查看，窗口重置时自动归零
 - 空响应日志增强：日志中显示账号邮箱（`Account xxxx (email) | Empty response`），便于定位问题账号
@@ -31,6 +33,7 @@
 
 ### Fixed
 
+- 额度窗口刷新后 Dashboard 仍显示累计 Token：本地计数器从未按窗口重置，现在 `refreshStatus()` 每次 acquire/getAccounts 时检查 `window_reset_at`，过期自动归零窗口计数器
 - 空响应重试循环中账号双重释放：外层 catch 使用原始 `entryId` 而非当前活跃账号，导致换号重试失败时 double-release（`proxy-handler.ts`）
 - `apply-update.ts` 模型比较不再误报删除：静态提取只含 2 个硬编码模型，与 YAML 的 24 个比较会产生 22 个假删除，现在只报新增
 - `update-checker.ts` 子进程超时保护：`fork()` 添加 5 分钟 kill timer，防止挂起导致 `_updateInProgress` 永久锁定

src/auth/account-pool.ts

@@ -128,6 +128,12 @@ export class AccountPool {
       entry.usage.input_tokens += usage.input_tokens ?? 0;
       entry.usage.output_tokens += usage.output_tokens ?? 0;
     }
+    // Increment window counters
+    entry.usage.window_request_count = (entry.usage.window_request_count ?? 0) + 1;
+    if (usage) {
+      entry.usage.window_input_tokens = (entry.usage.window_input_tokens ?? 0) + (usage.input_tokens ?? 0);
+      entry.usage.window_output_tokens = (entry.usage.window_output_tokens ?? 0) + (usage.output_tokens ?? 0);
+    }
     this.schedulePersist();
   }
 
@@ -156,6 +162,7 @@ export class AccountPool {
     if (options?.countRequest) {
       entry.usage.request_count++;
       entry.usage.last_used = new Date().toISOString();
+      entry.usage.window_request_count = (entry.usage.window_request_count ?? 0) + 1;
     }
 
     this.schedulePersist();
@@ -206,6 +213,11 @@ export class AccountPool {
         empty_response_count: 0,
         last_used: null,
         rate_limit_until: null,
+        window_request_count: 0,
+        window_input_tokens: 0,
+        window_output_tokens: 0,
+        window_counters_reset_at: null,
+        limit_window_seconds: null,
       },
       addedAt: new Date().toISOString(),
     };
@@ -269,6 +281,11 @@ export class AccountPool {
       last_used: null,
       rate_limit_until: null,
       window_reset_at: entry.usage.window_reset_at ?? null,
+      window_request_count: 0,
+      window_input_tokens: 0,
+      window_output_tokens: 0,
+      window_counters_reset_at: new Date().toISOString(),
+      limit_window_seconds: entry.usage.limit_window_seconds ?? null,
     };
     this.schedulePersist();
     return true;
@@ -279,16 +296,27 @@ export class AccountPool {
    * If so, auto-reset local usage counters to stay in sync.
    * Called after fetching quota from OpenAI API.
    */
-  syncRateLimitWindow(entryId: string, newResetAt: number | null): void {
+  syncRateLimitWindow(
+    entryId: string,
+    newResetAt: number | null,
+    limitWindowSeconds: number | null,
+  ): void {
     if (newResetAt == null) return;
     const entry = this.accounts.get(entryId);
     if (!entry) return;
 
     const oldResetAt = entry.usage.window_reset_at;
     if (oldResetAt != null && oldResetAt !== newResetAt) {
-      console.log(`[AccountPool] Rate limit window rolled for ${entryId} (${entry.email ?? "?"}), updating window timestamp`);
+      console.log(`[AccountPool] Rate limit window rolled for ${entryId} (${entry.email ?? "?"}), resetting window counters`);
+      entry.usage.window_request_count = 0;
+      entry.usage.window_input_tokens = 0;
+      entry.usage.window_output_tokens = 0;
+      entry.usage.window_counters_reset_at = new Date().toISOString();
     }
     entry.usage.window_reset_at = newResetAt;
+    if (limitWindowSeconds != null) {
+      entry.usage.limit_window_seconds = limitWindowSeconds;
+    }
     this.schedulePersist();
   }
 
@@ -399,6 +427,27 @@ export class AccountPool {
     if (entry.status === "active" && isTokenExpired(entry.token)) {
       entry.status = "expired";
     }
+
+    // Auto-reset window counters when window has expired
+    const windowResetAt = entry.usage.window_reset_at;
+    const nowSec = now.getTime() / 1000;
+    if (windowResetAt != null && nowSec >= windowResetAt) {
+      console.log(`[AccountPool] Window expired for ${entry.id} (${entry.email ?? "?"}), resetting window counters`);
+      entry.usage.window_request_count = 0;
+      entry.usage.window_input_tokens = 0;
+      entry.usage.window_output_tokens = 0;
+      entry.usage.window_counters_reset_at = now.toISOString();
+      // Jump to the correct current window (handles multi-window catch-up in one step)
+      const windowSec = entry.usage.limit_window_seconds;
+      if (windowSec && windowSec > 0) {
+        let nextReset = windowResetAt + windowSec;
+        while (nextReset <= nowSec) nextReset += windowSec;
+        entry.usage.window_reset_at = nextReset;
+      } else {
+        entry.usage.window_reset_at = null; // Wait for backend sync to correct
+      }
+      this.schedulePersist();
+    }
   }
 
   private toInfo(entry: AccountEntry): AccountInfo {
@@ -477,6 +526,15 @@ export class AccountPool {
               entry.usage.empty_response_count = 0;
               needsPersist = true;
             }
+            // Backfill window counter fields for old entries
+            if (entry.usage.window_request_count == null) {
+              entry.usage.window_request_count = 0;
+              entry.usage.window_input_tokens = 0;
+              entry.usage.window_output_tokens = 0;
+              entry.usage.window_counters_reset_at = null;
+              entry.usage.limit_window_seconds = null;
+              needsPersist = true;
+            }
             this.accounts.set(entry.id, entry);
           }
         }
@@ -519,6 +577,11 @@ export class AccountPool {
           empty_response_count: 0,
           last_used: null,
           rate_limit_until: null,
+          window_request_count: 0,
+          window_input_tokens: 0,
+          window_output_tokens: 0,
+          window_counters_reset_at: null,
+          limit_window_seconds: null,
         },
         addedAt: new Date().toISOString(),
       };

src/auth/types.ts

@@ -18,6 +18,16 @@ export interface AccountUsage {
   rate_limit_until: string | null;
   /** Tracks the current rate limit window end (Unix seconds). When window rolls over, counters reset. */
   window_reset_at?: number | null;
+  /** Per-window request count (resets when window expires). */
+  window_request_count?: number;
+  /** Per-window input tokens (resets when window expires). */
+  window_input_tokens?: number;
+  /** Per-window output tokens (resets when window expires). */
+  window_output_tokens?: number;
+  /** ISO timestamp of when window counters were last reset. */
+  window_counters_reset_at?: string | null;
+  /** Window duration in seconds, synced from backend, used for local window estimation. */
+  limit_window_seconds?: number | null;
 }
 
 export interface AccountEntry {
@@ -54,6 +64,7 @@ export interface CodexQuota {
     limit_reached: boolean;
     used_percent: number | null;
     reset_at: number | null;
+    limit_window_seconds: number | null;
   };
   code_review_rate_limit: {
     allowed: boolean;

src/routes/accounts.ts

@@ -32,6 +32,7 @@ function toQuota(usage: CodexUsageResponse): CodexQuota {
       limit_reached: usage.rate_limit.limit_reached,
       used_percent: usage.rate_limit.primary_window?.used_percent ?? null,
       reset_at: usage.rate_limit.primary_window?.reset_at ?? null,
+      limit_window_seconds: usage.rate_limit.primary_window?.limit_window_seconds ?? null,
     },
     code_review_rate_limit: usage.code_review_rate_limit
       ? {
@@ -88,7 +89,8 @@ export function createAccountRoutes(
           const usage = await api.getUsage();
           // Sync rate limit window — auto-reset local counters on window rollover
           const resetAt = usage.rate_limit.primary_window?.reset_at ?? null;
-          pool.syncRateLimitWindow(acct.id, resetAt);
+          const windowSec = usage.rate_limit.primary_window?.limit_window_seconds ?? null;
+          pool.syncRateLimitWindow(acct.id, resetAt, windowSec);
           // Re-read usage after potential reset
           const freshAcct = pool.getAccounts().find((a) => a.id === acct.id) ?? acct;
           return { ...freshAcct, quota: toQuota(usage) };

web/src/components/AccountCard.tsx

@@ -1,7 +1,7 @@
 import { useCallback } from "preact/hooks";
 import { useT, useI18n } from "../i18n/context";
 import type { TranslationKey } from "../i18n/translations";
-import { formatNumber, formatResetTime } from "../utils/format";
+import { formatNumber, formatResetTime, formatWindowDuration } from "../utils/format";
 import type { Account } from "../hooks/use-accounts";
 
 const avatarColors = [
@@ -50,7 +50,11 @@ export function AccountCard({ account, index, onDelete }: AccountCardProps) {
   const usage = account.usage || {};
   const requests = usage.request_count ?? 0;
   const tokens = (usage.input_tokens ?? 0) + (usage.output_tokens ?? 0);
+  const winRequests = usage.window_request_count ?? 0;
+  const winTokens = (usage.window_input_tokens ?? 0) + (usage.window_output_tokens ?? 0);
   const plan = account.planType || t("freeTier");
+  const windowSec = account.quota?.rate_limit?.limit_window_seconds;
+  const windowDur = windowSec ? formatWindowDuration(windowSec, lang === "zh") : null;
 
   const [statusCls, statusKey] = statusStyles[account.status] || statusStyles.disabled;
 
@@ -86,7 +90,14 @@ export function AccountCard({ account, index, onDelete }: AccountCardProps) {
           </div>
           <div>
             <h3 class="text-[0.82rem] font-semibold leading-tight">{email}</h3>
-            <p class="text-xs text-slate-500 dark:text-text-dim">{plan}</p>
+            <p class="text-xs text-slate-500 dark:text-text-dim">
+              {plan}
+              {windowDur && (
+                <span class="ml-1.5 px-1.5 py-0.5 rounded bg-slate-100 dark:bg-border-dark text-slate-500 dark:text-text-dim text-[0.65rem] font-medium">
+                  {windowDur}
+                </span>
+              )}
+            </p>
           </div>
         </div>
         <div class="flex items-center gap-2">
@@ -108,12 +119,16 @@ export function AccountCard({ account, index, onDelete }: AccountCardProps) {
       {/* Stats */}
       <div class="space-y-2">
         <div class="flex justify-between text-[0.78rem]">
-          <span class="text-slate-500 dark:text-text-dim">{t("totalRequests")}</span>
-          <span class="font-medium">{formatNumber(requests)}</span>
+          <span class="text-slate-500 dark:text-text-dim">{t("windowRequests")}</span>
+          <span class="font-medium">{formatNumber(winRequests)}</span>
         </div>
         <div class="flex justify-between text-[0.78rem]">
-          <span class="text-slate-500 dark:text-text-dim">{t("tokensUsed")}</span>
-          <span class="font-medium">{formatNumber(tokens)}</span>
+          <span class="text-slate-500 dark:text-text-dim">{t("windowTokens")}</span>
+          <span class="font-medium">{formatNumber(winTokens)}</span>
+        </div>
+        <div class="flex justify-between text-[0.68rem]">
+          <span class="text-slate-400 dark:text-text-dim/70">{t("totalAll")}</span>
+          <span class="text-slate-400 dark:text-text-dim/70">{formatNumber(requests)} req · {formatNumber(tokens)} tok</span>
         </div>
       </div>
 
@@ -142,6 +157,11 @@ export function AccountCard({ account, index, onDelete }: AccountCardProps) {
           {resetAt && (
             <p class="text-xs text-slate-400 dark:text-text-dim mt-1">
               {t("resetsAt")} {resetAt}
+              {windowDur && (
+                <span class="ml-1 text-slate-400 dark:text-text-dim/70">
+                  ({t("windowLabel")} {windowDur})
+                </span>
+              )}
             </p>
           )}
         </div>

web/src/hooks/use-accounts.ts

@@ -5,6 +5,7 @@ export interface AccountQuota {
     used_percent?: number | null;
     limit_reached?: boolean;
     reset_at?: number | null;
+    limit_window_seconds?: number | null;
   };
 }
 
@@ -17,6 +18,9 @@ export interface Account {
     request_count?: number;
     input_tokens?: number;
     output_tokens?: number;
+    window_request_count?: number;
+    window_input_tokens?: number;
+    window_output_tokens?: number;
   };
   quota?: AccountQuota;
 }

web/src/i18n/translations.ts

@@ -19,6 +19,10 @@ export const translations = {
     freeTier: "Free Tier",
     totalRequests: "Total Requests",
     tokensUsed: "Tokens Used",
+    windowRequests: "Requests (Window)",
+    windowTokens: "Tokens (Window)",
+    totalAll: "Total",
+    windowLabel: "window",
     rateLimit: "Rate Limit",
     limitReached: "Limit Reached",
     used: "Used",
@@ -78,6 +82,10 @@ export const translations = {
     freeTier: "\u514d\u8d39\u7248",
     totalRequests: "\u603b\u8bf7\u6c42\u6570",
     tokensUsed: "Token \u7528\u91cf",
+    windowRequests: "\u8bf7\u6c42\u6570\uff08\u7a97\u53e3\uff09",
+    windowTokens: "Token\uff08\u7a97\u53e3\uff09",
+    totalAll: "\u7d2f\u8ba1",
+    windowLabel: "\u7a97\u53e3",
     rateLimit: "\u901f\u7387\u9650\u5236",
     limitReached: "\u5df2\u8fbe\u4e0a\u9650",
     used: "\u5df2\u4f7f\u7528",

web/src/utils/format.ts

@@ -4,6 +4,19 @@ export function formatNumber(n: number): string {
   return String(n);
 }
 
+export function formatWindowDuration(seconds: number, isZh: boolean): string {
+  if (seconds >= 86400) {
+    const days = Math.floor(seconds / 86400);
+    return isZh ? `${days}天` : `${days}d`;
+  }
+  if (seconds >= 3600) {
+    const hours = Math.floor(seconds / 3600);
+    return isZh ? `${hours}小时` : `${hours}h`;
+  }
+  const minutes = Math.floor(seconds / 60);
+  return isZh ? `${minutes}分钟` : `${minutes}m`;
+}
+
 export function formatResetTime(unixSec: number, isZh: boolean): string {
   const d = new Date(unixSec * 1000);
   const now = new Date();

web/tailwind.config.ts

@@ -13,7 +13,7 @@ export default {
         "card-dark": "#161b22",
         "border-dark": "#30363d",
         "text-main": "#e6edf3",
-        "text-dim": "#8b949e",
+        "text-dim": "rgb(139 148 158 / <alpha-value>)",
       },
       fontFamily: {
         display: [