Fix Kimi window ordering: prioritize rate limit over weekly quota

This change restores the original intent from PR #310 by @ajaxjiang96,
which was partially reverted in PR #390 (commit ad6c751).

PR #390 took a view-layer approach that required special-case logic in
StatusItemController and UsageStore to pick the secondary window for Kimi
in automatic mode. This created architectural inconsistency:
- Claude: primary=5h session, secondary=weekly
- Kimi: primary=weekly, secondary=5h rate limit (but automatic mode picked secondary)

This fix takes a model-layer approach that aligns Kimi with Claude:

1. Swaps the primary/secondary mapping in KimiUsageSnapshot:
   - When rate limit exists: primary=rate limit (5h), secondary=weekly
   - When no rate limit: primary=weekly, secondary=nil

2. Updates menu labels to match: sessionLabel="Rate Limit", weeklyLabel="Weekly"

3. Removes the now-unnecessary .kimi special-case from automatic mode selection
   in both StatusItemController and UsageStore+HighestUsage

4. Updates tests to reflect new window ordering:
   - KimiProviderTests.swift: Updated window assertions
   - StatusItemAnimationTests.swift: Swapped test data values
   - UsageStoreHighestUsageTests.swift: Swapped test data values
   - UsageStoreCoverageTests.swift: Swapped test data values

