Make keyboard command runner main actor

Author: zenangst

App/Sources/Core/Runners/CommandRunner.swift

@@ -389,10 +389,10 @@ final class CommandRunner: CommandRunning, @unchecked Sendable {
         output = command.name
       }
     case .keyboard(let keyboardCommand):
-      try runners.keyboard.run(keyboardCommand.keyboardShortcuts,
-                               originalEvent: nil,
-                               iterations: keyboardCommand.iterations,
-                               with: eventSource)
+      try await runners.keyboard.run(keyboardCommand.keyboardShortcuts,
+                                     originalEvent: nil,
+                                     iterations: keyboardCommand.iterations,
+                                     with: eventSource)
       try await Task.sleep(for: .milliseconds(1))
       output = command.name
     case .menuBar(let menuBarCommand):

App/Sources/Core/Runners/KeyboardCommandRunner.swift

@@ -23,6 +23,7 @@ final class KeyboardCommandRunner: @unchecked Sendable {
   }
 
   @discardableResult
+  @MainActor
   func run(_ keyboardShortcuts: [KeyShortcut],
            originalEvent: CGEvent? = nil,
            iterations: Int,

App/Sources/Core/Runners/MacroCoordinator.swift

@@ -80,7 +80,7 @@ final class MacroCoordinator: @unchecked Sendable {
 
       state = .running
 
-      task = Task.detached { @MainActor [machPort, workflowRunner, keyboardRunner, weak self] in
+      task = Task.detached { [machPort, workflowRunner, keyboardRunner, weak self] in
         do {
           for _  in 0..<iterations {
             let specialKeys: [Int] = [kVK_Return, kVK_Escape]
@@ -101,11 +101,11 @@ final class MacroCoordinator: @unchecked Sendable {
                   for command in workflow.commands {
                     try Task.checkCancellation()
                     if case .keyboard(let command) = command {
-                      _ = try keyboardRunner.run(command.keyboardShortcuts,
-                                                 originalEvent: nil,
-                                                 iterations: command.iterations,
-                                                 isRepeating: false,
-                                                 with: machPortEvent.eventSource)
+                      _ = try await keyboardRunner.run(command.keyboardShortcuts,
+                                                       originalEvent: nil,
+                                                       iterations: command.iterations,
+                                                       isRepeating: false,
+                                                       with: machPortEvent.eventSource)
                       try await Task.sleep(for: .milliseconds(5))
                     }
                   }
@@ -116,11 +116,11 @@ final class MacroCoordinator: @unchecked Sendable {
               }
             }
           }
-          await MainActor.run {
+          await MainActor.run { [weak self] in
             self?.state = .idle
           }
         } catch {
-          await MainActor.run {
+          await MainActor.run { [weak self] in
             self?.state = .idle
           }
         }

App/Sources/Core/UserSpace.swift

@@ -139,7 +139,7 @@ final class UserSpace: @unchecked Sendable {
       return interpolatedString
     }
 
-    func terminalEnvironment() -> [String: String] {
+    func terminalEnvironment() async -> [String: String] {
       var environment = ProcessInfo.processInfo.environment
       environment["TERM"] = "xterm-256color"
       environment[.selectedText] = selectedText