Pre-release 0.27.92

Copilot for Xcode.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/devm33/CGEventOverride",
       "state" : {
-        "revision" : "571d36d63e68fac30e4a350600cd186697936f74",
-        "version" : "1.2.3"
+        "branch" : "devm33/fix-stale-AXIsProcessTrusted",
+        "revision" : "06a9bf1f8f8d47cca221344101cc0274f04cc513"
       }
     },
     {

Core/Package.swift

@@ -50,7 +50,7 @@ let package = Package(
         // quick hack to support custom UserDefaults
         // https://github.com/sindresorhus/KeyboardShortcuts
             .package(url: "https://github.com/devm33/KeyboardShortcuts", branch: "main"),
-        .package(url: "https://github.com/devm33/CGEventOverride", from: "1.2.1"),
+        .package(url: "https://github.com/devm33/CGEventOverride", branch: "devm33/fix-stale-AXIsProcessTrusted"),
         .package(url: "https://github.com/devm33/Highlightr", branch: "master"),
     ],
     targets: [
@@ -83,6 +83,7 @@ let package = Package(
                 .product(name: "UserDefaultsObserver", package: "Tool"),
                 .product(name: "AppMonitoring", package: "Tool"),
                 .product(name: "SuggestionBasic", package: "Tool"),
+                .product(name: "Status", package: "Tool"),
                 .product(name: "ChatTab", package: "Tool"),
                 .product(name: "Logger", package: "Tool"),
                 .product(name: "ChatAPIService", package: "Tool"),

Core/Sources/HostApp/General.swift

@@ -2,6 +2,7 @@ import Client
 import ComposableArchitecture
 import Foundation
 import LaunchAgentManager
+import Status
 import SwiftUI
 import XPCShared
 import Logger
@@ -11,7 +12,7 @@ struct General {
     @ObservableState
     struct State: Equatable {
         var xpcServiceVersion: String?
-        var isAccessibilityPermissionGranted: Bool?
+        var isAccessibilityPermissionGranted: ObservedAXStatus = .unknown
         var isReloading = false
     }
 
@@ -20,7 +21,7 @@ struct General {
         case setupLaunchAgentIfNeeded
         case openExtensionManager
         case reloadStatus
-        case finishReloading(xpcServiceVersion: String, permissionGranted: Bool)
+        case finishReloading(xpcServiceVersion: String, permissionGranted: ObservedAXStatus)
         case failedReloading
         case retryReloading
     }
@@ -35,7 +36,7 @@ struct General {
             case .appear:
                 return .run { send in
                     await send(.setupLaunchAgentIfNeeded)
-                    for await _ in DistributedNotificationCenter.default().notifications(named: NSNotification.Name("com.apple.accessibility.api")) {
+                    for await _ in DistributedNotificationCenter.default().notifications(named: .serviceStatusDidChange) {
                         await send(.reloadStatus)
                     }
                 }

Core/Sources/HostApp/GeneralSettings/CopilotConnectionView.swift

@@ -1,20 +1,6 @@
 import ComposableArchitecture
 import SwiftUI
 
-struct ActivityIndicatorView: NSViewRepresentable {
-    func makeNSView(context _: Context) -> NSProgressIndicator {
-        let progressIndicator = NSProgressIndicator()
-        progressIndicator.style = .spinning
-        progressIndicator.controlSize = .small
-        progressIndicator.startAnimation(nil)
-        return progressIndicator
-    }
-
-    func updateNSView(_: NSProgressIndicator, context _: Context) {
-        // No-op
-    }
-}
-
 struct CopilotConnectionView: View {
     @AppStorage("username") var username: String = ""
     @Environment(\.toast) var toast
@@ -38,6 +24,9 @@ struct CopilotConnectionView: View {
             title: "GitHub Account Status Permissions",
             subtitle: "GitHub Connection: \(viewModel.status?.description ?? "Loading...")"
         ) {
+            if viewModel.isRunningAction || waitingForSignIn {
+                ProgressView().controlSize(.small)
+            }
             Button("Refresh Connection") {
                 viewModel.checkStatus()
             }
@@ -72,9 +61,6 @@ struct CopilotConnectionView: View {
                     viewModel.isSignInAlertPresented = false
                 }
             }
-            if viewModel.isRunningAction || waitingForSignIn {
-                ActivityIndicatorView()
-            }
         }
     }
 

Core/Sources/HostApp/GeneralSettings/GeneralSettingsView.swift

@@ -9,8 +9,14 @@ struct GeneralSettingsView: View {
     let store: StoreOf<General>
 
     var accessibilityPermissionSubtitle: String {
-        guard let granted = store.isAccessibilityPermissionGranted else { return "Loading..." }
-        return granted ? "Granted" : "Not Granted. Required to run. Click to open System Preferences."
+        switch store.isAccessibilityPermissionGranted {
+        case .granted:
+            return "Granted"
+        case .notGranted:
+            return "Not Granted. Required to run. Click to open System Preferences."
+        case .unknown:
+            return ""
+        }
     }
 
     var body: some View {

Core/Sources/Service/RealtimeSuggestionController.swift

@@ -6,6 +6,7 @@ import Combine
 import Foundation
 import Logger
 import Preferences
+import Status
 import QuartzCore
 import Workspace
 import XcodeInspector
@@ -124,10 +125,12 @@ public actor RealtimeSuggestionController {
                 do {
                     try await XcodeInspector.shared.safe.latestActiveXcode?
                         .triggerCopilotCommand(name: "Sync Text Settings")
+                    await Status.shared.updateExtensionStatus(.succeeded)
                 } catch {
                     if filespace.codeMetadata.uti?.isEmpty ?? true {
                         filespace.codeMetadata.uti = nil
                     }
+                    await Status.shared.updateExtensionStatus(.failed)
                 }
             }
         }

Core/Sources/Service/Service.swift

@@ -32,6 +32,7 @@ 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>()

Core/Sources/Service/SuggestionPresenter/PresentInWindowSuggestionPresenter.swift

@@ -30,6 +30,7 @@ struct PresentInWindowSuggestionPresenter {
         Task { @MainActor in
             let controller = Service.shared.guiController.widgetController
             controller.markAsProcessing(isProcessing)
+            Service.shared.markAsProcessing(isProcessing)
         }
     }
 

Core/Sources/Service/XPCService.swift

@@ -4,6 +4,7 @@ import GitHubCopilotService
 import LanguageServerProtocol
 import Logger
 import Preferences
+import Status
 import XPCShared
 
 public class XPCService: NSObject, XPCServiceProtocol {
@@ -16,8 +17,10 @@ public class XPCService: NSObject, XPCServiceProtocol {
         )
     }
 
-    public func getXPCServiceAccessibilityPermission(withReply reply: @escaping (Bool) -> Void) {
-        reply(AXIsProcessTrusted())
+    public func getXPCServiceAccessibilityPermission(withReply reply: @escaping (ObservedAXStatus) -> Void) {
+        Task {
+            reply(await Status.shared.getAXStatus())
+        }
     }
 
     // MARK: - Suggestion

ExtensionService/AppDelegate+Menu.swift

@@ -1,6 +1,7 @@
 import AppKit
 import Foundation
 import Preferences
+import Status
 import SuggestionBasic
 import XcodeInspector
 import Logger
@@ -14,10 +15,6 @@ extension AppDelegate {
         .init("xcodeInspectorDebugMenu")
     }
 
-    fileprivate var accessibilityAPIPermissionMenuItemIdentifier: NSUserInterfaceItemIdentifier {
-        .init("accessibilityAPIPermissionMenuItem")
-    }
-
     fileprivate var sourceEditorDebugMenu: NSUserInterfaceItemIdentifier {
         .init("sourceEditorDebugMenu")
     }
@@ -72,12 +69,12 @@ extension AppDelegate {
         xcodeInspectorDebug.submenu = xcodeInspectorDebugMenu
         xcodeInspectorDebug.isHidden = false
 
-        let accessibilityAPIPermission = NSMenuItem(
-            title: "Accessibility Permission: N/A",
-            action: nil,
+        statusMenuItem = NSMenuItem(
+            title: "",
+            action: #selector(openStatusLink),
             keyEquivalent: ""
         )
-        accessibilityAPIPermission.identifier = accessibilityAPIPermissionMenuItemIdentifier
+        statusMenuItem.isHidden = true
 
         let quitItem = NSMenuItem(
             title: "Quit",
@@ -126,7 +123,7 @@ extension AppDelegate {
         statusBarMenu.addItem(toggleIgnoreLanguage)
         statusBarMenu.addItem(.separator())
         statusBarMenu.addItem(copilotStatus)
-        statusBarMenu.addItem(accessibilityAPIPermission)
+        statusBarMenu.addItem(statusMenuItem)
         statusBarMenu.addItem(.separator())
         statusBarMenu.addItem(openDocs)
         statusBarMenu.addItem(openForum)
@@ -160,22 +157,14 @@ extension AppDelegate: NSMenuDelegate {
                 item.identifier == toggleIgnoreLanguageMenuItemIdentifier
             }) {
                 if let lang = DisabledLanguageList.shared.activeDocumentLanguage {
-                    toggleLanguage.title = "\(DisabledLanguageList.shared.isEnabled(lang) ? "Disable" : "Enable") Completions For \(lang.rawValue)"
+                    toggleLanguage.title = "\(DisabledLanguageList.shared.isEnabled(lang) ? "Disable" : "Enable") Completions for \(lang.rawValue)"
                     toggleLanguage.action = #selector(toggleIgnoreLanguage)
                 } else {
                     toggleLanguage.title = "No Active Document"
                     toggleLanguage.action = nil
                 }
             }
 
-            if let accessibilityAPIPermission = menu.items.first(where: { item in
-                item.identifier == accessibilityAPIPermissionMenuItemIdentifier
-            }) {
-                AXIsProcessTrusted()
-                accessibilityAPIPermission.title =
-                    "Accessibility Permission: \(AXIsProcessTrusted() ? "Granted" : "Not Granted")"
-            }
-
             statusChecker.updateStatusInBackground(notify: { (status: String, isOk: Bool) in
                 if let statusItem = menu.items.first(where: { item in
                     item.identifier == self.copilotStatusMenuItemIdentifier
@@ -321,6 +310,15 @@ private extension AppDelegate {
             }
         }
     }
+
+    @objc func openStatusLink() {
+        Task {
+            let status = await Status.shared.getStatus()
+            if let s = status.url, let url = URL(string: s) {
+                NSWorkspace.shared.open(url)
+            }
+        }
+    }
 }
 
 private extension NSMenuItem {

ExtensionService/AppDelegate.swift

@@ -6,6 +6,7 @@ import Logger
 import Preferences
 import Service
 import ServiceManagement
+import Status
 import SwiftUI
 import UpdateChecker
 import UserDefaultsObserver
@@ -30,6 +31,7 @@ class ExtensionUpdateCheckerDelegate: UpdateCheckerDelegate {
 class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
     let service = Service.shared
     var statusBarItem: NSStatusItem!
+    var statusMenuItem: NSMenuItem!
     var xpcController: XPCController?
     let updateChecker =
         UpdateChecker(
@@ -39,21 +41,29 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
     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,
         ] as CFDictionary)
         setupQuitOnUpdate()
         setupQuitOnUserTerminated()
-        setupQuitOnFeatureFlag()
         xpcController = .init()
         Logger.service.info("XPC Service started.")
         NSApp.setActivationPolicy(.accessory)
         buildStatusBarMenu()
+        watchServiceStatus()
+        watchAXStatus()
+        updateStatusBarItem() // set the initial status
     }
 
     @objc func quit() {
@@ -132,15 +142,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
         }
     }
 
-    func setupQuitOnFeatureFlag() {
-        FeatureFlagNotifierImpl.shared.featureFlagsDidChange.sink { [weak self] (flags) in
-            if flags.x != true {
-                Logger.service.info("Xcode feature flag not granted, quitting.")
-                self?.quit()
-            }
-        }.store(in: &cancellables)
-    }
-
     func requestAccessoryAPIPermission() {
         AXIsProcessTrustedWithOptions([
             kAXTrustedCheckOptionPrompt.takeRetainedValue() as NSString: true,
@@ -161,6 +162,70 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
         xpcExtensionService = service
         return service
     }
+
+    func watchServiceStatus() {
+        let notifications = NotificationCenter.default.notifications(named: .serviceStatusDidChange)
+        Task { [weak self] in
+            for await _ in notifications {
+                guard let self else { return }
+                self.updateStatusBarItem()
+            }
+        }
+    }
+
+    func watchAXStatus() {
+        let osNotifications = DistributedNotificationCenter.default().notifications(named: NSNotification.Name("com.apple.accessibility.api"))
+        Task { [weak self] in
+            for await _ in osNotifications {
+                guard let self else { return }
+                self.updateStatusBarItem()
+            }
+        }
+    }
+
+    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
+            self.statusBarItem.button?.image = image
+            if let message = status.message {
+                // TODO switch to attributedTitle to enable line breaks and color.
+                self.statusMenuItem.title = message
+                self.statusMenuItem.isHidden = false
+                self.statusMenuItem.isEnabled = status.url != nil
+            } else {
+                self.statusMenuItem.isHidden = true
+            }
+        }
+    }
+
+    func markAsProcessing(_ isProcessing: Bool) {
+        if !isProcessing {
+            // No longer in progress
+            progressView?.removeFromSuperview()
+            progressView = nil
+            statusBarItem.button?.image = idleIcon
+            return
+        }
+        if progressView != nil {
+            // Already in progress
+            return
+        }
+        let progress = NSProgressIndicator()
+        progress.style = .spinning
+        progress.sizeToFit()
+        progress.frame = statusBarItem.button?.bounds ?? .zero
+        progress.isIndeterminate = true
+        progress.startAnimation(nil)
+        statusBarItem.button?.addSubview(progress)
+        statusBarItem.button?.image = nil
+        progressView = progress
+    }
 }
 
 extension NSRunningApplication {