@sriinnu/runic 1.0.0 → 2.0.0

package/Sources/Runic/Controllers/StatusItemController+Menu.swift

@@ -1,12 +1,12 @@
 import AppKit
-import RunicCore
 import Observation
+import RunicCore
 import SwiftUI
 
 // MARK: - NSMenu construction
 
 extension StatusItemController {
-    static let menuCardBaseWidth: CGFloat = 310
+    static let menuCardBaseWidth: CGFloat = 340
     private static let menuOpenPingDelay: Duration = PerformanceConstants.menuOpenPingDelay
 
     func menuCardWidth(for providers: [UsageProvider], menu: NSMenu? = nil) -> CGFloat {
@@ -148,8 +148,9 @@ extension StatusItemController {
                 width: menuWidth,
                 menu: menu)
             if let tabBarView {
-                let hosting = MenuHostingView(rootView: tabBarView)
-                let controller = NSHostingController(rootView: tabBarView)
+                let monoTabBar = tabBarView.runicTypography()
+                let hosting = MenuHostingView(rootView: monoTabBar)
+                let controller = NSHostingController(rootView: monoTabBar)
                 let size = controller.sizeThatFits(in: CGSize(width: menuWidth, height: .greatestFiniteMagnitude))
                 hosting.frame = NSRect(origin: .zero, size: NSSize(width: menuWidth, height: size.height))
                 let tabItem = NSMenuItem()
@@ -172,8 +173,9 @@ extension StatusItemController {
             let overviewView = self.makeOverviewView(
                 providers: enabledProviders,
                 width: menuWidth)
-            let hosting = MenuHostingView(rootView: overviewView)
-            let controller = NSHostingController(rootView: overviewView)
+            let monoOverview = overviewView.runicTypography()
+            let hosting = MenuHostingView(rootView: monoOverview)
+            let controller = NSHostingController(rootView: monoOverview)
             let size = controller.sizeThatFits(in: CGSize(width: menuWidth, height: .greatestFiniteMagnitude))
             hosting.frame = NSRect(origin: .zero, size: NSSize(width: menuWidth, height: size.height))
             let overviewItem = NSMenuItem()
@@ -266,10 +268,10 @@ extension StatusItemController {
                     let item = NSMenuItem(title: text, action: nil, keyEquivalent: "")
                     item.isEnabled = false
                     if style == .headline {
-                        let font = NSFont.systemFont(ofSize: NSFont.systemFontSize, weight: .semibold)
+                        let font = RunicFont.nsFont(size: NSFont.systemFontSize, weight: .semibold)
                         item.attributedTitle = NSAttributedString(string: text, attributes: [.font: font])
                     } else if style == .secondary {
-                        let font = NSFont.systemFont(ofSize: NSFont.smallSystemFontSize)
+                        let font = RunicFont.nsFont(size: NSFont.smallSystemFontSize)
                         item.attributedTitle = NSAttributedString(
                             string: text,
                             attributes: [.font: font, .foregroundColor: NSColor.secondaryLabelColor])
@@ -306,6 +308,8 @@ extension StatusItemController {
                 menu.addItem(.separator())
             }
         }
+
+        self.applyRunicFont(to: menu)
     }
 
     func makeMenu(for provider: UsageProvider?) -> NSMenu {
@@ -432,6 +436,13 @@ extension StatusItemController {
             totalToday += todayTokens
 
             let resetDesc = snapshot?.primary.resetDescription
+            let windowLabel = snapshot?.primary.label?.trimmingCharacters(in: .whitespacesAndNewlines)
+            let topModel = self.store.ledgerTopModel(for: provider)
+            let topModelContext: String? = if let model = topModel?.model {
+                UsageFormatter.modelContextLabel(for: model)
+            } else {
+                Self.defaultContextLabel(for: provider)
+            }
 
             summaries.append(OverviewMenuView.ProviderSummary(
                 id: provider.rawValue,
@@ -441,7 +452,9 @@ extension StatusItemController {
                 usedPercent: usedPercent,
                 todayTokens: todayTokens,
                 brandColor: brandColor,
-                resetDescription: resetDesc))
+                resetDescription: resetDesc,
+                windowLabel: windowLabel,
+                topModelContext: topModelContext))
 
             // Chart data — last 7 days
             let dailySummaries = self.store.ledgerAllDailySummary(for: provider)
@@ -450,7 +463,8 @@ extension StatusItemController {
                     id: "\(provider.rawValue)-\(summary.dayKey)",
                     date: summary.dayStart,
                     tokens: summary.totals.totalTokens,
-                    provider: meta.displayName))
+                    provider: meta.displayName,
+                    color: brandColor))
             }
         }
 
