Display: add workday segmentation for weekly progress bars

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 0.29.1 — Unreleased
 
 ### Added
+- Display: add optional workday markers for weekly progress bars (#1102). Thanks @Yuxin-Qiao!
 
 ### Fixed
 - Menu bar: show extra-usage spend as currency text for Claude and Cursor when that metric is selected (#1107). Thanks @Yuxin-Qiao!

Sources/CodexBar/MenuCardQuotaWarningMarkers.swift

@@ -18,4 +18,63 @@ extension UsageMenuCardView.Model {
             .map { showUsed ? 100 - Double($0) : Double($0) }
             .filter { $0 > 0 && $0 < 100 }
     }
+
+    /// Merges quota warning markers with optional work-day boundary markers.
+    /// Preserves original warning-marker ordering when workdayMarkers is empty,
+    /// sorts the combined set when workday markers are present.
+    static func mergedMarkerPercents(
+        warningMarkers: [Double],
+        workdayMarkers: [Double]) -> [Double]
+    {
+        let combined = warningMarkers + workdayMarkers
+        return workdayMarkers.isEmpty ? combined : combined.sorted()
+    }
+
+    /// Combines quota warning markers with optional work-day boundary markers
+    /// into a single sorted array. Workday markers are only applied when
+    /// includeWorkdayMarkers is true and windowMinutes == 10080.
+    static func markerPercents(
+        thresholds: [Int]?,
+        showUsed: Bool,
+        workDays: Int?,
+        windowMinutes: Int?,
+        includeWorkdayMarkers: Bool) -> [Double]
+    {
+        let warningMarkers = Self.warningMarkerPercents(thresholds: thresholds, showUsed: showUsed)
+        let workdayMarkers = includeWorkdayMarkers
+            ? workDayMarkerPercents(workDays: workDays, windowMinutes: windowMinutes)
+            : []
+        return Self.mergedMarkerPercents(warningMarkers: warningMarkers, workdayMarkers: workdayMarkers)
+    }
+
+    static func weeklyMarkerPercents(input: Input, windowMinutes: Int?) -> [Double] {
+        UsageMenuCardView.Model.markerPercents(
+            thresholds: input.quotaWarningThresholds[.weekly],
+            showUsed: input.usageBarsShowUsed,
+            workDays: input.workDaysPerWeek,
+            windowMinutes: windowMinutes,
+            includeWorkdayMarkers: true)
+    }
+
+    static func codexLaneMarkerPercents(
+        input: Input,
+        lane: CodexConsumerProjection.RateLane,
+        windowMinutes: Int?) -> [Double]
+    {
+        UsageMenuCardView.Model.markerPercents(
+            thresholds: input.quotaWarningThresholds[lane.quotaWarningWindow],
+            showUsed: input.usageBarsShowUsed,
+            workDays: input.workDaysPerWeek,
+            windowMinutes: windowMinutes,
+            includeWorkdayMarkers: lane == .weekly)
+    }
+}
+
+/// Returns boundary percentages for work day markers on a weekly progress bar.
+/// Only valid when windowMinutes == 10080 (standard 7-day week).
+/// nil workDays means feature is disabled.
+func workDayMarkerPercents(workDays: Int?, windowMinutes: Int?) -> [Double] {
+    guard workDays != nil, windowMinutes == 10080 else { return [] }
+    guard let wd = workDays, wd >= 2, wd <= 7 else { return [] }
+    return (1..<wd).map { Double($0) * 100.0 / Double(wd) }
 }

Sources/CodexBar/MenuCardView.swift

@@ -697,6 +697,7 @@ extension UsageMenuCardView.Model {
         let hidePersonalInfo: Bool
         let weeklyPace: UsagePace?
         let quotaWarningThresholds: [QuotaWarningWindow: [Int]]
+        let workDaysPerWeek: Int?
         let now: Date
 
         init(
@@ -722,6 +723,7 @@ extension UsageMenuCardView.Model {
             hidePersonalInfo: Bool,
             weeklyPace: UsagePace? = nil,
             quotaWarningThresholds: [QuotaWarningWindow: [Int]] = [:],
+            workDaysPerWeek: Int? = nil,
             now: Date)
         {
             self.provider = provider
@@ -746,6 +748,7 @@ extension UsageMenuCardView.Model {
             self.hidePersonalInfo = hidePersonalInfo
             self.weeklyPace = weeklyPace
             self.quotaWarningThresholds = quotaWarningThresholds
+            self.workDaysPerWeek = workDaysPerWeek
             self.now = now
         }
     }
@@ -1383,9 +1386,7 @@ extension UsageMenuCardView.Model {
             detailRightText: paceDetail?.rightLabel,
             pacePercent: paceDetail?.pacePercent,
             paceOnTop: paceDetail?.paceOnTop ?? true,
-            warningMarkerPercents: Self.warningMarkerPercents(
-                thresholds: input.quotaWarningThresholds[.weekly],
-                showUsed: input.usageBarsShowUsed))
+            warningMarkerPercents: Self.weeklyMarkerPercents(input: input, windowMinutes: weekly.windowMinutes))
     }
 
     private static func codexRateMetrics(
@@ -1431,9 +1432,10 @@ extension UsageMenuCardView.Model {
                 detailRightText: paceDetail?.rightLabel,
                 pacePercent: paceDetail?.pacePercent,
                 paceOnTop: paceDetail?.paceOnTop ?? true,
-                warningMarkerPercents: Self.warningMarkerPercents(
-                    thresholds: input.quotaWarningThresholds[lane.quotaWarningWindow],
-                    showUsed: input.usageBarsShowUsed))
+                warningMarkerPercents: Self.codexLaneMarkerPercents(
+                    input: input,
+                    lane: lane,
+                    windowMinutes: window.windowMinutes))
         }
     }
 

