split error handling

Author: stephanos

Sources/AgentTally/App/AppDelegate.swift

@@ -95,39 +95,50 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
 
     refreshTask?.cancel()
     refreshTask = Task {
-      do {
-        let usageDataScan = await Task.detached(priority: .utility) {
-          UsageDataScanner.currentScan()
-        }.value
-
-        let agentsToRefresh = UsageRefreshController.agentsNeedingRefresh(
-          pricingMode: request.pricingMode,
-          currentUsageDataScan: usageDataScan,
-          cachedUsageDataFingerprints: lastUsageDataFingerprints,
-          cachedAgentData: lastSuccessfulAgentData
-        )
-
-        if !agentsToRefresh.isEmpty {
+      defer {
+        refreshTask = nil
+      }
+
+      let usageDataScan = await Task.detached(priority: .utility) {
+        UsageDataScanner.currentScan()
+      }.value
+
+      let agentsToRefresh = UsageRefreshController.agentsNeedingRefresh(
+        pricingMode: request.pricingMode,
+        currentUsageDataScan: usageDataScan,
+        cachedUsageDataFingerprints: lastUsageDataFingerprints,
+        cachedAgentData: lastSuccessfulAgentData,
+        lastErrorByAgent: state.lastErrorByAgent
+      )
+
+      var nextErrorByAgent = state.lastErrorByAgent
+      for agent in agentsToRefresh {
+        do {
           let snapshot = try await UsageFetcher.fetchUsage(
             offline: request.pricingMode == .offline,
-            agents: agentsToRefresh
+            agents: [agent]
           )
           cache(snapshot: snapshot, usageDataScan: usageDataScan)
+          nextErrorByAgent.removeValue(forKey: agent)
+        } catch {
+          guard !Task.isCancelled else {
+            return
+          }
+          nextErrorByAgent[agent] = error.localizedDescription
+          NSLog(
+            "agenttally %@ refresh failed: %@",
+            agent.displayName,
+            error.localizedDescription
+          )
         }
-
-        applyRefreshSuccess(
-          cachedSnapshot(),
-          pricingMode: request.pricingMode,
-          lastUsageDetectedAtByAgent: usageDataScan.lastUsageDetectedAtByAgent
-        )
-      } catch {
-        guard !Task.isCancelled else {
-          return
-        }
-        applyRefreshFailure(error)
       }
 
-      refreshTask = nil
+      applyRefreshSuccess(
+        cachedSnapshot(),
+        pricingMode: request.pricingMode,
+        lastUsageDetectedAtByAgent: usageDataScan.lastUsageDetectedAtByAgent,
+        lastErrorByAgent: nextErrorByAgent
+      )
     }
   }
 
@@ -155,12 +166,14 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
   private func applyRefreshSuccess(
     _ snapshot: UsageSnapshot,
     pricingMode: PricingRefreshMode,
-    lastUsageDetectedAtByAgent: [AgentKind: Date]
+    lastUsageDetectedAtByAgent: [AgentKind: Date],
+    lastErrorByAgent: [AgentKind: String]
   ) {
     state = UsageRefreshController.applySuccess(
       snapshot: snapshot,
       pricingMode: pricingMode,
       lastUsageDetectedAtByAgent: lastUsageDetectedAtByAgent,
+      lastErrorByAgent: lastErrorByAgent,
       to: state
     )
     renderTitle()
@@ -170,9 +183,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
   private func applyRefreshFailure(_ error: Error) {
     state = UsageRefreshController.applyFailure(error: error, to: state)
     renderTitle()
-    if let lastError = state.lastError, !lastError.isEmpty {
-      NSLog("agenttally refresh failed: %@", lastError)
-    }
+    NSLog("agenttally refresh failed: %@", error.localizedDescription)
     refreshMenuIfNeeded()
   }
 

Sources/AgentTally/Domain/AppState.swift

@@ -11,21 +11,21 @@ public struct AppState {
   public var businessDays = 0
   public var lastRefreshAt: Date?
   public var lastOnlinePricingRefreshAt: Date?
-  public var lastError: String?
+  public var lastErrorByAgent: [AgentKind: String] = [:]
 
   public init(
     isRefreshing: Bool = false,
     agentSpendings: [AgentSpending] = [],
     businessDays: Int = 0,
     lastRefreshAt: Date? = nil,
     lastOnlinePricingRefreshAt: Date? = nil,
-    lastError: String? = nil
+    lastErrorByAgent: [AgentKind: String] = [:]
   ) {
     self.isRefreshing = isRefreshing
     self.agentSpendings = agentSpendings
     self.businessDays = businessDays
     self.lastRefreshAt = lastRefreshAt
     self.lastOnlinePricingRefreshAt = lastOnlinePricingRefreshAt
-    self.lastError = lastError
+    self.lastErrorByAgent = lastErrorByAgent
   }
 }

Sources/AgentTally/Presentation/MenuRowsBuilder.swift

@@ -41,11 +41,17 @@ public enum MenuRowsBuilder {
 
     if state.lastRefreshAt != nil {
       var isFirst = true
+      var renderedAgents = Set<AgentKind>()
       for spending in state.agentSpendings {
         if !isFirst { rows.append(.separator) }
         isFirst = false
 
-        if spending.isInstalled, state.lastError == nil {
+        let agent = AgentKind(displayName: spending.name)
+        if let agent {
+          renderedAgents.insert(agent)
+        }
+
+        if spending.isInstalled {
           rows.append(.section("\(spending.name) spending"))
           rows.append(
             .disabled("Today: $\(StatusPresenter.displayDollarAmount(for: spending.todayCost))"))
@@ -65,10 +71,21 @@ public enum MenuRowsBuilder {
         } else if !spending.isInstalled {
           rows.append(.disabled("\(spending.name): not installed"))
         }
+
+        if let agent, let error = state.lastErrorByAgent[agent], !error.isEmpty {
+          rows.append(.disabled("Error: \(error)"))
+        }
       }
 
-      if let lastError = state.lastError, !lastError.isEmpty {
-        rows.append(.disabled("Error: \(lastError)"))
+      for agent in AgentKind.allCases where !renderedAgents.contains(agent) {
+        guard let error = state.lastErrorByAgent[agent], !error.isEmpty else {
+          continue
+        }
+
+        if !isFirst { rows.append(.separator) }
+        isFirst = false
+        rows.append(.section("\(agent.displayName) spending"))
+        rows.append(.disabled("Error: \(error)"))
       }
     }
 

Sources/AgentTally/Presentation/StatusPresenter.swift

@@ -13,14 +13,10 @@ public enum StatusPresenter {
   }
 
   public static func shouldShowWarningSymbol(for state: AppState) -> Bool {
-    state.lastError != nil
+    !state.lastErrorByAgent.isEmpty
   }
 
   public static func title(for state: AppState, now: Date = Date()) -> String {
-    if shouldShowWarningSymbol(for: state) {
-      return "ERR \(placeholderAgent.abbreviation)"
-    }
-
     if shouldShowLoadingTitle(lastRefreshAt: state.lastRefreshAt, now: now) {
       return loadingTitle(for: state)
     }
@@ -34,9 +30,24 @@ public enum StatusPresenter {
       }
     }
 
+    if !state.lastErrorByAgent.isEmpty {
+      return errorTitle(for: state)
+    }
+
     return loadingTitle(for: state)
   }
 
+  private static func errorTitle(for state: AppState) -> String {
+    let abbreviations = AgentKind.allCases
+      .filter { state.lastErrorByAgent[$0] != nil }
+      .map(\.abbreviation)
+    guard !abbreviations.isEmpty else {
+      return "ERR \(placeholderAgent.abbreviation)"
+    }
+
+    return "ERR \(abbreviations.joined(separator: " "))"
+  }
+
   private static func loadingTitle(for state: AppState) -> String {
     let abbreviations = state.agentSpendings
       .filter { $0.isInstalled }

Sources/AgentTally/Usage/UsageRefreshController.swift

@@ -33,6 +33,7 @@ enum UsageRefreshController {
     snapshot: UsageSnapshot,
     pricingMode: PricingRefreshMode,
     lastUsageDetectedAtByAgent: [AgentKind: Date] = [:],
+    lastErrorByAgent: [AgentKind: String] = [:],
     to state: AppState,
     now: Date = Date()
   ) -> AppState {
@@ -52,22 +53,25 @@ enum UsageRefreshController {
         lastUsageDetectedAt: agent.flatMap { lastUsageDetectedAtByAgent[$0] }
       )
     }
-    if pricingMode == .online {
+    if pricingMode == .online && lastErrorByAgent.isEmpty {
       nextState.lastOnlinePricingRefreshAt = now
     }
-    nextState.lastError = nil
+    nextState.lastErrorByAgent = lastErrorByAgent
     return nextState
   }
 
   static func applyFailure(
     error: Error,
+    affectedAgents: [AgentKind] = AgentKind.allCases,
     to state: AppState,
     now: Date = Date()
   ) -> AppState {
     var nextState = state
     nextState.isRefreshing = false
     nextState.lastRefreshAt = now
-    nextState.lastError = error.localizedDescription
+    for agent in affectedAgents {
+      nextState.lastErrorByAgent[agent] = error.localizedDescription
+    }
     return nextState
   }
 
@@ -95,7 +99,8 @@ enum UsageRefreshController {
     pricingMode: PricingRefreshMode,
     currentUsageDataScan: UsageDataScan,
     cachedUsageDataFingerprints: [AgentKind: UsageDataFingerprint],
-    cachedAgentData: [AgentKind: AgentRawData]
+    cachedAgentData: [AgentKind: AgentRawData],
+    lastErrorByAgent: [AgentKind: String] = [:]
   ) -> [AgentKind] {
     if pricingMode == .online {
       return AgentKind.allCases
@@ -108,6 +113,7 @@ enum UsageRefreshController {
 
       return cachedAgentData[agent] == nil
         || cachedUsageDataFingerprints[agent] != currentFingerprint
+        || lastErrorByAgent[agent] != nil
     }
   }
 }

Tests/MenuRowsHarness.swift

@@ -27,7 +27,7 @@ func testMenuRowsBuilder() throws {
       agentSpendings: [claudeSpending, codexSpending],
       businessDays: 4,
       lastRefreshAt: Date(timeIntervalSinceReferenceDate: 1_000),
-      lastError: nil
+      lastErrorByAgent: [:]
     ),
     startAtLogin: .make(status: .enabled),
     appVersion: "0.1",
@@ -130,7 +130,7 @@ func testMenuRowsBuilder() throws {
       agentSpendings: [claudeSpending, codexSpending],
       businessDays: 4,
       lastRefreshAt: Date(timeIntervalSinceReferenceDate: 1_000),
-      lastError: nil
+      lastErrorByAgent: [:]
     ),
     startAtLogin: .make(status: .enabled)
   )
@@ -145,17 +145,40 @@ func testMenuRowsBuilder() throws {
       agentSpendings: [claudeSpending, codexSpending],
       businessDays: 4,
       lastRefreshAt: Date(timeIntervalSinceReferenceDate: 1_000),
-      lastError: "helper timed out"
+      lastErrorByAgent: [.codex: "helper timed out"]
     ),
     startAtLogin: .make(status: .enabled)
   )
   try expect(
     errorRows.contains(.disabled("Error: helper timed out")),
-    "refresh failures should surface the localized error message in the menu"
+    "refresh failures should surface the affected agent error in the menu"
   )
   try expect(
-    !errorRows.contains(.disabled("Today: $49")),
-    "error state should hide stale summary rows"
+    errorRows.contains(.disabled("Today: $49")),
+    "one agent error should not hide another agent's cached summary rows"
+  )
+  try expect(
+    errorRows.contains(.disabled("Today: $10")),
+    "an errored agent should still show cached summary rows when available"
+  )
+
+  let firstRefreshErrorRows = MenuRowsBuilder.rows(
+    for: AppState(
+      isRefreshing: false,
+      agentSpendings: [],
+      businessDays: 0,
+      lastRefreshAt: Date(timeIntervalSinceReferenceDate: 1_000),
+      lastErrorByAgent: [.codex: "helper timed out"]
+    ),
+    startAtLogin: .make(status: .enabled)
+  )
+  try expect(
+    firstRefreshErrorRows.contains(.section("Codex spending")),
+    "first-refresh agent errors should create a section for the affected agent"
+  )
+  try expect(
+    firstRefreshErrorRows.contains(.disabled("Error: helper timed out")),
+    "first-refresh agent errors should still be visible without cached spending"
   )
 
   // No agent data yet (before first refresh)