Merge branch 'main' into rat-110-claude-source-planner-consolidation

# Conflicts:
#	Sources/CodexBar/UsageStore.swift

Author: ratulsarna

Sources/CodexBar/HistoricalUsagePace.swift

@@ -9,31 +9,29 @@ enum MenuBarDisplayText {
         return String(format: "%.0f%%", clamped)
     }
 
-    static func paceText(provider: UsageProvider, window: RateWindow?, now: Date = .init()) -> String? {
-        guard let window else { return nil }
-        guard let pace = UsagePaceText.weeklyPace(provider: provider, window: window, now: now) else { return nil }
+    static func paceText(pace: UsagePace?) -> String? {
+        guard let pace else { return nil }
         let deltaValue = Int(abs(pace.deltaPercent).rounded())
         let sign = pace.deltaPercent >= 0 ? "+" : "-"
         return "\(sign)\(deltaValue)%"
     }
 
     static func displayText(
         mode: MenuBarDisplayMode,
-        provider: UsageProvider,
         percentWindow: RateWindow?,
-        paceWindow: RateWindow?,
-        showUsed: Bool,
-        now: Date = .init()) -> String?
+        pace: UsagePace? = nil,
+        showUsed: Bool) -> String?
     {
         switch mode {
         case .percent:
             return self.percentText(window: percentWindow, showUsed: showUsed)
         case .pace:
-            return self.paceText(provider: provider, window: paceWindow, now: now)
+            return self.paceText(pace: pace)
         case .both:
             guard let percent = percentText(window: percentWindow, showUsed: showUsed) else { return nil }
-            guard let pace = Self.paceText(provider: provider, window: paceWindow, now: now) else { return nil }
-            return "\(percent) · \(pace)"
+            let paceText: String? = Self.paceText(pace: pace)
+            guard let paceText else { return nil }
+            return "\(percent) · \(paceText)"
         }
     }
 }

Sources/CodexBar/MenuBarDisplayText.swift