Sources/CodexBar/PreferencesDisplayPane.swift

@@ -78,6 +78,25 @@ struct DisplayPane: View {
                         title: L("show_quota_warning_markers_title"),
                         subtitle: L("show_quota_warning_markers_subtitle"),
                         binding: self.$settings.quotaWarningMarkersVisible)
+                    HStack(alignment: .top, spacing: 12) {
+                        VStack(alignment: .leading, spacing: 4) {
+                            Text(L("weekly_progress_work_days_title"))
+                                .font(.body)
+                            Text(L("weekly_progress_work_days_subtitle"))
+                                .font(.footnote)
+                                .foregroundStyle(.tertiary)
+                        }
+                        Spacer()
+                        Picker(L("weekly_progress_work_days_title"), selection: self.$settings.weeklyProgressWorkDays) {
+                            Text("Off").tag(nil as Int?)
+                            Text("4 days").tag(4 as Int?)
+                            Text("5 days").tag(5 as Int?)
+                            Text("7 days").tag(7 as Int?)
+                        }
+                        .labelsHidden()
+                        .pickerStyle(.menu)
+                        .frame(maxWidth: 100)
+                    }
                     PreferenceToggleRow(
                         title: L("show_reset_time_as_clock_title"),
                         subtitle: L("show_reset_time_as_clock_subtitle"),

Sources/CodexBar/PreferencesProvidersPane.swift

@@ -637,6 +637,7 @@ struct ProvidersPane: View {
                 .session: self.quotaWarningMarkerThresholds(provider: provider, window: .session),
                 .weekly: self.quotaWarningMarkerThresholds(provider: provider, window: .weekly),
             ],
+            workDaysPerWeek: self.settings.weeklyProgressWorkDays,
             now: now)
         return UsageMenuCardView.Model.make(input)
     }

Sources/CodexBar/Resources/en.lproj/Localizable.strings

@@ -482,6 +482,8 @@
 "show_usage_as_used_subtitle" = "Progress bars fill as you consume quota (instead of showing remaining).";
 "show_quota_warning_markers_title" = "Show quota warning markers";
 "show_quota_warning_markers_subtitle" = "Draw threshold tick marks on usage bars when quota warnings are configured.";
