Clear loading state when superseded loads are abandoned.

Sign-out during an in-flight refresh could leave isLoading stuck on CI when
the stale request returned early; also give the sign-out race test more time
to observe the loading state before asserting.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: jasonlong

Octodot/App/AppState.swift

@@ -372,6 +372,8 @@ final class AppState {
         cancelSecurityAlertsRefresh()
         cancelSubjectStateResolution()
         cancelAllPendingActions()
+        committedActionsPersistTask?.cancel()
+        committedActionsPersistTask = nil
         activeLoadRequestID = UUID()
         tokenDeleter()
         apiClient = nil
@@ -396,6 +398,15 @@ final class AppState {
         await loadNotifications(policy: .uniform(force: force))
     }
 
+    private func abandonLoadIfSuperseded(requestID: UUID, authRequestID: UUID) -> Bool {
+        guard requestID == activeLoadRequestID,
+              authRequestID == activeAuthRequestID else {
+            isLoading = false
+            return true
+        }
+        return false
+    }
+
     private func loadNotifications(policy: RefreshPolicy) async {
         guard let client = apiClient else { return }
         let authRequestID = activeAuthRequestID
@@ -418,8 +429,9 @@ final class AppState {
                         maxPages: InboxStore.inboxRecentReadMaxPages
                     )
                 } catch {
-                    guard requestID == activeLoadRequestID,
-                          authRequestID == activeAuthRequestID else { return }
+                    if abandonLoadIfSuperseded(requestID: requestID, authRequestID: authRequestID) {
+                        return
+                    }
                     if Self.isUnauthorized(error) {
                         signOut()
                         return
@@ -430,8 +442,9 @@ final class AppState {
             } else {
                 fetchedRecentInbox = []
             }
-            guard requestID == activeLoadRequestID,
-                  authRequestID == activeAuthRequestID else { return }
+            if abandonLoadIfSuperseded(requestID: requestID, authRequestID: authRequestID) {
+                return
+            }
             applyLoadedNotifications(
                 unreadNotifications: fetched,
                 recentInboxNotifications: fetchedRecentInbox,
@@ -458,8 +471,9 @@ final class AppState {
             )
             logLastActionSnapshot(context: "after-load")
         } catch {
-            guard requestID == activeLoadRequestID,
-                  authRequestID == activeAuthRequestID else { return }
+            if abandonLoadIfSuperseded(requestID: requestID, authRequestID: authRequestID) {
+                return
+            }
             if Self.isUnauthorized(error) {
                 signOut()
                 return

OctodotTests/AppStateTests.swift

@@ -1677,7 +1677,7 @@ struct AppStateTests {
         state.inboxMode = .unread
 
         let loadTask = Task { await state.loadNotifications(force: true) }
-        await Self.waitUntil(intervalNanoseconds: 1_000_000) {
+        await Self.waitUntil(timeoutNanoseconds: 1_000_000_000) {
             await MainActor.run { state.isLoading }
         }
         #expect(state.isLoading)