Move command trigger to XcodeInspector

Author: intitni

Core/Sources/Service/RealtimeSuggestionController.swift

@@ -21,7 +21,7 @@ public actor RealtimeSuggestionController {
     private var sourceEditor: SourceEditor?
 
     init() {}
-    
+
     deinit {
         task?.cancel()
         inflightPrefetchTask?.cancel()
@@ -34,7 +34,7 @@ public actor RealtimeSuggestionController {
     func start() {
         Task { await observeXcodeChange() }
     }
-    
+
     private func observeXcodeChange() {
         task?.cancel()
         task = Task { [weak self] in
@@ -150,7 +150,8 @@ public actor RealtimeSuggestionController {
                 // avoid the command get called twice
                 filespace.codeMetadata.uti = ""
                 do {
-                    try await Environment.triggerAction("Real-time Suggestions")
+                    try await XcodeInspector.shared.latestActiveXcode?
+                        .triggerCopilotCommand(name: "Real-time Suggestions")
                 } catch {
                     if filespace.codeMetadata.uti?.isEmpty ?? true {
                         filespace.codeMetadata.uti = nil

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -145,7 +145,8 @@ struct PseudoCommandHandler {
             }
         }() else {
             do {
-                try await Environment.triggerAction(command.name)
+                try await XcodeInspector.shared.latestActiveXcode?
+                    .triggerCopilotCommand(name: command.name)
             } catch {
                 let presenter = PresentInWindowSuggestionPresenter()
                 presenter.presentError(error)
@@ -167,7 +168,8 @@ struct PseudoCommandHandler {
             if UserDefaults.shared.value(for: \.alwaysAcceptSuggestionWithAccessibilityAPI) {
                 throw CancellationError()
             }
-            try await Environment.triggerAction("Accept Prompt to Code")
+            try await XcodeInspector.shared.latestActiveXcode?
+                .triggerCopilotCommand(name: "Accept Prompt to Code")
         } catch {
             guard let xcode = ActiveApplicationMonitor.shared.activeXcode
                 ?? ActiveApplicationMonitor.shared.latestXcode else { return }
@@ -206,7 +208,8 @@ struct PseudoCommandHandler {
             if UserDefaults.shared.value(for: \.alwaysAcceptSuggestionWithAccessibilityAPI) {
                 throw CancellationError()
             }
-            try await Environment.triggerAction("Accept Suggestion")
+            try await XcodeInspector.shared.latestActiveXcode?
+                .triggerCopilotCommand(name: "Accept Suggestion")
         } catch {
             guard let xcode = ActiveApplicationMonitor.shared.activeXcode
                 ?? ActiveApplicationMonitor.shared.latestXcode else { return }

Tool/Sources/Environment/Environment.swift

@@ -25,24 +25,6 @@ public struct FailedToFetchFileURLError: Error, LocalizedError {
 public enum Environment {
     public static var now = { Date() }
 
-    public static var isXcodeActive: () async -> Bool = {
-        ActiveApplicationMonitor.shared.activeXcode != nil
-    }
-
-    public static var frontmostXcodeWindowIsEditor: () async -> Bool = {
-        let appleScript = """
-        tell application "Xcode"
-            return path of document of the first window
-        end tell
-        """
-        do {
-            let result = try await runAppleScript(appleScript)
-            return !result.isEmpty
-        } catch {
-            return false
-        }
-    }
-
     #warning("TODO: Use XcodeInspector instead.")
     public static var fetchCurrentWorkspaceURLFromXcode: () async throws -> URL? = {
         if let xcode = ActiveApplicationMonitor.shared.activeXcode
@@ -148,114 +130,6 @@ public enum Environment {
             return windowElement
         }
     }
-
-    public static var triggerAction: (_ name: String) async throws -> Void = { name in
-        struct CantRunCommand: Error, LocalizedError {
-            let name: String
-            var errorDescription: String? {
-                "Can't run command \(name)."
-            }
-        }
-
-        guard let activeXcode = XcodeInspector.shared.latestActiveXcode?.runningApplication
-        else { throw CantRunCommand(name: name) }
-
-        let bundleName = Bundle.main
-            .object(forInfoDictionaryKey: "EXTENSION_BUNDLE_NAME") as! String
-
-        await Task.yield()
-
-        if UserDefaults.shared.value(for: \.triggerActionWithAccessibilityAPI) {
-            if !activeXcode.isActive { activeXcode.activate() }
-            let app = AXUIElementCreateApplication(activeXcode.processIdentifier)
-
-            if let editorMenu = app.menuBar?.child(title: "Editor"),
-               let commandMenu = editorMenu.child(title: bundleName)
-            {
-                if let button = commandMenu.child(title: name, role: "AXMenuItem") {
-                    let error = AXUIElementPerformAction(button, kAXPressAction as CFString)
-                    if error != AXError.success {
-                        Logger.service
-                            .error("Trigger command \(name) failed: \(error.localizedDescription)")
-                        throw error
-                    } else {
-                        return
-                    }
-                }
-            } else if let commandMenu = app.menuBar?.child(title: bundleName),
-                      let button = commandMenu.child(title: name, role: "AXMenuItem")
-            {
-                let error = AXUIElementPerformAction(button, kAXPressAction as CFString)
-                if error != AXError.success {
-                    Logger.service
-                        .error("Trigger command \(name) failed: \(error.localizedDescription)")
-                    throw error
-                } else {
-                    return
-                }
-            }
-
-            throw CantRunCommand(name: name)
-        } else {
-            /// check if menu is open, if not, click the menu item.
-            let appleScript = """
-            tell application "System Events"
-                set theprocs to every process whose unix id is \(activeXcode.processIdentifier)
-                repeat with proc in theprocs
-                set the frontmost of proc to true
-                    tell proc
-                        repeat with theMenu in menus of menu bar 1
-                            set theValue to value of attribute "AXVisibleChildren" of theMenu
-                            if theValue is not {} then
-                                return
-                            end if
-                        end repeat
-                        click menu item "\(name)" of menu 1 of menu item "\(bundleName)" of menu 1 of menu bar item "Editor" of menu bar 1
-                    end tell
-                end repeat
-            end tell
-            """
-
-            do {
-                try await runAppleScript(appleScript)
-            } catch {
-                Logger.service
-                    .error("Trigger command \(name) failed: \(error.localizedDescription)")
-                throw error
-            }
-        }
-    }
-}
-
-@discardableResult
-func runAppleScript(_ appleScript: String) async throws -> String {
-    let task = Process()
-    task.launchPath = "/usr/bin/osascript"
-    task.arguments = ["-e", appleScript]
-    let outpipe = Pipe()
-    task.standardOutput = outpipe
-    task.standardError = Pipe()
-
-    return try await withUnsafeThrowingContinuation { continuation in
-        do {
-            task.terminationHandler = { _ in
-                do {
-                    if let data = try outpipe.fileHandleForReading.readToEnd(),
-                       let content = String(data: data, encoding: .utf8)
-                    {
-                        continuation.resume(returning: content)
-                        return
-                    }
-                    continuation.resume(returning: "")
-                } catch {
-                    continuation.resume(throwing: error)
-                }
-            }
-            try task.run()
-        } catch {
-            continuation.resume(throwing: error)
-        }
-    }
 }
 
 public extension FileManager {

Tool/Sources/XcodeInspector/XcodeInspector.swift

@@ -4,6 +4,8 @@ import AXExtension
 import AXNotificationStream
 import Combine
 import Foundation
+import Logger
+import Preferences
 import SuggestionModel
 
 public final class XcodeInspector: ObservableObject {
@@ -88,8 +90,6 @@ public final class XcodeInspector: ObservableObject {
             .first(where: \.isActive)
             .map(AppInstanceInspector.init(runningApplication:))
 
-        #warning("Test Me")
-
         Task { // Did activate app
             if let activeXcode {
                 await setActiveXcode(activeXcode)
@@ -546,3 +546,132 @@ extension XcodeAppInstanceInspector {
     }
 }
 
+// MARK: - Triggering Command
+
+public extension XcodeAppInstanceInspector {
+    func triggerCopilotCommand(name: String) async throws {
+        let bundleName = Bundle.main
+            .object(forInfoDictionaryKey: "EXTENSION_BUNDLE_NAME") as! String
+        try await triggerMenuItem(path: ["Editor", bundleName, name])
+    }
+}
+
+public extension AppInstanceInspector {
+    func triggerMenuItem(path: [String]) async throws {
+        guard !path.isEmpty else { return }
+
+        struct CantRunCommand: Error, LocalizedError {
+            let path: [String]
+            var errorDescription: String? {
+                "Can't run command \(path.joined(separator: "/"))."
+            }
+        }
+
+        if !runningApplication.isActive { runningApplication.activate() }
+
+        if UserDefaults.shared.value(for: \.triggerActionWithAccessibilityAPI) {
+            let app = AXUIElementCreateApplication(runningApplication.processIdentifier)
+            guard let menuBar = app.menuBar else { throw CantRunCommand(path: path) }
+            var path = path
+            var currentMenu = menuBar
+            while !path.isEmpty {
+                let item = path.removeFirst()
+
+                if path.isEmpty, let button = currentMenu.child(title: item, role: "AXMenuItem") {
+                    let error = AXUIElementPerformAction(button, kAXPressAction as CFString)
+                    if error != AXError.success {
+                        Logger.service.error("""
+                        Trigger menu item \(path.joined(separator: "/")) failed: \
+                        \(error.localizedDescription)
+                        """)
+                        throw error
+                    } else {
+                        return
+                    }
+                } else if let menu = currentMenu.child(title: item) {
+                    currentMenu = menu
+                } else {
+                    throw CantRunCommand(path: path)
+                }
+            }
+        } else {
+            guard path.count >= 2 else { throw CantRunCommand(path: path) }
+
+            let clickTask = {
+                var path = path
+                let button = path.removeLast()
+                let menuBarItem = path.removeFirst()
+                let list = path
+                    .reversed()
+                    .map { "menu 1 of menu item \"\($0)\"" }
+                    .joined(separator: " of ")
+                return """
+                click menu item "\(button)" of \(list) \
+                of menu bar item "\(menuBarItem)" \
+                of menu bar 1
+                """
+            }()
+            /// check if menu is open, if not, click the menu item.
+            let appleScript = """
+            tell application "System Events"
+                set theprocs to every process whose unix id is \
+                \(runningApplication.processIdentifier)
+                repeat with proc in theprocs
+                set the frontmost of proc to true
+                    tell proc
+                        repeat with theMenu in menus of menu bar 1
+                            set theValue to value of attribute "AXVisibleChildren" of theMenu
+                            if theValue is not {} then
+                                return
+                            end if
+                        end repeat
+                        \(clickTask)
+                    end tell
+                end repeat
+            end tell
+            """
+
+            do {
+                try await runAppleScript(appleScript)
+            } catch {
+                Logger.service.error("""
+                Trigger menu item \(path.joined(separator: "/")) failed: \
+                \(error.localizedDescription)
+                """)
+                throw error
+            }
+        }
+    }
+}
+
+@discardableResult
+func runAppleScript(_ appleScript: String) async throws -> String {
+    let task = Process()
+    task.launchPath = "/usr/bin/osascript"
+    task.arguments = ["-e", appleScript]
+    let outpipe = Pipe()
+    task.standardOutput = outpipe
+    task.standardError = Pipe()
+
+    return try await withUnsafeThrowingContinuation { continuation in
+        do {
+            task.terminationHandler = { _ in
+                do {
+                    if let data = try outpipe.fileHandleForReading.readToEnd(),
+                       let content = String(data: data, encoding: .utf8)
+                    {
+                        continuation.resume(returning: content)
+                        return
+                    }
+                    continuation.resume(returning: "")
+                } catch {
+                    continuation.resume(throwing: error)
+                }
+            }
+            try task.run()
+        } catch {
+            continuation.resume(throwing: error)
+        }
+    }
+}
+

Tool/Sources/XcodeInspector/XcodeWindowInspector.swift

@@ -38,7 +38,6 @@ public final class WorkspaceXcodeWindowInspector: XcodeWindowInspector {
             notificationNames: kAXFocusedUIElementChangedNotification
         )
 
-        #warning("Test Me")
         focusedElementChangedTask = Task { [weak self] in
             await self?.updateURLs()