+"weekly_progress_work_days_title" = "Weekly progress work days";
+"weekly_progress_work_days_subtitle" = "Draw day-boundary tick marks on weekly usage bars.";
 "show_reset_time_as_clock_title" = "Show reset time as clock";
 "show_reset_time_as_clock_subtitle" = "Display reset times as absolute clock values instead of countdowns.";
 "show_provider_changelog_links_title" = "Show provider changelog links";

Sources/CodexBar/SettingsStore+Defaults.swift

@@ -181,6 +181,18 @@ extension SettingsStore {
         }
     }
 
+    var weeklyProgressWorkDays: Int? {
+        get { self.defaultsState.weeklyProgressWorkDays }
+        set {
+            self.defaultsState.weeklyProgressWorkDays = newValue
+            if let newValue {
+                self.userDefaults.set(newValue, forKey: "weeklyProgressWorkDays")
+            } else {
+                self.userDefaults.removeObject(forKey: "weeklyProgressWorkDays")
+            }
+        }
+    }
+
     var usageBarsShowUsed: Bool {
         get { self.defaultsState.usageBarsShowUsed }
         set {

Sources/CodexBar/SettingsStore+MenuObservation.swift

@@ -19,6 +19,7 @@ extension SettingsStore {
         _ = self.quotaWarningWindowEnabled(.weekly)
         _ = self.quotaWarningSoundEnabled
         _ = self.quotaWarningMarkersVisible
+        _ = self.weeklyProgressWorkDays
         _ = self.usageBarsShowUsed
         _ = self.resetTimesShowAbsolute
         _ = self.providerChangelogLinksEnabled

Sources/CodexBar/SettingsStore.swift

@@ -323,6 +323,7 @@ extension SettingsStore {
         if Self.isRunningTests, quotaWarningMarkersVisibleDefault == nil {
             userDefaults.set(true, forKey: "quotaWarningMarkersVisible")
         }
+        let weeklyProgressWorkDays = userDefaults.object(forKey: "weeklyProgressWorkDays") as? Int
         let usageBarsShowUsed = userDefaults.object(forKey: "usageBarsShowUsed") as? Bool ?? false
         let resetTimesShowAbsolute = userDefaults.object(forKey: "resetTimesShowAbsolute") as? Bool ?? false
         let providerChangelogLinksEnabled = userDefaults.object(
@@ -400,6 +401,7 @@ extension SettingsStore {
             quotaWarningWeeklyEnabled: quotaWarnings.weeklyEnabled,
             quotaWarningSoundEnabled: quotaWarnings.soundEnabled,
             quotaWarningMarkersVisible: quotaWarningMarkersVisible,
+            weeklyProgressWorkDays: weeklyProgressWorkDays,
             usageBarsShowUsed: usageBarsShowUsed,
             resetTimesShowAbsolute: resetTimesShowAbsolute,
             providerChangelogLinksEnabled: providerChangelogLinksEnabled,

Sources/CodexBar/SettingsStoreState.swift

@@ -19,6 +19,7 @@ struct SettingsDefaultsState {
     var quotaWarningWeeklyEnabled: Bool
     var quotaWarningSoundEnabled: Bool
     var quotaWarningMarkersVisible: Bool
+    var weeklyProgressWorkDays: Int?
     var usageBarsShowUsed: Bool
     var resetTimesShowAbsolute: Bool
     var providerChangelogLinksEnabled: Bool

Sources/CodexBar/StatusItemController+MenuCardModel.swift

@@ -107,6 +107,7 @@ extension StatusItemController {
                 .session: self.quotaWarningMarkerThresholds(provider: target, window: .session),
                 .weekly: self.quotaWarningMarkerThresholds(provider: target, window: .weekly),
             ],
+            workDaysPerWeek: self.settings.weeklyProgressWorkDays,
             now: now)
         return UsageMenuCardView.Model.make(input)
     }