Show update availability in menu

Author: stephanos

Sources/AgentTally/App/AppDelegate.swift

@@ -14,14 +14,17 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
   private var lastSuccessfulAgentData: [AgentKind: AgentRawData] = [:]
   private var lastUsageDataFingerprints: [AgentKind: UsageDataFingerprint] = [:]
   private let loginItemManager = LoginItemManager()
-  private let updaterController = SPUStandardUpdaterController(
+  private lazy var updaterController = SPUStandardUpdaterController(
     startingUpdater: true,
-    updaterDelegate: nil,
-    userDriverDelegate: nil
+    updaterDelegate: self,
+    userDriverDelegate: self
   )
   private var startAtLoginViewState = StartAtLoginViewState.make(status: .notRegistered)
+  private var softwareUpdateViewState = SoftwareUpdateViewState.idle
 
   func applicationDidFinishLaunching(_ notification: Notification) {
+    _ = updaterController
+
     let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
     self.statusItem = statusItem
 
@@ -237,6 +240,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     let rows = MenuRowsBuilder.rows(
       for: state,
       startAtLogin: startAtLoginViewState,
+      softwareUpdate: softwareUpdateViewState,
       appVersion: appVersion()
     )
     MenuRenderer.render(menu: menu, rows: rows, target: self, selectorProvider: selector)
@@ -270,4 +274,38 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
       return #selector(quitMenuItemSelected)
     }
   }
+
+  private func noteAvailableUpdate(version: String) {
+    softwareUpdateViewState = SoftwareUpdateViewState(availableVersion: version)
+    refreshMenuIfNeeded()
+  }
+}
+
+extension AppDelegate: SPUUpdaterDelegate {
+  func updater(_ updater: SPUUpdater, didFindValidUpdate item: SUAppcastItem) {
+    noteAvailableUpdate(version: item.displayVersionString)
+  }
+
+  func updaterDidNotFindUpdate(_ updater: SPUUpdater, error: Error) {
+    softwareUpdateViewState = .idle
+    refreshMenuIfNeeded()
+  }
+
+  func updater(_ updater: SPUUpdater, didAbortWithError error: Error) {
+    softwareUpdateViewState = .idle
+    refreshMenuIfNeeded()
+  }
+}
+
+extension AppDelegate: SPUStandardUserDriverDelegate {
+  nonisolated func standardUserDriverShouldHandleShowingScheduledUpdate(
+    _ update: SUAppcastItem,
+    andInImmediateFocus immediateFocus: Bool
+  ) -> Bool {
+    let version = update.displayVersionString
+    Task { @MainActor [weak self] in
+      self?.noteAvailableUpdate(version: version)
+    }
+    return false
+  }
 }

Sources/AgentTally/Presentation/MenuRowsBuilder.swift

@@ -24,14 +24,26 @@ public enum MenuRowsBuilder {
   public static func rows(
     for state: AppState,
     startAtLogin: StartAtLoginViewState,
+    softwareUpdate: SoftwareUpdateViewState = .idle,
     appVersion: String? = nil,
     now: Date = Date()
   ) -> [MenuRow] {
     var rows: [MenuRow] = [
-      .disabled(headerTitle(appVersion: appVersion)),
-      .disabled("Last refreshed: \(StatusPresenter.lastRefreshedLabel(for: state, now: now))"),
+      .disabled(headerTitle(appVersion: appVersion))
     ]
 
+    rows.append(
+      .action(
+        title: softwareUpdate.menuTitle,
+        kind: .checkForUpdates,
+        keyEquivalent: "",
+        state: .off
+      )
+    )
+
+    rows.append(
+      .disabled("Last refreshed: \(StatusPresenter.lastRefreshedLabel(for: state, now: now))"))
+
     if state.isRefreshing {
       rows.append(.disabled("Refreshing ..."))
     } else {
@@ -91,9 +103,6 @@ public enum MenuRowsBuilder {
     }
 
     rows.append(.separator)
-    rows.append(
-      .action(title: "Check for Updates...", kind: .checkForUpdates, keyEquivalent: "", state: .off)
-    )
     rows.append(
       .action(
         title: "Open at Login",

Sources/AgentTally/Presentation/SoftwareUpdateViewState.swift

@@ -0,0 +1,24 @@
+import Foundation
+
+public struct SoftwareUpdateViewState: Equatable, Sendable {
+  public static let idle = SoftwareUpdateViewState()
+
+  public let availableVersion: String?
+
+  public init(availableVersion: String? = nil) {
+    let trimmedVersion = availableVersion?.trimmingCharacters(in: .whitespacesAndNewlines)
+    self.availableVersion = trimmedVersion?.isEmpty == false ? trimmedVersion : nil
+  }
+
+  public var menuTitle: String {
+    guard let availableVersion else {
+      return "Check for Updates..."
+    }
+
+    if availableVersion.lowercased().hasPrefix("v") {
+      return "Update Available: \(availableVersion)..."
+    }
+
+    return "Update Available: v\(availableVersion)..."
+  }
+}

Tests/MenuRowsHarness.swift

@@ -39,11 +39,22 @@ func testMenuRowsBuilder() throws {
     "menu should start with versioned header"
   )
   let headerIndex = rows.firstIndex(of: .disabled("AgentTally v0.1"))!
-  if case .disabled(let label) = rows[headerIndex + 1] {
+  try expect(
+    rows[headerIndex + 1]
+      == .action(
+        title: "Check for Updates...",
+        kind: .checkForUpdates,
+        keyEquivalent: "",
+        state: .off
+      ),
+    "row after header should be update action"
+  )
+  if case .disabled(let label) = rows[headerIndex + 2] {
     try expect(
-      label.hasPrefix("Last refreshed:"), "last updated should appear directly below the header")
+      label.hasPrefix("Last refreshed:"), "last refreshed should appear below the update action")
   } else {
-    throw TestFailure(description: "row after header should be 'Last refreshed:' disabled item")
+    throw TestFailure(
+      description: "row after update action should be 'Last refreshed:' disabled item")
   }
   try expect(
     rows.contains(.disabled("Today: $49")),
@@ -118,6 +129,24 @@ func testMenuRowsBuilder() throws {
     ),
     "menu should contain update check action"
   )
+  let updateAvailableRows = MenuRowsBuilder.rows(
+    for: AppState(),
+    startAtLogin: .make(status: .enabled),
+    softwareUpdate: SoftwareUpdateViewState(availableVersion: "0.8"),
+    appVersion: "0.7",
+    now: now
+  )
+  try expect(
+    updateAvailableRows.prefix(2).contains(
+      .action(
+        title: "Update Available: v0.8...",
+        kind: .checkForUpdates,
+        keyEquivalent: "",
+        state: .off
+      )
+    ),
+    "available updates should be visible directly below the header"
+  )
   try expect(
     rows.contains(
       .action(