@@ -461,6 +475,7 @@ extension StatusItemController {
             summaries: activeSummaries.isEmpty ? summaries : activeSummaries,
             chartPoints: chartPoints,
             totalTodayTokens: totalToday,
+            totalProviders: UsageProvider.allCases.count,
             width: width)
     }
 
@@ -477,6 +492,23 @@ extension StatusItemController {
         return abbreviations[name] ?? String(name.prefix(6))
     }
 
+    /// Default flagship model context window per provider, loaded from
+    /// `Resources/provider-context-windows.json`. Update the JSON to add/change
+    /// context windows without recompiling.
+    private static let defaultContextWindows: [String: Int] = {
+        struct Entry: Decodable { let contextK: Int }
+        guard let url = Bundle.main.url(forResource: "provider-context-windows", withExtension: "json"),
+              let data = try? Data(contentsOf: url),
+              let dict = try? JSONDecoder().decode([String: Entry].self, from: data)
+        else { return [:] }
+        return dict.mapValues(\.contextK)
+    }()
+
+    private static func defaultContextLabel(for provider: UsageProvider) -> String? {
+        guard let k = self.defaultContextWindows[provider.rawValue] else { return nil }
+        return k >= 1000 ? "ctx \(k / 1000)M" : "ctx \(k)K"
+    }
+
     private func resolvedMenuProvider() -> UsageProvider? {
         let enabled = self.store.enabledProviders()
         if enabled.isEmpty { return .codex }
@@ -650,7 +682,7 @@ extension StatusItemController {
     }
 
     private func isHostedSubviewMenu(_ menu: NSMenu) -> Bool {
-        let ids: Set<String> = [
+        let ids: Set = [
             "usageBreakdownChart",
             "creditsHistoryChart",
             "costHistoryChart",
@@ -810,7 +842,7 @@ private final class ProviderSwitcherView: NSView {
             button.bezelStyle = .regularSquare
             button.isBordered = false
             button.controlSize = .small
-            button.font = NSFont.systemFont(ofSize: 12, weight: .medium)
+            button.font = RunicFont.nsFont(size: 12, weight: .medium)
             button.setButtonType(.toggle)
             button.contentTintColor = self.unselectedTextColor
             button.alignment = .center
@@ -1196,7 +1228,7 @@ private final class ProviderSwitcherView: NSView {
             if self.stackedIcons,
                self.segments.indices.contains(index)
             {
-                let font = NSFont.systemFont(ofSize: NSFont.smallSystemFontSize)
+                let font = RunicFont.nsFont(size: NSFont.smallSystemFontSize)
                 let titleWidth = ceil((self.segments[index].title as NSString).size(withAttributes: [.font: font])
                     .width)
                 let contentPadding: CGFloat = 6 + 6
@@ -1330,7 +1362,8 @@ private final class ProviderSwitcherView: NSView {
 
         let track = NSView()
         track.wantsLayer = true
-        track.layer?.backgroundColor = NSColor.tertiaryLabelColor.withAlphaComponent(CGFloat(RunicColors.Opacity.medium)).cgColor
+        track.layer?.backgroundColor = NSColor.tertiaryLabelColor
+            .withAlphaComponent(CGFloat(RunicColors.Opacity.medium)).cgColor
         track.layer?.cornerRadius = 3
         track.layer?.masksToBounds = true
         track.translatesAutoresizingMaskIntoConstraints = false

package/Sources/Runic/Controllers/StatusItemController+MenuCards.swift

@@ -64,8 +64,8 @@ extension StatusItemController {
     {
         let menuMode = self.settings.menuMode
         let includeSummarySections = menuMode != .glance
-        let includeInsights = menuMode == .`operator`
-        let includeActions = menuMode == .`operator`
+        let includeInsights = menuMode == .operator
+        let includeActions = menuMode == .operator
         let hasUsageBlock = !model.metrics.isEmpty || model.placeholder != nil
         let hasCredits = includeSummarySections && model.creditsText != nil
         let hasExtraUsage = includeSummarySections && model.providerCost != nil
@@ -282,7 +282,9 @@ extension StatusItemController {
                 formatter.dateFormat = "yyyy-MM-dd"
                 formatter.timeZone = TimeZone.current
                 var tokensByDay: [String: Int] = [:]
-                for d in allDaily { tokensByDay[d.dayKey, default: 0] += d.totals.totalTokens }
+                for d in allDaily {
+                    tokensByDay[d.dayKey, default: 0] += d.totals.totalTokens
+                }
                 return (0..<7).map { offset in
                     guard let date = calendar.date(byAdding: .day, value: offset - 6, to: todayStart) else { return 0 }
                     return tokensByDay[formatter.string(from: date)] ?? 0
@@ -306,7 +308,7 @@ extension StatusItemController {
         let updatedAt: Date? = [
             self.store.snapshot(for: provider)?.updatedAt,
             self.store.ledgerUpdatedAt[provider],
-        ].compactMap { $0 }.max()
+        ].compactMap(\.self).max()
 
         if let updatedAt {
             let timestampView = self.menuCardContent(width: width, sidebar: sidebar, showIcons: true) {

package/Sources/Runic/Controllers/StatusItemController+MenuHelpers.swift

@@ -36,16 +36,26 @@ extension StatusItemController {
     }
 
     final class MenuHostingView<Content: View>: NSHostingView<Content> {
-        override var allowsVibrancy: Bool { true }
-        override var isOpaque: Bool { false }
+        override var allowsVibrancy: Bool {
+            true
+        }
+
+        override var isOpaque: Bool {
+            false
+        }
     }
 
     @MainActor
     final class MenuCardItemHostingView<Content: View>: NSHostingView<Content>, MenuCardHighlighting,
     MenuCardMeasuring {
         private let highlightState: MenuCardHighlightState
-        override var allowsVibrancy: Bool { true }
-        override var isOpaque: Bool { false }
+        override var allowsVibrancy: Bool {
+            true
+        }
+
+        override var isOpaque: Bool {
+            false
+        }
 
         override var intrinsicContentSize: NSSize {
             let size = super.intrinsicContentSize
@@ -98,6 +108,7 @@ extension StatusItemController {
 
         var body: some View {
             self.content
+                .runicTypography()
                 .environment(\.menuItemHighlighted, self.highlightState.isHighlighted)
                 .foregroundStyle(MenuHighlightStyle.primary(self.highlightState.isHighlighted))
                 .background(alignment: .topLeading) {
@@ -111,7 +122,7 @@ extension StatusItemController {
                 .overlay(alignment: .topTrailing) {
                     if self.showsSubmenuIndicator {
                         Image(systemName: "chevron.right")
-                            .font(.caption2.weight(.semibold))
+                            .font(RunicFont.caption2.weight(.semibold))
                             .foregroundStyle(MenuHighlightStyle.secondary(self.highlightState.isHighlighted))
                             .padding(.top, RunicSpacing.xs)
                             .padding(.trailing, RunicSpacing.xs)
@@ -142,7 +153,7 @@ extension StatusItemController {
             self.iconView.imageScaling = .scaleNone
             self.iconView.translatesAutoresizingMaskIntoConstraints = false
 
-            self.titleField.font = NSFont.menuFont(ofSize: NSFont.systemFontSize)
+            self.titleField.font = RunicFont.nsFont(size: NSFont.systemFontSize)
             self.titleField.lineBreakMode = .byTruncatingTail
             self.titleField.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
 
@@ -217,11 +228,11 @@ extension StatusItemController {
     // MARK: - Sidebar content builder
 
     @ViewBuilder
-    func menuCardContent<Content: View>(
+    func menuCardContent(
         width: CGFloat,
         sidebar: MenuCardSidebarConfig?,
         showIcons: Bool,
-        @ViewBuilder content: @escaping (CGFloat) -> Content) -> some View
+        @ViewBuilder content: @escaping (CGFloat) -> some View) -> some View
     {
         if let sidebar {
             ProviderSidebarMenuCardView(
@@ -325,8 +336,8 @@ extension StatusItemController {
         let image = NSImage(
             systemSymbolName: MenuDescriptor.MenuActionSystemImage.refresh.rawValue,
             accessibilityDescription: nil) ?? NSImage(
-                systemSymbolName: "arrow.triangle.2.circlepath",
-                accessibilityDescription: nil)
+            systemSymbolName: "arrow.triangle.2.circlepath",
+            accessibilityDescription: nil)
         image?.isTemplate = true
         image?.size = NSSize(width: 16, height: 16)
         let view = MenuActionButtonView(title: title, image: image) { [weak self] in
@@ -363,14 +374,14 @@ extension StatusItemController {
         container.alphaValue = isEnabled ? 1.0 : 0.7
 
         let titleField = NSTextField(labelWithString: title)
-        titleField.font = NSFont.menuFont(ofSize: NSFont.systemFontSize)
+        titleField.font = RunicFont.nsFont(size: NSFont.systemFontSize)
         titleField.textColor = NSColor.labelColor
         titleField.lineBreakMode = .byTruncatingTail
         titleField.maximumNumberOfLines = 1
         titleField.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
 
         let subtitleField = NSTextField(labelWithString: subtitle)
-        subtitleField.font = NSFont.menuFont(ofSize: NSFont.smallSystemFontSize)
+        subtitleField.font = RunicFont.nsFont(size: NSFont.smallSystemFontSize)
         subtitleField.textColor = NSColor.secondaryLabelColor
         subtitleField.lineBreakMode = .byTruncatingTail
         subtitleField.maximumNumberOfLines = 1
@@ -392,4 +403,21 @@ extension StatusItemController {
 
         return container
     }
+
+    // MARK: - Fira Code menu font post-processor
+
+    /// Recursively apply Fira Code to every NSMenuItem that uses a plain title (no custom view).
+    func applyRunicFont(to menu: NSMenu) {
+        for item in menu.items {
+            guard !item.isSeparatorItem, item.view == nil, !item.title.isEmpty else { continue }
+            if item.attributedTitle == nil {
+                item.attributedTitle = NSAttributedString(
+                    string: item.title,
+                    attributes: [.font: RunicFont.nsFont(size: NSFont.systemFontSize)])
+            }
+            if let submenu = item.submenu {
+                self.applyRunicFont(to: submenu)
+            }
+        }
+    }
 }

package/Sources/Runic/Controllers/StatusItemController.swift

@@ -1,51 +1,51 @@
 import AppKit
-import RunicCore
 import Observation
 import QuartzCore
+import RunicCore
 import SwiftUI
 
-/// **StatusItemController** - Manages macOS menubar status item and dropdown menu
-///
-/// **Purpose:**
-/// Coordinates the menubar icon, animations, menu construction, and user interactions.
-/// Acts as the bridge between AppKit (NSStatusItem) and SwiftUI (menu cards).
-///
-/// **Responsibilities:**
-/// - Create and manage NSStatusItem in menubar
-/// - Coordinate icon rendering via IconRenderer
-/// - Build rich NSMenu with embedded SwiftUI views
-/// - Handle animation lifecycle (60 FPS during pings)
-/// - Schedule background "ping" operations when menu opens
-/// - Manage keyboard shortcuts and user actions
-///
-/// **Architecture Pattern:**
-/// This file is split across 4 files via extensions:
-/// - `StatusItemController.swift` - Core setup (318 lines)
-/// - `StatusItemController+Menu.swift` - Menu construction (1878 lines)
-/// - `StatusItemController+Actions.swift` - User actions (200 lines)
-/// - `StatusItemController+Animation.swift` - Animation system (469 lines)
-///
-/// **Performance:**
-/// - **60 FPS cap** during active pings (PerformanceConstants.menubarFPS)
-/// - **Auto-stop animations** when data loaded or error encountered
-/// - **1.2s delay** before background ping when menu opens (reduce perceived lag)
-///
-/// **Dependencies:**
-/// - `UsageStore` - Data source
-/// - `SettingsStore` - User preferences
-/// - `IconRenderer` - Icon generation
-/// - `MenuCardView` - SwiftUI menu content
-///
-/// **Usage:**
-/// ```swift
-/// let controller = StatusItemController(
-///     store: usageStore,
-///     settings: settingsStore,
-///     account: accountInfo,
-///     updater: updater,
-///     preferencesSelection: selection
-/// )
-/// ```
+// **StatusItemController** - Manages macOS menubar status item and dropdown menu
+//
+// **Purpose:**
+// Coordinates the menubar icon, animations, menu construction, and user interactions.
+// Acts as the bridge between AppKit (NSStatusItem) and SwiftUI (menu cards).
+//
+// **Responsibilities:**
+// - Create and manage NSStatusItem in menubar
+// - Coordinate icon rendering via IconRenderer
+// - Build rich NSMenu with embedded SwiftUI views
+// - Handle animation lifecycle (60 FPS during pings)
+// - Schedule background "ping" operations when menu opens
+// - Manage keyboard shortcuts and user actions
+//
+// **Architecture Pattern:**
+// This file is split across 4 files via extensions:
+// - `StatusItemController.swift` - Core setup (318 lines)
+// - `StatusItemController+Menu.swift` - Menu construction (1878 lines)
+// - `StatusItemController+Actions.swift` - User actions (200 lines)
+// - `StatusItemController+Animation.swift` - Animation system (469 lines)
+//
+// **Performance:**
+// - **60 FPS cap** during active pings (PerformanceConstants.menubarFPS)
+// - **Auto-stop animations** when data loaded or error encountered
+// - **1.2s delay** before background ping when menu opens (reduce perceived lag)
+//
+// **Dependencies:**
+// - `UsageStore` - Data source
+// - `SettingsStore` - User preferences
+// - `IconRenderer` - Icon generation
+// - `MenuCardView` - SwiftUI menu content
+//
+// **Usage:**
+// ```swift
+// let controller = StatusItemController(
+//     store: usageStore,
+//     settings: settingsStore,
+//     account: accountInfo,
+//     updater: updater,
+//     preferencesSelection: selection
+// )
+// ```
 
 // MARK: - Status item controller (AppKit-hosted icons, SwiftUI popovers)
 

package/Sources/Runic/Core/BudgetNotificationManager.swift

@@ -59,7 +59,8 @@ final class BudgetNotificationManager {
                 let title = "Budget Alert: \(projectName)"
                 let body = "Projected to exceed \(limitStr) limit by \(overshootStr) this month"
 
-                self.logger.info("posting budget breach notification",
+                self.logger.info(
+                    "posting budget breach notification",
                     metadata: [
                         "provider": provider.rawValue,
                         "project": projectKey,

package/Sources/Runic/Core/Login/ClaudeLoginRunner.swift

@@ -1,9 +1,9 @@
-import RunicCore
 import Darwin
 import Foundation
+import RunicCore
 
 struct ClaudeLoginRunner {
-    enum Phase: Sendable {
+    enum Phase {
         case requesting
         case waitingBrowser
     }

package/Sources/Runic/Core/Login/CodexLoginRunner.swift

@@ -1,6 +1,6 @@
-import RunicCore
 import Darwin
 import Foundation
+import RunicCore
 
 struct CodexLoginRunner {
     struct Result {

package/Sources/Runic/Core/Login/CursorLoginRunner.swift

@@ -1,21 +1,21 @@
 import AppKit
-import RunicCore
 import Foundation
+import RunicCore
 import WebKit
 
 /// Handles Cursor login flow using a WebKit-based browser window.
 /// Captures session cookies after successful authentication.
 @MainActor
 final class CursorLoginRunner: NSObject {
-    enum Phase: Sendable {
+    enum Phase {
         case loading
         case waitingLogin
         case success
         case failed(String)
     }
 
-    struct Result: Sendable {
-        enum Outcome: Sendable {
+    struct Result {
+        enum Outcome {
             case success
             case cancelled
             case failed(String)

package/Sources/Runic/Core/Login/GeminiLoginRunner.swift

@@ -1,6 +1,6 @@
 import AppKit
-import RunicCore
 import Foundation
+import RunicCore
 
 enum GeminiLoginRunner {
     private static let geminiConfigDir = FileManager.default.homeDirectoryForCurrentUser
@@ -45,11 +45,8 @@ enum GeminiLoginRunner {
             }
 
             // Create a temporary shell script that runs gemini (auto-prompts for auth when no creds)
-            let scriptContent = """
-            #!/bin/bash
-            cd ~
-            "\(binary)"
-            """
+            let escaped = binary.replacingOccurrences(of: "'", with: "'\\''")
+            let scriptContent = "#!/bin/bash\ncd ~\n'\(escaped)'\n"
 
             let tempDir = FileManager.default.temporaryDirectory
             let scriptURL = tempDir.appendingPathComponent("gemini_login_\(UUID().uuidString).command")