@@ -13,7 +13,6 @@
 		3ABBEA2D2C8BA00B00C61D61 /* copilot-language-server in Resources */ = {isa = PBXBuildFile; fileRef = 3ABBEA282C8B9FE100C61D61 /* copilot-language-server */; };
 		424ACA212CA4697200FA20F2 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 424ACA202CA4697200FA20F2 /* Credits.rtf */; };
 		427C63282C6E868B000E557C /* OpenSettingsCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 427C63272C6E868B000E557C /* OpenSettingsCommand.swift */; };
-		42888D512C66B10100DEF835 /* AuthStatusChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42888D502C66B10100DEF835 /* AuthStatusChecker.swift */; };
 		5EC511E32C90CE7400632BAB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C8189B1D2938973000C9DCDA /* Assets.xcassets */; };
 		5EC511E42C90CE9800632BAB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C8189B1D2938973000C9DCDA /* Assets.xcassets */; };
 		5EC511E52C90CFD600632BAB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C861E6142994F6080056CB02 /* Assets.xcassets */; };
@@ -192,7 +191,6 @@
 		3ABBEA2A2C8BA00300C61D61 /* copilot-language-server-arm64 */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = "copilot-language-server-arm64"; path = "Server/node_modules/@github/copilot-language-server/native/darwin-arm64/copilot-language-server-arm64"; sourceTree = SOURCE_ROOT; };
 		424ACA202CA4697200FA20F2 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = "<group>"; };
 		427C63272C6E868B000E557C /* OpenSettingsCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenSettingsCommand.swift; sourceTree = "<group>"; };
-		42888D502C66B10100DEF835 /* AuthStatusChecker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthStatusChecker.swift; sourceTree = "<group>"; };
 		C8009BFE2941C551007AA7E8 /* ToggleRealtimeSuggestionsCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToggleRealtimeSuggestionsCommand.swift; sourceTree = "<group>"; };
 		C8009C022941C576007AA7E8 /* SyncTextSettingsCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncTextSettingsCommand.swift; sourceTree = "<group>"; };
 		C800DBB0294C624D00B04CAC /* PrefetchSuggestionsCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrefetchSuggestionsCommand.swift; sourceTree = "<group>"; };
@@ -425,7 +423,6 @@
 				C81291D52994FE6900196E12 /* Main.storyboard */,
 				C861E6142994F6080056CB02 /* Assets.xcassets */,
 				C861E6192994F6080056CB02 /* ExtensionService.entitlements */,
-				42888D502C66B10100DEF835 /* AuthStatusChecker.swift */,
 			);
 			path = ExtensionService;
 			sourceTree = "<group>";
@@ -769,7 +766,6 @@
 				C89E75C32A46FB32000DD64F /* AppDelegate+Menu.swift in Sources */,
 				C8738B712BE4F8B700609E7F /* XPCController.swift in Sources */,
 				C861E6202994F63A0056CB02 /* ServiceDelegate.swift in Sources */,
