Fix Kimi window ordering: prioritize rate limit over weekly quota

Sources/CodexBar/MenuBarMetricWindowResolver.swift

@@ -45,7 +45,7 @@ enum MenuBarMetricWindowResolver {
             if provider == .antigravity {
                 return snapshot.primary ?? snapshot.secondary ?? snapshot.tertiary
             }
-            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,
+            secondary: weeklyWindow,
             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)
@@ -222,10 +222,10 @@ struct KimiUsageSnapshotConversionTests {
 
         let usageSnapshot = snapshot.toUsageSnapshot()
 
-        #expect(usageSnapshot.primary != nil)
+        #expect(usageSnapshot.primary == nil)
+        #expect(usageSnapshot.secondary != nil)
         let weeklyExpected = 375.0 / 2048.0 * 100.0
-        #expect(abs((usageSnapshot.primary?.usedPercent ?? 0.0) - weeklyExpected) < 0.01)
-        #expect(usageSnapshot.secondary == nil)
+        #expect(abs((usageSnapshot.secondary?.usedPercent ?? 0.0) - weeklyExpected) < 0.01)
         #expect(usageSnapshot.tertiary == nil)
     }
 
@@ -244,7 +244,7 @@ struct KimiUsageSnapshotConversionTests {
             updatedAt: now)
 
         let usageSnapshot = snapshot.toUsageSnapshot()
-        #expect(usageSnapshot.primary?.usedPercent == 0.0)
+        #expect(usageSnapshot.secondary?.usedPercent == 0.0)
     }
 
     @Test
@@ -262,7 +262,7 @@ struct KimiUsageSnapshotConversionTests {
             updatedAt: now)
 
         let usageSnapshot = snapshot.toUsageSnapshot()
-        #expect(usageSnapshot.primary?.usedPercent == 100.0)
+        #expect(usageSnapshot.secondary?.usedPercent == 100.0)
     }
 }
 

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

@@ -80,7 +80,7 @@ struct UsageStoreHighestUsageTests {
     }
 
     @Test
-    func `automatic metric uses secondary for kimi when ranking highest usage`() {
+    func `automatic metric uses primary for kimi when ranking highest usage`() {
         let settings = SettingsStore(
             configStore: testConfigStore(suiteName: "UsageStoreHighestUsageTests-kimi-automatic"),
             zaiTokenStore: NoopZaiTokenStore(),
@@ -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)