fix: avoid duplicate codex quota windows

Author: ssfun

cliproxyapi-pro-core/patches/sources/internal/pro/inspection/providers.go

@@ -570,12 +570,11 @@ func BuildCodexWindows(body string) (map[string]any, []map[string]any, *float64)
 		if idPrefix == "" {
 			idPrefix = fmt.Sprintf("additional-%d", index+1)
 		}
-		primary, _ := firstAny(rateInfo, "primary_window", "primaryWindow").(map[string]any)
-		secondary, _ := firstAny(rateInfo, "secondary_window", "secondaryWindow").(map[string]any)
+		additionalFiveHour, additionalLong := codexClassifiedWindows(rateInfo, true)
 		params := map[string]any{"name": limitName}
-		addCodexWindow(fmt.Sprintf("%s-five-hour-%d", idPrefix, index), "codex_quota.additional_primary_window", params, primary, firstAny(rateInfo, "limit_reached", "limitReached"), rateInfo["allowed"])
-		additionalSecondaryID, additionalSecondaryLabel := codexSecondaryWindowMeta(secondary, "weekly", "codex_quota.additional_secondary_window", "monthly", "codex_quota.additional_team_secondary_window")
-		addCodexWindow(fmt.Sprintf("%s-%s-%d", idPrefix, additionalSecondaryID, index), additionalSecondaryLabel, params, secondary, firstAny(rateInfo, "limit_reached", "limitReached"), rateInfo["allowed"])
+		addCodexWindow(fmt.Sprintf("%s-five-hour-%d", idPrefix, index), "codex_quota.additional_primary_window", params, additionalFiveHour, firstAny(rateInfo, "limit_reached", "limitReached"), rateInfo["allowed"])
+		additionalSecondaryID, additionalSecondaryLabel := codexSecondaryWindowMeta(additionalLong, "weekly", "codex_quota.additional_secondary_window", "monthly", "codex_quota.additional_team_secondary_window")
+		addCodexWindow(fmt.Sprintf("%s-%s-%d", idPrefix, additionalSecondaryID, index), additionalSecondaryLabel, params, additionalLong, firstAny(rateInfo, "limit_reached", "limitReached"), rateInfo["allowed"])
 	}
 
 	used := MaxUsedPercentFromWindows(windows)
@@ -590,23 +589,29 @@ func codexClassifiedWindows(limitInfo map[string]any, allowOrderFallback bool) (
 	secondary, _ := firstAny(limitInfo, "secondary_window", "secondaryWindow").(map[string]any)
 	var fiveHour map[string]any
 	var weekly map[string]any
-	for _, window := range []map[string]any{primary, secondary} {
+	fiveHourSlot := -1
+	weeklySlot := -1
+	for slot, window := range []map[string]any{primary, secondary} {
 		seconds, ok := floatFromAny(firstAny(window, "limit_window_seconds", "limitWindowSeconds"))
 		if !ok {
 			continue
 		}
 		if int(seconds) == 18000 && fiveHour == nil {
 			fiveHour = window
+			fiveHourSlot = slot
 		} else if (int(seconds) == 604800 || isCodexMonthlyWindow(window)) && weekly == nil {
 			weekly = window
+			weeklySlot = slot
 		}
 	}
 	if allowOrderFallback {
-		if fiveHour == nil {
+		if fiveHour == nil && primary != nil && weeklySlot != 0 {
 			fiveHour = primary
+			fiveHourSlot = 0
 		}
-		if weekly == nil {
+		if weekly == nil && secondary != nil && fiveHourSlot != 1 {
 			weekly = secondary
+			weeklySlot = 1
 		}
 	}
 	return fiveHour, weekly

cliproxyapi-pro-core/patches/sources/internal/pro/inspection/providers_test.go

@@ -1,6 +1,9 @@
 package inspection
 
-import "testing"
+import (
+	"strconv"
+	"testing"
+)
 
 func TestAntigravityParserBuildsCanonicalGroups(t *testing.T) {
 	groups, err := BuildAntigravityGroups(`{
@@ -56,6 +59,54 @@ func TestClaudeAndCodexWindowParsers(t *testing.T) {
 	}
 }
 
+func TestCodexSingleLongWindowIsNotDuplicatedAsFiveHour(t *testing.T) {
+	tests := []struct {
+		name       string
+		windowSecs int
+		wantID     string
+	}{
+		{name: "weekly", windowSecs: 604800, wantID: "weekly"},
+		{name: "monthly", windowSecs: 2592000, wantID: "monthly"},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			body := `{"rate_limit":{"primary_window":{"limit_window_seconds":` +
+				strconv.Itoa(tt.windowSecs) + `,"used_percent":25,"reset_at":1767830400}}}`
+			_, windows, used := BuildCodexWindows(body)
+			if len(windows) != 1 || windows[0]["id"] != tt.wantID {
+				t.Fatalf("windows = %+v, want only %q", windows, tt.wantID)
+			}
+			if used == nil || *used != 25 {
+				t.Fatalf("used percent = %v, want 25", used)
+			}
+		})
+	}
+}
+
+func TestCodexLegacyUndatedWindowsKeepDistinctOrderFallback(t *testing.T) {
+	_, windows, _ := BuildCodexWindows(`{
+		"rate_limit":{
+			"primary_window":{"used_percent":10,"reset_at":1767243600},
+			"secondary_window":{"used_percent":20,"reset_at":1767830400}
+		}
+	}`)
+	if len(windows) != 2 || windows[0]["id"] != "five-hour" || windows[1]["id"] != "weekly" {
+		t.Fatalf("legacy windows = %+v, want distinct primary/secondary fallback", windows)
+	}
+}
+
+func TestCodexAdditionalSingleMonthlyWindowUsesMonthlyLabel(t *testing.T) {
+	_, windows, _ := BuildCodexWindows(`{
+		"additional_rate_limits":[{
+			"limit_name":"Credits",
+			"rate_limit":{"primary_window":{"limit_window_seconds":2592000,"used_percent":30,"reset_at":1767830400}}
+		}]
+	}`)
+	if len(windows) != 1 || windows[0]["id"] != "credits-monthly-0" {
+		t.Fatalf("additional windows = %+v, want only monthly", windows)
+	}
+}
+
 func TestKimiParserNormalizesLimits(t *testing.T) {
 	rows, used, err := BuildKimiRows(`{
 		"limits":[{"name":"Weekly","limit":100,"used":40,"reset_at":"2026-01-08T00:00:00Z","window":{"duration":1,"timeUnit":"WEEKS"}}]

cliproxyapi-pro-core/patches/sources/internal/pro/quota/xai.go

@@ -16,7 +16,7 @@ import (
 const (
 	// CacheParserVersion is the shared version of normalized quota cache
 	// records. Provider-specific parser versions may diverge from it later.
-	CacheParserVersion = 6
+	CacheParserVersion = 7
 	XAIParserVersion   = CacheParserVersion
 )
 

cliproxyapi-pro-core/patches/sources/internal/pro/quota/xai_billing_test.go

@@ -37,9 +37,9 @@ func TestXAIBillingParserCombinesWeeklyAndMonthlyShapes(t *testing.T) {
 	}
 }
 
-func TestCacheParserVersionCoversQuotaTimelineFields(t *testing.T) {
-	if CacheParserVersion != 6 {
-		t.Fatalf("CacheParserVersion = %d, want 6", CacheParserVersion)
+func TestCacheParserVersionCoversCodexWindowClassification(t *testing.T) {
+	if CacheParserVersion != 7 {
+		t.Fatalf("CacheParserVersion = %d, want 7", CacheParserVersion)
 	}
 }