@@ -635,6 +635,7 @@ extension UsageMenuCardView.Model {
         let sourceLabel: String?
         let kiloAutoMode: Bool
         let hidePersonalInfo: Bool
+        let weeklyPace: UsagePace?
         let now: Date
 
         init(
@@ -657,6 +658,7 @@ extension UsageMenuCardView.Model {
             sourceLabel: String? = nil,
             kiloAutoMode: Bool = false,
             hidePersonalInfo: Bool,
+            weeklyPace: UsagePace? = nil,
             now: Date)
         {
             self.provider = provider
@@ -678,6 +680,7 @@ extension UsageMenuCardView.Model {
             self.sourceLabel = sourceLabel
             self.kiloAutoMode = kiloAutoMode
             self.hidePersonalInfo = hidePersonalInfo
+            self.weeklyPace = weeklyPace
             self.now = now
         }
     }
@@ -933,9 +936,9 @@ extension UsageMenuCardView.Model {
         }
         if let weekly = snapshot.secondary {
             let paceDetail = Self.weeklyPaceDetail(
-                provider: input.provider,
                 window: weekly,
                 now: input.now,
+                pace: input.weeklyPace,
                 showUsed: input.usageBarsShowUsed)
             var weeklyResetText = Self.resetText(for: weekly, style: input.resetTimeDisplayStyle, now: input.now)
             var weeklyDetailText: String? = input.provider == .zai ? zaiTimeDetail : nil
@@ -1049,12 +1052,13 @@ extension UsageMenuCardView.Model {
     }
 
     private static func weeklyPaceDetail(
-        provider: UsageProvider,
         window: RateWindow,
         now: Date,
+        pace: UsagePace?,
         showUsed: Bool) -> PaceDetail?
     {
-        guard let detail = UsagePaceText.weeklyDetail(provider: provider, window: window, now: now) else { return nil }
+        guard let pace else { return nil }
+        let detail = UsagePaceText.weeklyDetail(pace: pace, now: now)
         let expectedUsed = detail.expectedUsedPercent
         let actualUsed = window.usedPercent
         let expectedPercent = showUsed ? expectedUsed : (100 - expectedUsed)

Sources/CodexBar/MenuCardView.swift

@@ -166,7 +166,8 @@ struct MenuDescriptor {
                 {
                     entries.append(.text(detail, .secondary))
                 }
-                if let paceSummary = UsagePaceText.weeklySummary(provider: provider, window: weekly) {
+                if let pace = store.weeklyPace(provider: provider, window: weekly) {
+                    let paceSummary = UsagePaceText.weeklySummary(pace: pace)
                     entries.append(.text(paceSummary, .secondary))
                 }
             }

Sources/CodexBar/MenuDescriptor.swift

@@ -338,6 +338,10 @@ struct ProvidersPane: View {
             tokenError = nil
         }
 
+        let now = Date()
+        let weeklyPace = snapshot?.secondary.flatMap { window in
+            self.store.weeklyPace(provider: provider, window: window, now: now)
+        }
         let input = UsageMenuCardView.Model.Input(
             provider: provider,
             metadata: metadata,
@@ -356,7 +360,8 @@ struct ProvidersPane: View {
             tokenCostUsageEnabled: self.settings.isCostUsageEffectivelyEnabled(for: provider),
             showOptionalCreditsAndExtraUsage: self.settings.showOptionalCreditsAndExtraUsage,
             hidePersonalInfo: self.settings.hidePersonalInfo,
-            now: Date())
+            weeklyPace: weeklyPace,
+            now: now)
         return UsageMenuCardView.Model.make(input)
     }
 

Sources/CodexBar/PreferencesProvidersPane.swift

@@ -71,6 +71,17 @@ struct CodexProviderImplementation: ProviderImplementation {
             })
 
         return [
+            ProviderSettingsToggleDescriptor(
+                id: "codex-historical-tracking",
+                title: "Historical tracking",
+                subtitle: "Stores local Codex usage history (8 weeks) to personalize Pace predictions.",
+                binding: context.boolBinding(\.historicalTrackingEnabled),
+                statusText: nil,
+                actions: [],
+                isVisible: nil,
+                onChange: nil,
+                onAppDidBecomeActive: nil,
+                onAppearWhenEnabled: nil),
             ProviderSettingsToggleDescriptor(
                 id: "codex-openai-web-extras",
                 title: "OpenAI web extras",

Sources/CodexBar/Providers/Codex/CodexProviderImplementation.swift

@@ -150,6 +150,14 @@ extension SettingsStore {
         }
     }
 
+    var historicalTrackingEnabled: Bool {
+        get { self.defaultsState.historicalTrackingEnabled }
+        set {
+            self.defaultsState.historicalTrackingEnabled = newValue
+            self.userDefaults.set(newValue, forKey: "historicalTrackingEnabled")
+        }
+    }
+
     var menuBarMetricPreferencesRaw: [String: String] {
         get { self.defaultsState.menuBarMetricPreferencesRaw }
         set {

Sources/CodexBar/SettingsStore+Defaults.swift

@@ -16,6 +16,7 @@ extension SettingsStore {
         _ = self.menuBarShowsBrandIconWithPercent
         _ = self.menuBarShowsHighestUsage
         _ = self.menuBarDisplayMode
+        _ = self.historicalTrackingEnabled
         _ = self.showAllTokenAccountsInMenu
         _ = self.menuBarMetricPreferencesRaw
         _ = self.costUsageEnabled

Sources/CodexBar/SettingsStore+MenuObservation.swift

@@ -190,6 +190,7 @@ extension SettingsStore {
             forKey: "menuBarShowsBrandIconWithPercent") as? Bool ?? false
         let menuBarDisplayModeRaw = userDefaults.string(forKey: "menuBarDisplayMode")
             ?? MenuBarDisplayMode.percent.rawValue
+        let historicalTrackingEnabled = userDefaults.object(forKey: "historicalTrackingEnabled") as? Bool ?? false
         let showAllTokenAccountsInMenu = userDefaults.object(forKey: "showAllTokenAccountsInMenu") as? Bool ?? false
         let storedPreferences = userDefaults.dictionary(forKey: "menuBarMetricPreferences") as? [String: String] ?? [:]
         var resolvedPreferences = storedPreferences
@@ -238,6 +239,7 @@ extension SettingsStore {
             resetTimesShowAbsolute: resetTimesShowAbsolute,
             menuBarShowsBrandIconWithPercent: menuBarShowsBrandIconWithPercent,
             menuBarDisplayModeRaw: menuBarDisplayModeRaw,
+            historicalTrackingEnabled: historicalTrackingEnabled,
             showAllTokenAccountsInMenu: showAllTokenAccountsInMenu,
             menuBarMetricPreferencesRaw: resolvedPreferences,
             costUsageEnabled: costUsageEnabled,

Sources/CodexBar/SettingsStore.swift

@@ -15,6 +15,7 @@ struct SettingsDefaultsState: Sendable {
     var resetTimesShowAbsolute: Bool
     var menuBarShowsBrandIconWithPercent: Bool
     var menuBarDisplayModeRaw: String?
+    var historicalTrackingEnabled: Bool
     var showAllTokenAccountsInMenu: Bool
     var menuBarMetricPreferencesRaw: [String: String]
     var costUsageEnabled: Bool