-				42888D512C66B10100DEF835 /* AuthStatusChecker.swift in Sources */,
 				C861E6112994F6070056CB02 /* AppDelegate.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 
@@ -1,5 +1,7 @@
+import Foundation
 import GitHubCopilotService
 import ComposableArchitecture
+import Status
 import SwiftUI
 
 struct SignInResponse {
@@ -79,6 +81,7 @@ class GitHubCopilotViewModel: ObservableObject {
             do {
                 let service = try getGitHubCopilotAuthService()
                 status = try await service.signOut()
+                broadcastStatusChange()
             } catch {
                 toast(error.localizedDescription, .error)
             }
@@ -118,6 +121,7 @@ class GitHubCopilotViewModel: ObservableObject {
                 waitingForSignIn = false
                 self.username = username
                 self.status = status
+                broadcastStatusChange()
             } catch let error as GitHubCopilotError {
                 if case .languageServerError(.timeout) = error {
                     // TODO figure out how to extend the default timeout on a Chime LSP request
@@ -131,4 +135,11 @@ class GitHubCopilotViewModel: ObservableObject {
             }
         }
     }
+
+    func broadcastStatusChange() {
+        DistributedNotificationCenter.default().post(
+            name: .authStatusDidChange,
+            object: nil
+        )
+    }
 }
@@ -32,7 +32,6 @@ public final class Service {
     let globalShortcutManager: GlobalShortcutManager
     let keyBindingManager: KeyBindingManager
     let xcodeThemeController: XcodeThemeController = .init()
-    public var markAsProcessing: (Bool) -> Void = { _ in }
 
     @Dependency(\.toast) var toast
     var cancellable = Set<AnyCancellable>()
 
@@ -30,7 +30,6 @@ struct PresentInWindowSuggestionPresenter {
         Task { @MainActor in
             let controller = Service.shared.guiController.widgetController
             controller.markAsProcessing(isProcessing)
-            Service.shared.markAsProcessing(isProcessing)
         }
     }
 
 
@@ -27,10 +27,6 @@ extension AppDelegate {
         .init("toggleIgnoreLanguageMenuItem")
     }
 
-    fileprivate var copilotStatusMenuItemIdentifier: NSUserInterfaceItemIdentifier {
-        .init("copilotStatusMenuItem")
-    }
-
     @MainActor
     @objc func buildStatusBarMenu() {
         let statusBar = NSStatusBar.system
@@ -52,7 +48,7 @@ extension AppDelegate {
             keyEquivalent: ""
         )
 
-        let openCopilotForXcode = NSMenuItem(
+        let openCopilotForXcodeItem = NSMenuItem(
             title: "Open \(hostAppName) Settings",
             action: #selector(openCopilotForXcode),
             keyEquivalent: ""
@@ -97,12 +93,11 @@ extension AppDelegate {
         )
         toggleIgnoreLanguage.identifier = toggleIgnoreLanguageMenuItemIdentifier;
 
-        let copilotStatus = NSMenuItem(
+        authMenuItem = NSMenuItem(
             title: "Copilot Connection: Checking...",
-            action: nil,
+            action: #selector(openCopilotForXcode),
             keyEquivalent: ""
         )
-        copilotStatus.identifier = copilotStatusMenuItemIdentifier
 
         let openDocs = NSMenuItem(
             title: "View Copilot Documentation...",
@@ -116,13 +111,13 @@ extension AppDelegate {
             keyEquivalent: ""
         )
 
-        statusBarMenu.addItem(openCopilotForXcode)
+        statusBarMenu.addItem(openCopilotForXcodeItem)
         statusBarMenu.addItem(.separator())
         statusBarMenu.addItem(checkForUpdate)
         statusBarMenu.addItem(toggleCompletions)
         statusBarMenu.addItem(toggleIgnoreLanguage)
         statusBarMenu.addItem(.separator())
-        statusBarMenu.addItem(copilotStatus)
+        statusBarMenu.addItem(authMenuItem)
         statusBarMenu.addItem(statusMenuItem)
         statusBarMenu.addItem(.separator())
         statusBarMenu.addItem(openDocs)
@@ -165,14 +160,6 @@ extension AppDelegate: NSMenuDelegate {
                 }
             }
 
-            statusChecker.updateStatusInBackground(notify: { (status: String, isOk: Bool) in
-                if let statusItem = menu.items.first(where: { item in
-                    item.identifier == self.copilotStatusMenuItemIdentifier
-                }) {
-                    statusItem.title = "Copilot Connection: \(isOk ? "Connected" : status)"
-                }
-            })
-
         case xcodeInspectorDebugMenuIdentifier:
             let inspector = XcodeInspector.shared
             menu.items.removeAll()
 
@@ -32,25 +32,20 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
     let service = Service.shared
     var statusBarItem: NSStatusItem!
     var statusMenuItem: NSMenuItem!
+    var authMenuItem: NSMenuItem!
     var xpcController: XPCController?
     let updateChecker =
         UpdateChecker(
             hostBundle: Bundle(url: locateHostBundleURL(url: Bundle.main.bundleURL)),
             checkerDelegate: ExtensionUpdateCheckerDelegate()
         )
-    let statusChecker: AuthStatusChecker = AuthStatusChecker()
     var xpcExtensionService: XPCExtensionService?
     private var cancellables = Set<AnyCancellable>()
     private var progressView: NSProgressIndicator?
-    private var idleIcon = NSImage(named: "MenuBarIcon")
 
     func applicationDidFinishLaunching(_: Notification) {
         if ProcessInfo.processInfo.environment["IS_UNIT_TEST"] == "YES" { return }
         _ = XcodeInspector.shared
-        service.markAsProcessing = { [weak self] in
-            guard let self = self else { return }
-            self.markAsProcessing($0)
-        }
         service.start()
         AXIsProcessTrustedWithOptions([
             kAXTrustedCheckOptionPrompt.takeRetainedValue() as NSString: true,
@@ -63,7 +58,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
         buildStatusBarMenu()
         watchServiceStatus()
         watchAXStatus()
-        updateStatusBarItem() // set the initial status
+        watchAuthStatus()
+        setInitialStatusBarStatus()
     }
 
     @objc func quit() {
@@ -183,16 +179,44 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
         }
     }
 
+    func watchAuthStatus() {
+        let notifications = DistributedNotificationCenter.default().notifications(named: .authStatusDidChange)
+        Task { [weak self] in
+            for await _ in notifications {
+                guard let self else { return }
+                await self.forceAuthStatusCheck()
+            }
+        }
+    }
+
+    func setInitialStatusBarStatus() {
+        Task {
+            let authStatus = await Status.shared.getAuthStatus()
+            if authStatus == .unknown {
+                // temporarily kick off a language server instance to prime the initial auth status
+                await forceAuthStatusCheck()
+            }
+            updateStatusBarItem()
+        }
+    }
+
+    func forceAuthStatusCheck() async {
+        do {
+            let service = try GitHubCopilotService()
+            _ = try await service.checkStatus()
+            try await service.shutdown()
+            try await service.exit()
+        } catch {
+            Logger.service.error("Failed to read auth status: \(error)")
+        }
+    }
+
     func updateStatusBarItem() {
         Task { @MainActor in
             let status = await Status.shared.getStatus()
-            let image = if status.system {
-                NSImage(systemSymbolName: status.icon, accessibilityDescription: nil)
-            } else {
-                NSImage(named: status.icon)
-            }
-            idleIcon = image
+            let image = status.icon.nsImage
             self.statusBarItem.button?.image = image
+            self.authMenuItem.title = status.authMessage
             if let message = status.message {
                 // TODO switch to attributedTitle to enable line breaks and color.
                 self.statusMenuItem.title = message
@@ -201,6 +225,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
             } else {
                 self.statusMenuItem.isHidden = true
             }
+            self.markAsProcessing(status.inProgress)
         }
     }
 
@@ -209,7 +234,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
             // No longer in progress
             progressView?.removeFromSuperview()
             progressView = nil
-            statusBarItem.button?.image = idleIcon
             return
         }
         if progressView != nil {
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ struct PresentInWindowSuggestionPresenter {`
`30`	`30`	`Task { @MainActor in`
`31`	`31`	`let controller = Service.shared.guiController.widgetController`
`32`	`32`	`controller.markAsProcessing(isProcessing)`
`33`		`- Service.shared.markAsProcessing(isProcessing)`
`34`	`33`	`}`
`35`	`34`	`}`
`36`	`35`