Restore status controller factory and icon nil handling

Author: steipete

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 0.4.3 — 2025-11-21
 - Fix status item creation timing on macOS 15 by deferring NSStatusItem setup to after launch; adds a regression test for the path.
+- Menu bar icon with unknown usage now draws empty tracks (instead of a full bar when decorations are shown) by treating nil values as 0%.
 
 ## 0.4.2 — 2025-11-21
 - Sparkle updates re-enabled in release builds (disabled only for the debug bundle ID).

Sources/CodexBar/CodexbarApp.swift

@@ -120,7 +120,7 @@ private func makeUpdaterController() -> UpdaterProviding {
 @MainActor
 final class AppDelegate: NSObject, NSApplicationDelegate {
     let updaterController: UpdaterProviding = makeUpdaterController()
-    private var statusController: StatusItemController?
+    private var statusController: StatusItemControlling?
     private var store: UsageStore?
     private var settings: SettingsStore?
     private var account: AccountInfo?
@@ -138,33 +138,29 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     private func ensureStatusController() {
-        if self.statusController != nil {
+        if self.statusController != nil { return }
+
+        if let store, let settings, let account, let selection = self.preferencesSelection {
+            self.statusController = StatusItemController.factory(
+                store,
+                settings,
+                account,
+                self.updaterController,
+                selection)
             return
         }
 
-        if let store = self.store,
-           let settings = self.settings,
-           let account = self.account,
-           let selection = self.preferencesSelection
-        {
-            self.statusController = StatusItemController(
-                store: store,
-                settings: settings,
-                account: account,
-                updater: self.updaterController,
-                preferencesSelection: selection)
-        } else {
-            let settings = SettingsStore()
-            let fetcher = UsageFetcher()
-            let account = fetcher.loadAccountInfo()
-            let store = UsageStore(fetcher: fetcher, settings: settings)
-            self.statusController = StatusItemController(
-                store: store,
-                settings: settings,
-                account: account,
-                updater: self.updaterController,
-                preferencesSelection: PreferencesSelection())
-        }
+        // Defensive fallback: this should not be hit in normal app lifecycle.
+        let fallbackSettings = SettingsStore()
+        let fetcher = UsageFetcher()
+        let fallbackAccount = fetcher.loadAccountInfo()
+        let fallbackStore = UsageStore(fetcher: fetcher, settings: fallbackSettings)
+        self.statusController = StatusItemController.factory(
+            fallbackStore,
+            fallbackSettings,
+            fallbackAccount,
+            self.updaterController,
+            PreferencesSelection())
     }
 }
 
@@ -182,8 +178,23 @@ extension CodexBarApp {
 
 // MARK: - Status item controller (AppKit-hosted icons, SwiftUI popovers)
 
+protocol StatusItemControlling: AnyObject {}
+
 @MainActor
-final class StatusItemController: NSObject, NSMenuDelegate {
+final class StatusItemController: NSObject, NSMenuDelegate, StatusItemControlling {
+    typealias Factory = (UsageStore, SettingsStore, AccountInfo, UpdaterProviding, PreferencesSelection)
+        -> StatusItemControlling
+    static let defaultFactory: Factory = { store, settings, account, updater, selection in
+        StatusItemController(
+            store: store,
+            settings: settings,
+            account: account,
+            updater: updater,
+            preferencesSelection: selection)
+    }
+
+    static var factory: Factory = StatusItemController.defaultFactory
+
     private let store: UsageStore
     private let settings: SettingsStore
     private let account: AccountInfo

Sources/CodexBar/IconRenderer.swift

@@ -40,7 +40,9 @@ enum IconRenderer {
             trackPath.lineWidth = 1.2
             trackPath.stroke()
 
-            guard let rawRemaining = remaining ?? (addNotches ? 100 : nil) else { return }
+            // When remaining is unknown, do not render a full bar; draw only the track (and decorations) unless a value
+            // exists.
+            guard let rawRemaining = remaining ?? (addNotches ? 0 : nil) else { return }
             // Clamp fill because backend might occasionally send >100 or <0.
             let clamped = max(0, min(rawRemaining / 100, 1))
             let fillRect = CGRect(x: x, y: y, width: width * clamped, height: height)