Result: Kimi now displays the 5-hour rate limit first in the menu (matching
Claude's display order), and the menubar icon shows the rate limit percentage.

Author: ajaxjiang96

Sources/CodexBar/StatusItemController.swift

@@ -134,7 +134,7 @@ final class StatusItemController: NSObject, NSMenuDelegate, StatusItemControllin
             let usedPercent = (primary.usedPercent + secondary.usedPercent) / 2
             return RateWindow(usedPercent: usedPercent, windowMinutes: nil, resetsAt: nil, resetDescription: nil)
         case .automatic:
-            if provider == .factory || provider == .kimi {
+            if provider == .factory {
                 return snapshot?.secondary ?? snapshot?.primary
             }
             if provider == .copilot,

Sources/CodexBar/UsageStore+HighestUsage.swift

@@ -38,7 +38,7 @@ extension UsageStore {
             let usedPercent = (primary.usedPercent + secondary.usedPercent) / 2
             return RateWindow(usedPercent: usedPercent, windowMinutes: nil, resetsAt: nil, resetDescription: nil)
         case .automatic:
-            if provider == .factory || provider == .kimi {
+            if provider == .factory {
                 return snapshot.secondary ?? snapshot.primary
             }
             if provider == .copilot,

Sources/CodexBarCore/Providers/Kimi/KimiProviderDescriptor.swift

@@ -10,8 +10,8 @@ public enum KimiProviderDescriptor {
             metadata: ProviderMetadata(
                 id: .kimi,
                 displayName: "Kimi",
-                sessionLabel: "Weekly",
-                weeklyLabel: "Rate Limit",
+                sessionLabel: "Rate Limit",
+                weeklyLabel: "Weekly",
                 opusLabel: nil,
                 supportsOpus: false,
                 supportsCredits: false,

Sources/CodexBarCore/Providers/Kimi/KimiUsageSnapshot.swift

@@ -73,8 +73,8 @@ extension KimiUsageSnapshot {
             loginMethod: nil)
 
         return UsageSnapshot(
-            primary: weeklyWindow,
-            secondary: rateLimitWindow,
+            primary: rateLimitWindow ?? weeklyWindow,
+            secondary: rateLimitWindow != nil ? weeklyWindow : nil,
             tertiary: nil,
             providerCost: nil,
             updatedAt: self.updatedAt,

Tests/CodexBarTests/KimiProviderTests.swift

@@ -191,16 +191,16 @@ struct KimiUsageSnapshotConversionTests {
         let usageSnapshot = snapshot.toUsageSnapshot()
 
         #expect(usageSnapshot.primary != nil)
-        let weeklyExpected = 375.0 / 2048.0 * 100.0
-        #expect(abs((usageSnapshot.primary?.usedPercent ?? 0.0) - weeklyExpected) < 0.01)
-        #expect(usageSnapshot.primary?.resetDescription == "375/2048 requests")
-        #expect(usageSnapshot.primary?.windowMinutes == nil)
+        let rateExpected = 200.0 / 200.0 * 100.0
+        #expect(abs((usageSnapshot.primary?.usedPercent ?? 0.0) - rateExpected) < 0.01)
+        #expect(usageSnapshot.primary?.windowMinutes == 300) // 5 hours
+        #expect(usageSnapshot.primary?.resetDescription == "Rate: 200/200 per 5 hours")
 
         #expect(usageSnapshot.secondary != nil)
-        let rateExpected = 200.0 / 200.0 * 100.0
-        #expect(abs((usageSnapshot.secondary?.usedPercent ?? 0.0) - rateExpected) < 0.01)
-        #expect(usageSnapshot.secondary?.windowMinutes == 300) // 5 hours
-        #expect(usageSnapshot.secondary?.resetDescription == "Rate: 200/200 per 5 hours")
+        let weeklyExpected = 375.0 / 2048.0 * 100.0
+        #expect(abs((usageSnapshot.secondary?.usedPercent ?? 0.0) - weeklyExpected) < 0.01)
+        #expect(usageSnapshot.secondary?.resetDescription == "375/2048 requests")
+        #expect(usageSnapshot.secondary?.windowMinutes == nil)
 
         #expect(usageSnapshot.tertiary == nil)
         #expect(usageSnapshot.updatedAt == now)

Tests/CodexBarTests/StatusItemAnimationTests.swift

@@ -308,8 +308,8 @@ struct StatusItemAnimationTests {
             statusBar: self.makeStatusBarForTesting())
 
         let snapshot = UsageSnapshot(
-            primary: RateWindow(usedPercent: 12, windowMinutes: nil, resetsAt: nil, resetDescription: nil),
-            secondary: RateWindow(usedPercent: 42, windowMinutes: 300, resetsAt: nil, resetDescription: nil),
+            primary: RateWindow(usedPercent: 42, windowMinutes: 300, resetsAt: nil, resetDescription: nil),
+            secondary: RateWindow(usedPercent: 12, windowMinutes: nil, resetsAt: nil, resetDescription: nil),
             updatedAt: Date())
 
         store._setSnapshotForTesting(snapshot, provider: .kimi)

Tests/CodexBarTests/UsageStoreCoverageTests.swift

@@ -95,10 +95,12 @@ struct UsageStoreCoverageTests {
                 secondary: nil,
                 updatedAt: now),
             provider: .codex)
+        // With the fix, Kimi's primary is now rate limit and secondary is weekly.
+        // In automatic mode, Kimi uses primary like other providers.
         store._setSnapshotForTesting(
             UsageSnapshot(
-                primary: RateWindow(usedPercent: 10, windowMinutes: nil, resetsAt: nil, resetDescription: nil),
-                secondary: RateWindow(usedPercent: 80, windowMinutes: 300, resetsAt: nil, resetDescription: nil),
+                primary: RateWindow(usedPercent: 80, windowMinutes: 300, resetsAt: nil, resetDescription: nil),
+                secondary: RateWindow(usedPercent: 10, windowMinutes: nil, resetsAt: nil, resetDescription: nil),
                 updatedAt: now),
             provider: .kimi)
 

Tests/CodexBarTests/UsageStoreHighestUsageTests.swift

@@ -104,9 +104,11 @@ struct UsageStoreHighestUsageTests {
             primary: RateWindow(usedPercent: 70, windowMinutes: nil, resetsAt: nil, resetDescription: nil),
             secondary: nil,
             updatedAt: Date())
+        // With the fix, Kimi's primary is now rate limit (typically lower usage %)
+        // and secondary is weekly. In automatic mode, Kimi uses primary like other providers.
         let kimiSnapshot = UsageSnapshot(
-            primary: RateWindow(usedPercent: 90, windowMinutes: nil, resetsAt: nil, resetDescription: nil),
-            secondary: RateWindow(usedPercent: 20, windowMinutes: nil, resetsAt: nil, resetDescription: nil),
+            primary: RateWindow(usedPercent: 20, windowMinutes: nil, resetsAt: nil, resetDescription: nil),
+            secondary: RateWindow(usedPercent: 90, windowMinutes: nil, resetsAt: nil, resetDescription: nil),
             updatedAt: Date())
 
         store._setSnapshotForTesting(codexSnapshot, provider: .codex)