Fix sidebar avatar loading fallback

Sources/Auth/HostAccountFlow.swift

@@ -69,6 +69,10 @@ final class HostAccountFlow: AccountFlow, AccountSignInFlow {
         coordinator.isAuthenticated
     }
 
+    var isRestoringSession: Bool {
+        coordinator.isRestoringSession
+    }
+
     var isPresentingSignIn: Bool {
         browserSignIn.isPresentingSignIn
     }

Sources/Auth/StackAccountAvatarView.swift

@@ -7,13 +7,21 @@ struct StackAccountAvatarView: View {
     let displayName: String
     let email: String
     let size: CGFloat
+    var loadingSystemName: String? = nil
 
     var body: some View {
         Group {
             if let avatarURL {
                 AsyncImage(url: avatarURL) { phase in
                     if let image = phase.image {
                         image.resizable().scaledToFill()
+                    } else if phase.error == nil, let loadingSystemName {
+                        CmuxSystemSymbolImage(
+                            systemName: loadingSystemName,
+                            pointSize: size,
+                            weight: .regular
+                        )
+                        .foregroundStyle(Color(nsColor: .secondaryLabelColor))
                     } else {
                         fallback
                     }
@@ -30,22 +38,26 @@ struct StackAccountAvatarView: View {
 
     private var fallback: some View {
         ZStack {
-            Circle().fill(Color.accentColor.opacity(0.18))
+            Circle().fill(fallbackForegroundColor.opacity(0.18))
             if let initial {
                 Text(verbatim: initial)
                     .cmuxFont(size: max(8, size * 0.4), weight: .semibold)
-                    .foregroundStyle(Color.accentColor)
+                    .foregroundStyle(fallbackForegroundColor)
             } else {
                 CmuxSystemSymbolImage(
                     systemName: "person.fill",
                     pointSize: max(8, size * 0.45),
                     weight: .medium
                 )
-                .foregroundStyle(Color.accentColor)
+                .foregroundStyle(fallbackForegroundColor)
             }
         }
     }
 
+    private var fallbackForegroundColor: Color {
+        loadingSystemName == nil ? Color.accentColor : Color(nsColor: .secondaryLabelColor)
+    }
+
     private var initial: String? {
         let trimmedName = displayName.trimmingCharacters(in: .whitespacesAndNewlines)
         let source = trimmedName.isEmpty ? email : trimmedName

Sources/VerticalTabsSidebar+EmptyAreasAndFooter.swift

@@ -51,9 +51,10 @@ struct SidebarAccountButtonPresentation: Equatable {
 
     static func resolve(
         isSignedIn: Bool,
-        prefersProfileIcon: Bool
+        prefersProfileIcon: Bool,
+        isRestoringSession: Bool = false
     ) -> SidebarAccountButtonPresentation {
-        if isSignedIn, !prefersProfileIcon {
+        if isSignedIn, !prefersProfileIcon, !isRestoringSession {
             return SidebarAccountButtonPresentation(
                 visual: .profilePicture,
                 size: SidebarFooterButtonMetrics.profilePictureSize
@@ -257,10 +258,14 @@ struct SidebarAccountMenuButton: View {
 #endif
     }
 
-    private func presentation(isSignedIn: Bool) -> SidebarAccountButtonPresentation {
+    private func presentation(
+        isSignedIn: Bool,
+        isRestoringSession: Bool
+    ) -> SidebarAccountButtonPresentation {
         let presentation = SidebarAccountButtonPresentation.resolve(
             isSignedIn: isSignedIn,
-            prefersProfileIcon: prefersProfileIcon
+            prefersProfileIcon: prefersProfileIcon,
+            isRestoringSession: isRestoringSession
         )
 #if DEBUG
         if !presentation.showsProfilePicture {
@@ -277,7 +282,10 @@ struct SidebarAccountMenuButton: View {
         let identity = accountFlow?.currentIdentity
         let isSignedIn = identity != nil
         let buttonTitle = isSignedIn ? title : signInTitle
-        let presentation = presentation(isSignedIn: isSignedIn)
+        let presentation = presentation(
+            isSignedIn: isSignedIn,
+            isRestoringSession: accountFlow?.isRestoringSession == true
+        )
         Button {
             if isSignedIn {
                 isPopoverPresented.toggle()
@@ -422,7 +430,8 @@ struct SidebarAccountAvatar: View {
                 avatarURL: avatarURL,
                 displayName: displayName,
                 email: email,
-                size: size
+                size: size,
+                loadingSystemName: signedOutSystemName
             )
         } else {
             SidebarFooterCircularIcon(

cmuxTests/WorkspaceContentViewVisibilityTests.swift

@@ -460,6 +460,11 @@ final class WorkspaceContentViewVisibilityTests {
             isSignedIn: false,
             prefersProfileIcon: false
         )
+        let restoringSignedInIcon = SidebarAccountButtonPresentation.resolve(
+            isSignedIn: true,
+            prefersProfileIcon: false,
+            isRestoringSession: true
+        )
 
         #expect(picture.visual == .profilePicture)
         #expect(picture.size == SidebarFooterButtonMetrics.accountAndHelpVisualSize)
@@ -474,6 +479,7 @@ final class WorkspaceContentViewVisibilityTests {
         )
         #expect(toggledIcon.size == SidebarFooterButtonMetrics.accountAndHelpVisualSize)
         #expect(signedOutIcon == toggledIcon)
+        #expect(restoringSignedInIcon == toggledIcon)
         #expect(
             SidebarFooterButtonMetrics.profilePictureSize
                 == SidebarFooterButtonMetrics.helpIconSize