From ad5ada2006c09b15345e46b419ff3754d8c4ec7a Mon Sep 17 00:00:00 2001
From: Hexer <hexrhj@gmail.com>
Date: Wed, 8 Apr 2026 11:13:12 +0800
Subject: [PATCH 1/2] feat(accounts): add plus plan filter

---
 frontend/src/pages/Accounts.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/Accounts.tsx b/frontend/src/pages/Accounts.tsx
index e795c5b..2ba44ec 100644
--- a/frontend/src/pages/Accounts.tsx
+++ b/frontend/src/pages/Accounts.tsx
@@ -34,7 +34,7 @@ export default function Accounts() {
   const [page, setPage] = useState(1)
   const [statusFilter, setStatusFilter] = useState<'all' | 'normal' | 'rate_limited' | 'banned' | 'locked'>('all')
   const [searchQuery, setSearchQuery] = useState('')
-  const [planFilter, setPlanFilter] = useState<'all' | 'pro' | 'team' | 'free'>('all')
+  const [planFilter, setPlanFilter] = useState<'all' | 'pro' | 'plus' | 'team' | 'free'>('all')
   const [sortKey, setSortKey] = useState<'requests' | 'usage' | 'importTime' | null>(null)
   const [sortDir, setSortDir] = useState<'asc' | 'desc'>('desc')
 
@@ -916,7 +916,7 @@ export default function Accounts() {
             />
           </div>
           <div className="flex items-center gap-1 rounded-lg border border-border bg-muted/30 p-0.5">
-            {(['all', 'pro', 'team', 'free'] as const).map((key) => (
+            {(['all', 'pro', 'plus', 'team', 'free'] as const).map((key) => (
               <button
                 key={key}
                 onClick={() => { setPlanFilter(key); setPage(1) }}

From b7b134c5bafbe5600219f7d24de64f32a5172660 Mon Sep 17 00:00:00 2001
From: Hexer <hexrhj@gmail.com>
Date: Wed, 8 Apr 2026 14:27:46 +0800
Subject: [PATCH 2/2] fix(proxy): treat plus cooldown like pro team

---
 proxy/handler.go      |  6 +++---
 proxy/handler_test.go | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/proxy/handler.go b/proxy/handler.go
index d18fe65..5bc3271 100644
--- a/proxy/handler.go
+++ b/proxy/handler.go
@@ -1268,8 +1268,8 @@ func (h *Handler) compute429Cooldown(account *auth.Account, body []byte, resp *h
 		// Free 只有 7d 窗口，429 = 额度耗尽，冷却 7 天
 		return 7 * 24 * time.Hour
 
-	case "team", "pro", "enterprise":
-		// Team/Pro 有 5h + 7d 双窗口，需要判断是哪个窗口触发了限制
+	case "team", "teamplus", "pro", "plus", "enterprise":
+		// Team/Pro/Plus 有 5h + 7d 双窗口，需要判断是哪个窗口触发了限制
 		return h.detectTeamCooldownWindow(resp)
 
 	default:
@@ -1278,7 +1278,7 @@ func (h *Handler) compute429Cooldown(account *auth.Account, body []byte, resp *h
 	}
 }
 
-// detectTeamCooldownWindow 通过响应头判断 Team/Pro 账号是哪个窗口触发的限制
+// detectTeamCooldownWindow 通过响应头判断 Team/Pro/Plus 账号是哪个窗口触发的限制
 func (h *Handler) detectTeamCooldownWindow(resp *http.Response) time.Duration {
 	if resp == nil {
 		return 5 * time.Hour // 保守默认
diff --git a/proxy/handler_test.go b/proxy/handler_test.go
index ae1779e..e4edfd3 100644
--- a/proxy/handler_test.go
+++ b/proxy/handler_test.go
@@ -7,7 +7,9 @@ import (
 	"net/http/httptest"
 	"path/filepath"
 	"testing"
+	"time"
 
+	"github.com/codex2api/auth"
 	"github.com/codex2api/database"
 	"github.com/gin-gonic/gin"
 )
@@ -136,6 +138,40 @@ func TestSendFinalUpstreamError_Non429StatusPassthrough(t *testing.T) {
 	}
 }
 
+func TestCompute429CooldownPlusUsesWindowHeaders(t *testing.T) {
+	handler := &Handler{}
+	account := &auth.Account{PlanType: "plus"}
+	resp := &http.Response{
+		Header: make(http.Header),
+	}
+	resp.Header.Set("x-codex-primary-used-percent", "100")
+	resp.Header.Set("x-codex-primary-window-minutes", "300")
+	resp.Header.Set("x-codex-secondary-used-percent", "20")
+	resp.Header.Set("x-codex-secondary-window-minutes", "10080")
+
+	got := handler.compute429Cooldown(account, []byte(`{"error":{"type":"usage_limit_reached"}}`), resp)
+	want := 5 * time.Hour
+	if got != want {
+		t.Fatalf("cooldown = %v, want %v", got, want)
+	}
+}
+
+func TestCompute429CooldownPlusPrefersExactResetTime(t *testing.T) {
+	handler := &Handler{}
+	account := &auth.Account{PlanType: "plus"}
+	resp := &http.Response{
+		Header: make(http.Header),
+	}
+	resp.Header.Set("x-codex-primary-used-percent", "100")
+	resp.Header.Set("x-codex-primary-window-minutes", "10080")
+
+	got := handler.compute429Cooldown(account, []byte(`{"error":{"type":"usage_limit_reached","resets_in_seconds":1800}}`), resp)
+	want := 30 * time.Minute
+	if got != want {
+		t.Fatalf("cooldown = %v, want %v", got, want)
+	}
+}
+
 func TestAuthMiddlewareSetsAPIKeyContext(t *testing.T) {
 	gin.SetMode(gin.TestMode)