@sriinnu/runic 1.0.0 → 2.0.0

package/Sources/Runic/Views/Menu/ProjectBudgetMenuView.swift

@@ -14,11 +14,11 @@ struct ProjectBudgetMenuView: View {
 
         var statusColor: Color {
             if self.isOverBudget {
-                return Color(red: 0.94, green: 0.36, blue: 0.36) // Red
+                Color(red: 0.94, green: 0.36, blue: 0.36) // Red
             } else if self.isNearLimit {
-                return Color(red: 0.94, green: 0.74, blue: 0.26) // Yellow
+                Color(red: 0.94, green: 0.74, blue: 0.26) // Yellow
             } else {
-                return Color(red: 0.46, green: 0.75, blue: 0.36) // Green
+                Color(red: 0.46, green: 0.75, blue: 0.36) // Green
             }
         }
     }
@@ -44,7 +44,7 @@ struct ProjectBudgetMenuView: View {
         VStack(alignment: .leading, spacing: RunicSpacing.sm) {
             HStack {
                 Text("Project Budgets")
-                    .font(.headline)
+                    .font(RunicFont.headline)
                     .fontWeight(.semibold)
                 Spacer()
                 Button {
@@ -52,9 +52,9 @@ struct ProjectBudgetMenuView: View {
                 } label: {
                     HStack(spacing: RunicSpacing.xxs) {
                         Image(systemName: "gearshape")
-                            .font(.caption)
+                            .font(RunicFont.caption)
                         Text("Configure")
-                            .font(.caption)
+                            .font(RunicFont.caption)
                     }
                 }
                 .buttonStyle(.plain)
@@ -64,13 +64,13 @@ struct ProjectBudgetMenuView: View {
             if model.isEmpty {
                 VStack(alignment: .leading, spacing: RunicSpacing.xs) {
                     Text("No budgets configured.")
-                        .font(.footnote)
+                        .font(RunicFont.footnote)
                         .foregroundStyle(.secondary)
                     Button {
                         self.onOpenPreferences()
                     } label: {
                         Text("Set up budgets in Preferences")
-                            .font(.caption)
+                            .font(RunicFont.caption)
                     }
                     .buttonStyle(.plain)
                     .foregroundStyle(.blue)
@@ -88,8 +88,8 @@ struct ProjectBudgetMenuView: View {
                 }
 
                 // Summary
-                let overBudget = model.filter { $0.isOverBudget }.count
-                let nearLimit = model.filter { $0.isNearLimit && !$0.isOverBudget }.count
+                let overBudget = model.count(where: { $0.isOverBudget })
+                let nearLimit = model.count(where: { $0.isNearLimit && !$0.isOverBudget })
                 if overBudget > 0 || nearLimit > 0 {
                     Divider()
                         .padding(.vertical, RunicSpacing.xxs)
@@ -98,20 +98,20 @@ struct ProjectBudgetMenuView: View {
                         if overBudget > 0 {
                             HStack(spacing: RunicSpacing.xxs) {
                                 Image(systemName: "exclamationmark.triangle.fill")
-                                    .font(.caption2)
+                                    .font(RunicFont.caption2)
                                     .foregroundStyle(Color(red: 0.94, green: 0.36, blue: 0.36))
                                 Text("\(overBudget) project\(overBudget == 1 ? "" : "s") over budget")
-                                    .font(.caption)
+                                    .font(RunicFont.caption)
                                     .foregroundStyle(.secondary)
                             }
                         }
                         if nearLimit > 0 {
                             HStack(spacing: RunicSpacing.xxs) {
                                 Image(systemName: "exclamationmark.circle.fill")
-                                    .font(.caption2)
+                                    .font(RunicFont.caption2)
                                     .foregroundStyle(Color(red: 0.94, green: 0.74, blue: 0.26))
                                 Text("\(nearLimit) project\(nearLimit == 1 ? "" : "s") near limit")
-                                    .font(.caption)
+                                    .font(RunicFont.caption)
                                     .foregroundStyle(.secondary)
                             }
                         }
@@ -167,34 +167,34 @@ private struct ProjectBudgetRow: View {
     var body: some View {
         VStack(alignment: .leading, spacing: RunicSpacing.xxs) {
             HStack(alignment: .firstTextBaseline) {
-                Text(project.projectName)
-                    .font(.body)
+                Text(self.project.projectName)
+                    .font(RunicFont.body)
                     .fontWeight(.medium)
                     .lineLimit(1)
                 Spacer()
                 Text(self.budgetText)
-                    .font(.caption)
+                    .font(RunicFont.caption)
                     .foregroundStyle(MenuHighlightStyle.secondary(self.isHighlighted))
             }
 
             UsageProgressBar(
-                percent: project.percentUsed,
-                tint: project.statusColor,
+                percent: self.project.percentUsed,
+                tint: self.project.statusColor,
                 accessibilityLabel: "Budget usage")
 
             HStack(alignment: .firstTextBaseline) {
-                Text(String(format: "%.0f%%", project.percentUsed))
-                    .font(.caption)
+                Text(String(format: "%.0f%%", self.project.percentUsed))
+                    .font(RunicFont.caption)
                     .foregroundStyle(self.statusTextColor)
                 Spacer()
-                if project.isOverBudget {
+                if self.project.isOverBudget {
                     Text("Over budget")
-                        .font(.caption)
+                        .font(RunicFont.caption)
                         .foregroundStyle(Color(red: 0.94, green: 0.36, blue: 0.36))
                         .fontWeight(.medium)
-                } else if project.isNearLimit {
+                } else if self.project.isNearLimit {
                     Text("Near limit")
-                        .font(.caption)
+                        .font(RunicFont.caption)
                         .foregroundStyle(Color(red: 0.94, green: 0.74, blue: 0.26))
                         .fontWeight(.medium)
                 }
@@ -208,13 +208,13 @@ private struct ProjectBudgetRow: View {
     }
 
     private var budgetText: String {
-        "\(UsageFormatter.usdString(project.spent)) / \(UsageFormatter.usdString(project.budget.monthlyLimit))"
+        "\(UsageFormatter.usdString(self.project.spent)) / \(UsageFormatter.usdString(self.project.budget.monthlyLimit))"
     }
 
     private var statusTextColor: Color {
         if self.isHighlighted {
             return MenuHighlightStyle.selectionText
         }
-        return project.statusColor
+        return self.project.statusColor
     }
 }

package/Sources/Runic/Views/Menu/ProviderTabBarView.swift

@@ -33,11 +33,11 @@ struct ProviderTabBarView: View {
                                     .aspectRatio(contentMode: .fit)
                                     .frame(width: 18, height: 18)
                             } else if tab.provider == nil {
-                            Image(systemName: "square.grid.2x2")
+                                Image(systemName: "square.grid.2x2")
                                     .font(.system(size: 14, weight: .medium))
                             }
                             Text(tab.label)
-                                .font(.system(.caption, design: .rounded))
+                                .font(RunicFont.caption)
                                 .fontWeight(tab.isSelected ? .semibold : .regular)
                                 .lineLimit(1)
                         }
@@ -47,16 +47,14 @@ struct ProviderTabBarView: View {
                             Capsule(style: .continuous)
                                 .fill(tab.isSelected
                                     ? tab.brandColor.opacity(RunicColors.Opacity.medium)
-                                    : Color(nsColor: .controlBackgroundColor).opacity(RunicColors.Opacity.subtle))
-                        )
+                                    : Color(nsColor: .controlBackgroundColor).opacity(RunicColors.Opacity.subtle)))
                         .overlay(
                             Capsule(style: .continuous)
                                 .stroke(
                                     tab.isSelected
                                         ? tab.brandColor.opacity(RunicColors.Opacity.strong)
                                         : Color(nsColor: .separatorColor).opacity(RunicColors.Opacity.light),
-                                    lineWidth: 0.5)
-                        )
+                                    lineWidth: 0.5))
                         .foregroundStyle(tab.isSelected ? tab.brandColor : .secondary)
                         .shadow(
                             color: tab.isSelected ? tab.brandColor.opacity(0.15) : .clear,

package/Sources/Runic/Views/Menu/SubscriptionUtilizationChartMenuView.swift

@@ -38,7 +38,7 @@ struct SubscriptionUtilizationChartMenuView: View {
         self.width = width
     }
 
-    private static let barColor = RunicColors.chartColor(at: 4)  // teal
+    private static let barColor = RunicColors.chartColor(at: 4) // teal
     private static let wastedColor = Color(nsColor: .systemGray).opacity(0.2)
 
     var body: some View {
@@ -50,7 +50,7 @@ struct SubscriptionUtilizationChartMenuView: View {
 
         VStack(alignment: .leading, spacing: RunicSpacing.xs) {
             Text("Utilization")
-                .font(.system(.subheadline, design: .rounded))
+                .font(RunicFont.subheadline)
                 .fontWeight(.semibold)
 
             Picker("", selection: self.$selectedPeriod) {
@@ -62,7 +62,7 @@ struct SubscriptionUtilizationChartMenuView: View {
 
             if model.bars.isEmpty {
                 Text("No utilization data available.")
-                    .font(.system(.footnote, design: .rounded))
+                    .font(RunicFont.footnote)
                     .foregroundStyle(.secondary)
                     .frame(height: 80)
             } else {
@@ -83,7 +83,7 @@ struct SubscriptionUtilizationChartMenuView: View {
                         AxisValueLabel {
                             if let pct = value.as(Int.self) {
                                 Text("\(pct)%")
-                                    .font(.system(.caption2, design: .rounded))
+                                    .font(RunicFont.caption2)
                                     .foregroundStyle(Color(nsColor: .tertiaryLabelColor))
                             }
                         }
@@ -92,7 +92,7 @@ struct SubscriptionUtilizationChartMenuView: View {
                 .chartXAxis {
                     AxisMarks(values: .automatic(desiredCount: 5)) { _ in
                         AxisValueLabel()
-                            .font(.system(.caption2, design: .rounded))
+                            .font(RunicFont.caption2)
                             .foregroundStyle(Color(nsColor: .tertiaryLabelColor))
                     }
                 }
@@ -104,7 +104,7 @@ struct SubscriptionUtilizationChartMenuView: View {
                     let used = Int(latest.usedPercent.rounded())
                     let unused = max(0, 100 - used)
                     Text("\(latest.label): \(used)% used, \(unused)% unused")
-                        .font(.system(.caption, design: .rounded))
+                        .font(RunicFont.caption)
                         .foregroundStyle(.secondary)
                 }
             }
@@ -159,7 +159,8 @@ struct SubscriptionUtilizationChartMenuView: View {
             // Aggregate by ISO week
             var weekBuckets: [(label: String, tokens: Int, date: Date, isThisWeek: Bool)] = []
             for weekOffset in stride(from: -3, through: 0, by: 1) {
-                guard let weekStart = calendar.date(byAdding: .weekOfYear, value: weekOffset, to: todayStart) else { continue }
+                guard let weekStart = calendar.date(byAdding: .weekOfYear, value: weekOffset, to: todayStart)
+                else { continue }
                 var total = 0
                 for dayOffset in 0..<7 {
                     guard let date = calendar.date(byAdding: .day, value: dayOffset, to: weekStart) else { continue }
@@ -171,20 +172,27 @@ struct SubscriptionUtilizationChartMenuView: View {
             let maxWeekTokens = weekBuckets.map(\.tokens).max() ?? 1
             let bars = weekBuckets.map { bucket in
                 let pct = maxWeekTokens > 0 ? Double(bucket.tokens) / Double(maxWeekTokens) * 100 : 0
-                return UtilizationBar(id: bucket.label, label: bucket.label, date: bucket.date, usedPercent: pct, isToday: bucket.isThisWeek)
+                return UtilizationBar(
+                    id: bucket.label,
+                    label: bucket.label,
+                    date: bucket.date,
+                    usedPercent: pct,
+                    isToday: bucket.isThisWeek)
             }
             return UtilizationModel(bars: bars)
 
         case .monthly:
             var monthBuckets: [(label: String, tokens: Int, date: Date, isThisMonth: Bool)] = []
             for monthOffset in stride(from: -2, through: 0, by: 1) {
-                guard let monthStart = calendar.date(byAdding: .month, value: monthOffset, to: todayStart) else { continue }
+                guard let monthStart = calendar.date(byAdding: .month, value: monthOffset, to: todayStart)
+                else { continue }
                 let monthComponents = calendar.dateComponents([.year, .month], from: monthStart)
                 guard let actualMonthStart = calendar.date(from: monthComponents),
                       let range = calendar.range(of: .day, in: .month, for: actualMonthStart) else { continue }
                 var total = 0
                 for dayOffset in 0..<range.count {
-                    guard let date = calendar.date(byAdding: .day, value: dayOffset, to: actualMonthStart) else { continue }
+                    guard let date = calendar.date(byAdding: .day, value: dayOffset, to: actualMonthStart)
+                    else { continue }
                     total += tokensByDay[formatter.string(from: date)] ?? 0
                 }
                 let label = monthStart.formatted(.dateTime.month(.abbreviated))
@@ -193,7 +201,12 @@ struct SubscriptionUtilizationChartMenuView: View {
             let maxMonthTokens = monthBuckets.map(\.tokens).max() ?? 1
             let bars = monthBuckets.map { bucket in
                 let pct = maxMonthTokens > 0 ? Double(bucket.tokens) / Double(maxMonthTokens) * 100 : 0
-                return UtilizationBar(id: bucket.label, label: bucket.label, date: bucket.date, usedPercent: pct, isToday: bucket.isThisMonth)
+                return UtilizationBar(
+                    id: bucket.label,
+                    label: bucket.label,
+                    date: bucket.date,
+                    usedPercent: pct,
+                    isToday: bucket.isThisMonth)
             }
             return UtilizationModel(bars: bars)
         }

package/Sources/Runic/Views/Menu/UsageBreakdownChartMenuView.swift

@@ -32,7 +32,7 @@ struct UsageBreakdownChartMenuView: View {
         VStack(alignment: .leading, spacing: RunicSpacing.sm) {
             if model.points.isEmpty {
                 Text("No usage breakdown data.")
-                    .font(.footnote)
+                    .font(RunicFont.footnote)
                     .foregroundStyle(.secondary)
             } else {
                 Chart {
@@ -58,7 +58,7 @@ struct UsageBreakdownChartMenuView: View {
                         AxisGridLine().foregroundStyle(Color.clear)
                         AxisTick().foregroundStyle(Color.clear)
                         AxisValueLabel(format: .dateTime.month(.abbreviated).day())
-                            .font(.caption2)
+                            .font(RunicFont.caption2)
                             .foregroundStyle(Color(nsColor: .tertiaryLabelColor))
                     }
                 }
@@ -88,13 +88,13 @@ struct UsageBreakdownChartMenuView: View {
                 let detail = self.detailLines(model: model)
                 VStack(alignment: .leading, spacing: 0) {
                     Text(detail.primary)
-                        .font(.system(.caption, design: .rounded))
+                        .font(RunicFont.caption)
                         .foregroundStyle(.secondary)
                         .lineLimit(1)
                         .truncationMode(.tail)
                         .frame(height: 16, alignment: .leading)
                     Text(detail.secondary ?? " ")
-                        .font(.system(.caption, design: .rounded))
+                        .font(RunicFont.caption)
                         .foregroundStyle(.secondary)
                         .lineLimit(1)
                         .truncationMode(.tail)
@@ -113,7 +113,7 @@ struct UsageBreakdownChartMenuView: View {
                                 .fill(model.color(for: service))
                                 .frame(width: RunicSpacing.chartLegendDot, height: RunicSpacing.chartLegendDot)
                             Text(service)
-                                .font(.caption2)
+                                .font(RunicFont.caption2)
                                 .foregroundStyle(.secondary)
                                 .lineLimit(1)
                         }

package/Sources/Runic/Views/Menu/UsageHeatmapMenuView.swift

@@ -46,12 +46,12 @@ struct UsageHeatmapMenuView: View {
         let model = Self.makeModel(from: self.hourlySummaries)
         VStack(alignment: .leading, spacing: RunicSpacing.sm) {
             Text("Usage Heatmap (24×7)")
-                .font(.headline)
+                .font(RunicFont.headline)
                 .fontWeight(.semibold)
 
             if model.isEmpty {
                 Text("No heatmap data.")
-                    .font(.footnote)
+                    .font(RunicFont.footnote)
                     .foregroundStyle(.secondary)
             } else {
                 ScrollView(.horizontal, showsIndicators: true) {
@@ -62,7 +62,7 @@ struct UsageHeatmapMenuView: View {
                                 .frame(width: 40, alignment: .leading)
                             ForEach(0..<24, id: \.self) { hour in
                                 Text(self.hourLabel(hour))
-                                    .font(.caption2)
+                                    .font(RunicFont.caption2)
                                     .foregroundStyle(.secondary)
                                     .frame(width: 40, alignment: .center)
                                     .lineLimit(1)
@@ -73,7 +73,7 @@ struct UsageHeatmapMenuView: View {
                         ForEach(0..<7, id: \.self) { weekday in
                             HStack(spacing: 2) {
                                 Text(self.weekdayLabel(weekday))
-                                    .font(.caption)
+                                    .font(RunicFont.caption)
                                     .foregroundStyle(.secondary)
                                     .frame(width: 38, alignment: .leading)
 
@@ -99,7 +99,7 @@ struct UsageHeatmapMenuView: View {
                         // Legend
                         HStack(spacing: RunicSpacing.xs) {
                             Text("Low")
-                                .font(.caption2)
+                                .font(RunicFont.caption2)
                                 .foregroundStyle(.secondary)
                             HStack(spacing: 2) {
                                 ForEach(0..<5, id: \.self) { level in
@@ -110,7 +110,7 @@ struct UsageHeatmapMenuView: View {
                                 }
                             }
                             Text("High")
-                                .font(.caption2)
+                                .font(RunicFont.caption2)
                                 .foregroundStyle(.secondary)
                         }
                         .padding(.top, RunicSpacing.xs)
@@ -121,7 +121,7 @@ struct UsageHeatmapMenuView: View {
 
                 let detail = self.detailText(model: model)
                 Text(detail)
-                    .font(.caption)
+                    .font(RunicFont.caption)
                     .foregroundStyle(.secondary)
                     .lineLimit(2)
                     .frame(height: 32, alignment: .leading)
@@ -229,4 +229,3 @@ private struct HeatmapCellView: View {
         .cornerRadius(RunicCornerRadius.xs)
     }
 }
-

package/Sources/Runic/Views/Menu/UsageTimelineChartMenuView.swift

@@ -5,30 +5,29 @@ import SwiftUI
 @MainActor
 struct UsageTimelineChartMenuView: View {
     enum TimeRange: String, CaseIterable {
-        case oneHour = "1h"
-        case sixHours = "6h"
-        case oneDay = "1d"
+        case threeDays = "3d"
         case sevenDays = "7d"
         case thirtyDays = "30d"
+        case quarter = "90d"
+        case year = "1y"
 
         var cutoffInterval: TimeInterval {
             switch self {
-            case .oneHour: return -3600
-            case .sixHours: return -21600
-            case .oneDay: return -86400
-            case .sevenDays: return -604800
-            case .thirtyDays: return -2592000
+            case .threeDays: -259_200
+            case .sevenDays: -604_800
+            case .thirtyDays: -2_592_000
+            case .quarter: -7_776_000
+            case .year: -31_536_000
             }
         }
 
         var usesHourlyData: Bool {
-            switch self {
-            case .oneHour, .sixHours, .oneDay: return true
-            default: return false
-            }
+            false
         }
 
-        var label: String { self.rawValue }
+        var label: String {
+            self.rawValue
+        }
     }
 
     private struct Point: Identifiable {
@@ -48,7 +47,7 @@ struct UsageTimelineChartMenuView: View {
     private let dailySummaries: [UsageLedgerDailySummary]
     private let hourlySummaries: [UsageLedgerHourlySummary]
     private let width: CGFloat
-    @State private var selectedTimeRange: TimeRange = .oneDay
+    @State private var selectedTimeRange: TimeRange = .sevenDays
     @State private var selectedKey: String?
 
     init(
@@ -65,14 +64,12 @@ struct UsageTimelineChartMenuView: View {
     private static let selectionBandColor = Color(nsColor: .labelColor).opacity(0.1)
 
     var body: some View {
-        let model = self.selectedTimeRange.usesHourlyData
-            ? Self.makeHourlyModel(from: self.hourlySummaries, timeRange: self.selectedTimeRange)
-            : Self.makeDailyModel(from: self.dailySummaries, timeRange: self.selectedTimeRange)
+        let model = Self.makeDailyModel(from: self.dailySummaries, timeRange: self.selectedTimeRange)
 
         VStack(alignment: .leading, spacing: RunicSpacing.xs) {
             // Header on its own line
             Text("Timeline")
-                .font(.system(.subheadline, design: .rounded))
+                .font(RunicFont.subheadline)
                 .fontWeight(.semibold)
 
             // Range picker on its own line
@@ -85,7 +82,7 @@ struct UsageTimelineChartMenuView: View {
 
             if model.points.isEmpty {
                 Text("No data for selected range.")
-                    .font(.system(.footnote, design: .rounded))
+                    .font(RunicFont.footnote)
                     .foregroundStyle(.secondary)
                     .frame(height: 100)
             } else {
@@ -119,7 +116,7 @@ struct UsageTimelineChartMenuView: View {
                             .symbolSize(60)
                             .annotation(position: .top, spacing: 4) {
                                 Text("Peak")
-                                    .font(.system(.caption2, design: .rounded))
+                                    .font(RunicFont.caption2)
                                     .foregroundStyle(Color(nsColor: .systemYellow))
                             }
                     }
@@ -131,7 +128,7 @@ struct UsageTimelineChartMenuView: View {
                         AxisValueLabel {
                             if let tokens = value.as(Int.self) {
                                 Text(UsageFormatter.tokenCountString(tokens))
-                                    .font(.system(.caption2, design: .rounded))
+                                    .font(RunicFont.caption2)
                                     .foregroundStyle(Color(nsColor: .tertiaryLabelColor))
                             }
                         }
@@ -142,7 +139,7 @@ struct UsageTimelineChartMenuView: View {
                         AxisGridLine(stroke: StrokeStyle(lineWidth: 0.5, dash: [4, 3]))
                             .foregroundStyle(Color(nsColor: .separatorColor).opacity(0.3))
                         AxisValueLabel(format: model.xAxisFormat)
-                            .font(.system(.caption2, design: .rounded))
+                            .font(RunicFont.caption2)
                             .foregroundStyle(Color(nsColor: .tertiaryLabelColor))
                     }
                 }
@@ -170,7 +167,7 @@ struct UsageTimelineChartMenuView: View {
                 // Detail line
                 let detail = self.detailText(model: model)
                 Text(detail)
-                    .font(.system(.caption, design: .rounded))
+                    .font(RunicFont.caption)
                     .foregroundStyle(.secondary)
                     .lineLimit(1)
                     .truncationMode(.tail)
@@ -191,7 +188,8 @@ struct UsageTimelineChartMenuView: View {
         }
         .chartPanelStyle(width: self.width)
         .accessibilityElement(children: .ignore)
-        .accessibilityLabel("Usage timeline chart showing \(model.points.count) data points over \(self.selectedTimeRange.label)")
+        .accessibilityLabel(
+            "Usage timeline chart showing \(model.points.count) data points over \(self.selectedTimeRange.label)")
     }
 
     // MARK: - Stat cell
@@ -203,10 +201,10 @@ struct UsageTimelineChartMenuView: View {
         var body: some View {
             VStack(alignment: .leading, spacing: RunicSpacing.xxxs) {
                 Text(self.label)
-                    .font(.system(.caption2, design: .rounded))
+                    .font(RunicFont.caption2)
                     .foregroundStyle(.tertiary)
                 Text(self.value)
-                    .font(.system(.caption, design: .rounded))
+                    .font(RunicFont.caption)
                     .fontWeight(.medium)
             }
         }
@@ -261,10 +259,12 @@ struct UsageTimelineChartMenuView: View {
             }
         }
 
-        let desiredAxisCount: Int = switch timeRange {
-        case .oneHour, .sixHours, .oneDay: 4
+        let desiredAxisCount = switch timeRange {
+        case .threeDays: 3
         case .sevenDays: 5
         case .thirtyDays: 6
+        case .quarter: 6
+        case .year: 6
         }
 
         return Model(
@@ -281,54 +281,6 @@ struct UsageTimelineChartMenuView: View {
             isHourly: false)
     }
 
-    // MARK: - Hourly model
-
-    private static func makeHourlyModel(from summaries: [UsageLedgerHourlySummary], timeRange: TimeRange) -> Model {
-        let now = Date()
-        let cutoffDate = now.addingTimeInterval(timeRange.cutoffInterval)
-        let filtered = summaries.filter { $0.hourStart >= cutoffDate }
-        let sorted = filtered.sorted { $0.hourStart < $1.hourStart }
-
-        var points: [Point] = []
-        var pointsByKey: [String: Point] = [:]
-        var dateKeys: [(key: String, date: Date)] = []
-        var peak: Point?
-        var totalTokens = 0
-
-        for summary in sorted {
-            let tokens = summary.totals.totalTokens
-            totalTokens += tokens
-            let point = Point(date: summary.hourStart, totalTokens: tokens, key: summary.hourKey)
-            points.append(point)
-            pointsByKey[summary.hourKey] = point
-            dateKeys.append((summary.hourKey, summary.hourStart))
-
-            if peak == nil || tokens > (peak?.totalTokens ?? 0) {
-                peak = point
-            }
-        }
-
-        let desiredAxisCount: Int = switch timeRange {
-        case .oneHour: 4
-        case .sixHours: 6
-        case .oneDay: 8
-        default: 6
-        }
-
-        return Model(
-            points: points,
-            pointsByKey: pointsByKey,
-            dateKeys: dateKeys,
-            peakPoint: peak,
-            totalTokens: totalTokens,
-            averagePerPeriod: points.isEmpty ? 0 : totalTokens / max(1, points.count),
-            peakTokens: peak?.totalTokens ?? 0,
-            totalCostUSD: nil,
-            desiredAxisCount: desiredAxisCount,
-            xAxisFormat: .dateTime.hour(.defaultDigits(amPM: .narrow)),
-            isHourly: true)
-    }
-
     // MARK: - Interaction
 
     private func selectionBandRect(model: Model, proxy: ChartProxy, geo: GeometryProxy) -> CGRect? {

package/Sources/Runic/Views/Menu/UsageWindowComparisonChartMenuView.swift

@@ -49,12 +49,12 @@ struct UsageWindowComparisonChartMenuView: View {
 
         VStack(alignment: .leading, spacing: RunicSpacing.xs) {
             Text("Windows")
-                .font(.system(.subheadline, design: .rounded))
+                .font(RunicFont.subheadline)
                 .fontWeight(.semibold)
 
             if model.points.isEmpty {
                 Text("No usage window data available.")
-                    .font(.system(.footnote, design: .rounded))
+                    .font(RunicFont.footnote)
                     .foregroundStyle(.secondary)
                     .frame(height: 80)
             } else {
@@ -64,7 +64,8 @@ struct UsageWindowComparisonChartMenuView: View {
                             x: .value("Date", point.date),
                             y: .value("%", point.percent),
                             series: .value("Window", point.series))
-                            .foregroundStyle(point.series == self.primaryLabel ? Self.primaryColor : Self.secondaryColor)
+                            .foregroundStyle(point.series == self.primaryLabel ? Self.primaryColor : Self
+                                .secondaryColor)
                             .lineStyle(StrokeStyle(lineWidth: 2))
                             .interpolationMethod(.catmullRom)
                     }
@@ -77,7 +78,7 @@ struct UsageWindowComparisonChartMenuView: View {
                         AxisValueLabel {
                             if let pct = value.as(Int.self) {
                                 Text("\(pct)%")
-                                    .font(.system(.caption2, design: .rounded))
+                                    .font(RunicFont.caption2)
                                     .foregroundStyle(Color(nsColor: .tertiaryLabelColor))
                             }
                         }
@@ -88,7 +89,7 @@ struct UsageWindowComparisonChartMenuView: View {
                         AxisGridLine(stroke: StrokeStyle(lineWidth: 0.5, dash: [4, 3]))
                             .foregroundStyle(Color(nsColor: .separatorColor).opacity(0.3))
                         AxisValueLabel(format: .dateTime.month(.abbreviated).day())
-                            .font(.system(.caption2, design: .rounded))
+                            .font(RunicFont.caption2)
                             .foregroundStyle(Color(nsColor: .tertiaryLabelColor))
                     }
                 }
@@ -102,7 +103,7 @@ struct UsageWindowComparisonChartMenuView: View {
                             .fill(Self.primaryColor)
                             .frame(width: RunicSpacing.chartLegendDot, height: RunicSpacing.chartLegendDot)
                         Text(self.primaryLabel)
-                            .font(.system(.caption2, design: .rounded))
+                            .font(RunicFont.caption2)
                             .foregroundStyle(.secondary)
                     }
                     if let secondaryLabel = self.secondaryLabel {
@@ -111,7 +112,7 @@ struct UsageWindowComparisonChartMenuView: View {
                                 .fill(Self.secondaryColor)
                                 .frame(width: RunicSpacing.chartLegendDot, height: RunicSpacing.chartLegendDot)
                             Text(secondaryLabel)
-                                .font(.system(.caption2, design: .rounded))
+                                .font(RunicFont.caption2)
                                 .foregroundStyle(.secondary)
                         }
                     }