fix: recognize Claude OAuth subscription type

Co-authored-by: shixy96 <18705837259@163.com>

Author: steipete

CHANGELOG.md

@@ -10,6 +10,8 @@
 - Cost history: show per-model cost details as a compact vertical list when hovering daily bars (#513). Thanks @iam-brain!
 
 ### Fixes
+- Claude: recognize OAuth `subscriptionType` before `rateLimitTier` so Pro accounts with generic Claude Code tiers
+  open the subscription usage dashboard correctly (#836, fixes #824). Thanks @shixy96!
 - Cursor: show Enterprise/Team usage from personal caps and shared pools instead of reporting 100% remaining (#813). Thanks @fcamus00!
 - Codex: keep same-workspace managed accounts distinct by matching workspace identity with email, so different OpenAI users in one workspace no longer overwrite each other (#796). Thanks @leezhuuuuu!
 - Codex: make OpenAI dashboard refreshes handle non-English pages, lazy-loaded credits history, timeout retries, and unrelated Skillusage rows (#825). Thanks @xiaoqianWX!

Sources/CodexBarCore/Providers/Claude/ClaudeOAuth/ClaudeOAuthCredentialModels.swift

@@ -10,19 +10,22 @@ public struct ClaudeOAuthCredentials: Sendable {
     public let expiresAt: Date?
     public let scopes: [String]
     public let rateLimitTier: String?
+    public let subscriptionType: String?
 
     public init(
         accessToken: String,
         refreshToken: String?,
         expiresAt: Date?,
         scopes: [String],
-        rateLimitTier: String?)
+        rateLimitTier: String?,
+        subscriptionType: String? = nil)
     {
         self.accessToken = accessToken
         self.refreshToken = refreshToken
         self.expiresAt = expiresAt
         self.scopes = scopes
         self.rateLimitTier = rateLimitTier
+        self.subscriptionType = subscriptionType
     }
 
     public var isExpired: Bool {
@@ -55,7 +58,8 @@ public struct ClaudeOAuthCredentials: Sendable {
             refreshToken: oauth.refreshToken,
             expiresAt: expiresAt,
             scopes: oauth.scopes ?? [],
-            rateLimitTier: oauth.rateLimitTier)
+            rateLimitTier: oauth.rateLimitTier,
+            subscriptionType: oauth.subscriptionType)
     }
 
     private struct Root: Decodable {
@@ -68,13 +72,15 @@ public struct ClaudeOAuthCredentials: Sendable {
         let expiresAt: Double?
         let scopes: [String]?
         let rateLimitTier: String?
+        let subscriptionType: String?
 
         enum CodingKeys: String, CodingKey {
             case accessToken
             case refreshToken
             case expiresAt
             case scopes
             case rateLimitTier
+            case subscriptionType
         }
     }
 }

Sources/CodexBarCore/Providers/Claude/ClaudeOAuth/ClaudeOAuthCredentials.swift

@@ -951,13 +951,15 @@ public enum ClaudeOAuthCredentialsStore {
         func refreshAccessToken(
             refreshToken: String,
             existingScopes: [String],
-            existingRateLimitTier: String?) async throws -> ClaudeOAuthCredentials
+            existingRateLimitTier: String?,
+            existingSubscriptionType: String? = nil) async throws -> ClaudeOAuthCredentials
         {
             try await self.context.run {
                 let newCredentials = try await self.refreshAccessTokenCore(
                     refreshToken: refreshToken,
                     existingScopes: existingScopes,
-                    existingRateLimitTier: existingRateLimitTier)
+                    existingRateLimitTier: existingRateLimitTier,
+                    existingSubscriptionType: existingSubscriptionType)
 
                 ClaudeOAuthCredentialsStore.saveRefreshedCredentialsToCache(newCredentials)
                 ClaudeOAuthCredentialsStore.writeMemoryCache(
@@ -975,7 +977,8 @@ public enum ClaudeOAuthCredentialsStore {
         private func refreshAccessTokenCore(
             refreshToken: String,
             existingScopes: [String],
-            existingRateLimitTier: String?) async throws -> ClaudeOAuthCredentials
+            existingRateLimitTier: String?,
+            existingSubscriptionType: String?) async throws -> ClaudeOAuthCredentials
         {
             guard ClaudeOAuthRefreshFailureGate.shouldAttempt() else {
                 let status = ClaudeOAuthRefreshFailureGate.currentBlockStatus()
@@ -1051,7 +1054,8 @@ public enum ClaudeOAuthCredentialsStore {
                 refreshToken: tokenResponse.refreshToken ?? refreshToken,
                 expiresAt: expiresAt,
                 scopes: existingScopes,
-                rateLimitTier: existingRateLimitTier)
+                rateLimitTier: existingRateLimitTier,
+                subscriptionType: existingSubscriptionType)
         }
     }
 
@@ -1144,7 +1148,8 @@ public enum ClaudeOAuthCredentialsStore {
             let refreshed = try await refresher.refreshAccessToken(
                 refreshToken: refreshToken,
                 existingScopes: credentials.scopes,
-                existingRateLimitTier: credentials.rateLimitTier)
+                existingRateLimitTier: credentials.rateLimitTier,
+                existingSubscriptionType: credentials.subscriptionType)
             self.log.info("Token refresh successful, expires in \(refreshed.expiresIn ?? 0) seconds")
             return refreshed
         } catch {
@@ -1167,6 +1172,9 @@ public enum ClaudeOAuthCredentialsStore {
         if let rateLimitTier = credentials.rateLimitTier {
             oauth["rateLimitTier"] = rateLimitTier
         }
+        if let subscriptionType = credentials.subscriptionType {
+            oauth["subscriptionType"] = subscriptionType
+        }
 
         let oauthData: [String: Any] = ["claudeAiOauth": oauth]
 
@@ -1918,12 +1926,14 @@ extension ClaudeOAuthCredentialsStore {
     public static func refreshAccessToken(
         refreshToken: String,
         existingScopes: [String],
-        existingRateLimitTier: String?) async throws -> ClaudeOAuthCredentials
+        existingRateLimitTier: String?,
+        existingSubscriptionType: String? = nil) async throws -> ClaudeOAuthCredentials
     {
         try await Refresher(context: self.currentCollaboratorContext()).refreshAccessToken(
             refreshToken: refreshToken,
             existingScopes: existingScopes,
-            existingRateLimitTier: existingRateLimitTier)
+            existingRateLimitTier: existingRateLimitTier,
+            existingSubscriptionType: existingSubscriptionType)
     }
 
     private enum RefreshFailureDisposition: String {

Sources/CodexBarCore/Providers/Claude/ClaudePlan.swift

@@ -50,6 +50,11 @@ public enum ClaudePlan: String, CaseIterable, Sendable {
         self.fromRateLimitTier(rateLimitTier)
     }
 
+    public static func fromOAuthCredentials(subscriptionType: String?, rateLimitTier: String?) -> Self? {
+        self.fromCompatibilityLoginMethod(subscriptionType)
+            ?? self.fromOAuthRateLimitTier(rateLimitTier)
+    }
+
     public static func fromWebAccount(rateLimitTier: String?, billingType: String?) -> Self? {
         if let plan = self.fromRateLimitTier(rateLimitTier) {
             return plan
@@ -90,6 +95,12 @@ public enum ClaudePlan: String, CaseIterable, Sendable {
         self.fromOAuthRateLimitTier(rateLimitTier)?.brandedLoginMethod
     }
 
+    public static func oauthLoginMethod(subscriptionType: String?, rateLimitTier: String?) -> String? {
+        self.fromOAuthCredentials(
+            subscriptionType: subscriptionType,
+            rateLimitTier: rateLimitTier)?.brandedLoginMethod
+    }
+
     public static func webLoginMethod(rateLimitTier: String?, billingType: String?) -> String? {
         self.fromWebAccount(rateLimitTier: rateLimitTier, billingType: billingType)?.brandedLoginMethod
     }

Sources/CodexBarCore/Providers/Claude/ClaudeUsageFetcher.swift

@@ -856,7 +856,9 @@ extension ClaudeUsageFetcher {
             windowMinutes: 7 * 24 * 60)
         let extraRateWindows = Self.oauthExtraRateWindows(from: usage)
 
-        let loginMethod = ClaudePlan.oauthLoginMethod(rateLimitTier: credentials.rateLimitTier)
+        let loginMethod = ClaudePlan.oauthLoginMethod(
+            subscriptionType: credentials.subscriptionType,
+            rateLimitTier: credentials.rateLimitTier)
         let providerCost = Self.oauthExtraUsageCost(usage.extraUsage, loginMethod: loginMethod)
 
         return ClaudeUsageSnapshot(
@@ -1158,15 +1160,17 @@ extension ClaudeUsageFetcher {
 extension ClaudeUsageFetcher {
     public static func _mapOAuthUsageForTesting(
         _ data: Data,
-        rateLimitTier: String? = nil) throws -> ClaudeUsageSnapshot
+        rateLimitTier: String? = nil,
+        subscriptionType: String? = nil) throws -> ClaudeUsageSnapshot
     {
         let usage = try ClaudeOAuthUsageFetcher.decodeUsageResponse(data)
         let creds = ClaudeOAuthCredentials(
             accessToken: "test",
             refreshToken: nil,
             expiresAt: Date().addingTimeInterval(3600),
             scopes: [],
-            rateLimitTier: rateLimitTier)
+            rateLimitTier: rateLimitTier,
+            subscriptionType: subscriptionType)
         return try Self.mapOAuthUsage(usage, credentials: creds)
     }
 }

Tests/CodexBarTests/ClaudeOAuthTests.swift

@@ -12,7 +12,8 @@ struct ClaudeOAuthTests {
             "refreshToken": "test-refresh",
             "expiresAt": 4102444800000,
             "scopes": ["usage:read"],
-            "rateLimitTier": "default_claude_max_20x"
+            "rateLimitTier": "default_claude_max_20x",
+            "subscriptionType": "pro"
           }
         }
         """
@@ -21,6 +22,7 @@ struct ClaudeOAuthTests {
         #expect(creds.refreshToken == "test-refresh")
         #expect(creds.scopes == ["usage:read"])
         #expect(creds.rateLimitTier == "default_claude_max_20x")
+        #expect(creds.subscriptionType == "pro")
         #expect(creds.isExpired == false)
     }
 
@@ -81,6 +83,20 @@ struct ClaudeOAuthTests {
         #expect(snap.loginMethod == "Claude Pro")
     }
 
+    @Test
+    func `maps O auth subscription type when rate limit tier is generic`() throws {
+        let json = """
+        {
+          "five_hour": { "utilization": 12.5, "resets_at": "2025-12-25T12:00:00.000Z" }
+        }
+        """
+        let snap = try ClaudeUsageFetcher._mapOAuthUsageForTesting(
+            Data(json.utf8),
+            rateLimitTier: "default_claude_ai",
+            subscriptionType: "pro")
+        #expect(snap.loginMethod == "Claude Pro")
+    }
+
     @Test
     func `maps O auth design and routines usage windows`() throws {
         let json = """

Tests/CodexBarTests/ClaudePlanResolverTests.swift

@@ -11,6 +11,14 @@ struct ClaudePlanResolverTests {
         #expect(ClaudePlan.oauthLoginMethod(rateLimitTier: "claude_enterprise") == "Claude Enterprise")
     }
 
+    @Test
+    func `oauth subscription type overrides generic rate limit tier`() {
+        #expect(
+            ClaudePlan.oauthLoginMethod(subscriptionType: "pro", rateLimitTier: "default_claude_ai")
+                == "Claude Pro")
+        #expect(ClaudePlan.oauthLoginMethod(subscriptionType: nil, rateLimitTier: "default_claude_ai") == nil)
+    }
+
     @Test
     func `web fallback preserves stripe Claude compatibility`() {
         #expect(

Tests/CodexBarTests/StatusMenuTests.swift

@@ -101,6 +101,42 @@ struct StatusMenuTests {
         #expect(controller.dashboardURL(for: .alibaba) == AlibabaCodingPlanAPIRegion.chinaMainland.dashboardURL)
     }
 
+    @Test
+    func `claude subscription dashboard action opens usage page`() {
+        self.disableMenuCardsForTesting()
+        let settings = self.makeSettings()
+        settings.statusChecksEnabled = false
+        settings.refreshFrequency = .manual
+
+        let fetcher = UsageFetcher()
+        let store = UsageStore(fetcher: fetcher, browserDetection: BrowserDetection(cacheTTL: 0), settings: settings)
+        store._setSnapshotForTesting(
+            UsageSnapshot(
+                primary: RateWindow(
+                    usedPercent: 12,
+                    windowMinutes: 300,
+                    resetsAt: nil,
+                    resetDescription: nil),
+                secondary: nil,
+                tertiary: nil,
+                updatedAt: Date(),
+                identity: ProviderIdentitySnapshot(
+                    providerID: .claude,
+                    accountEmail: nil,
+                    accountOrganization: nil,
+                    loginMethod: "Claude Pro")),
+            provider: .claude)
+        let controller = StatusItemController(
+            store: store,
+            settings: settings,
+            account: fetcher.loadAccountInfo(),
+            updater: DisabledUpdaterController(),
+            preferencesSelection: PreferencesSelection(),
+            statusBar: self.makeStatusBarForTesting())
+
+        #expect(controller.dashboardURL(for: .claude)?.absoluteString == "https://claude.ai/settings/usage")
+    }
+
     @Test
     func `remembers provider when menu opens`() {
         self.disableMenuCardsForTesting()

docs/claude.md

@@ -57,7 +57,8 @@ Usage source picker:
   - `seven_day_sonnet` / `seven_day_opus` → model-specific weekly window.
   - `extra_usage` → Extra usage cost (monthly spend/limit).
 - Successful OAuth login enables Claude and selects OAuth as the usage source.
-- Plan inference: `rate_limit_tier` from credentials maps to Max/Pro/Team/Enterprise.
+- Plan inference: `subscriptionType` is preferred when present; `rate_limit_tier` falls back to
+  Max/Pro/Team/Enterprise.
 
 ## Web API (cookies)
 - Preferences → Providers → Claude → Cookie source (Automatic or Manual).