feat(mac): evaluate installation state on startup 🍎

mac/Config/Config/ConfigApp.swift

@@ -16,17 +16,12 @@ struct ConfigApp: App {
   @Environment(\.openWindow) private var openWindow
 
   var body: some Scene {
-    Window("Configuration", id: "config") {
-      ConfigView()
+    Window("Config Test", id: "config-debug") {
+      ConfigDebugView()
         .environmentObject(settings)
-        .task {
-          if !installation.isInstallationComplete() {
-            openWindow(id: "install")
-          }
-        }
     }
-    Window("Installation", id: "install") {
-      InstallView()
+    Window("Install Test", id: "install-debug") {
+      InstallDebugView()
         .environmentObject(installation)
     }
   }

mac/Config/Config/ConfigView.swift → mac/Config/Config/ConfigDebugView.swift

@@ -3,13 +3,13 @@
  *
  * Created by Shawn Schantz on 2026-02-26
  *
- * Main view used for configuring Keyman
+ * View for debugging Keyman configuration
  */
 
 import SwiftUI
 import KeymanSettings
 
-struct ConfigView: View {
+struct ConfigDebugView: View {
   @EnvironmentObject var settings: SettingsContainer
   @State private var isShowingSheet = false
 
@@ -86,7 +86,7 @@ struct ConfigView: View {
                 .labelStyle(.iconOnly)
                 .buttonStyle(.borderless)
               }
-              KeyboardListView(packageId: package.id, keyboards: package.keyboards)
+              KeyboardListDebugView(packageId: package.id, keyboards: package.keyboards)
             }
           }
         }
@@ -99,6 +99,6 @@ struct ConfigView: View {
 
 #Preview {
   let settings = SettingsContainer()
-  ConfigView()
+  ConfigDebugView()
     .environmentObject(settings)
 }

mac/Config/Config/InstallView.swift → mac/Config/Config/InstallDebugView.swift

@@ -8,22 +8,29 @@
 
 import SwiftUI
 
-struct InstallView: View {
+struct InstallDebugView: View {
   @EnvironmentObject var installation: InstallationContainer
-
+  @State private var taskText: String = "[task]"
+
   var body: some View {
     VStack {
       HStack {
         Image(systemName: "gear")
           .imageScale(.large)
           .foregroundColor(.accentColor)
-        if let nextTask = installation.nextTask() {
-          Text("Next task = \(nextTask.taskType.rawValue)")
-        }
+        Text("Current task = \(taskText)")
+          .onAppear() {
+            if let installTask = installation.currentTask() {
+              taskText = installTask.taskType.rawValue
+            }
+          }
       }
       HStack {
         Button("Next...") {
-          installation.executeNextInstallationTask()
+          installation.executeCurrentInstallationTask()
+          if let installTask = installation.currentTask() {
+            taskText = installTask.taskType.rawValue
+          }
         }
         .disabled(installation.isInstallationComplete())
         Button("Migrate Data") {
@@ -54,6 +61,12 @@ struct InstallView: View {
         Button("Check Restart") {
           _ = installation.validateUserHasRestarted()
         }
+        Button("Set Displayed Complete") {
+          let beforeDisplayed = installation.getHasDisplayedInstallationComplete()
+          installation.setHasDisplayedInstallationComplete()
+          let afterDisplayed = installation.getHasDisplayedInstallationComplete()
+          print("hasDisplayedInstallComplete = \(beforeDisplayed) -> \(afterDisplayed)")
+        }
         Button("debug") {
           installation.debug()
         }
@@ -66,22 +79,17 @@ struct InstallView: View {
         Button("Uninstall") {
           installation.uninstall()
         }
-        Button("Force Reset Installation") {
-          installation.forceResetInstallation()
-        }
-        Button("Force Validate Installation") {
-          installation.forceValidateInstallation()
-        }
         Spacer()
       }
       .padding()
     }
     .padding()
+//    .onReceive(NotificationCenter.default.publisher(for: .inputMethodMissing), perform: {_ in print("input method missing")})
   }
 }
 
 #Preview {
   let installation = InstallationContainer()
-  InstallView()
+  InstallDebugView()
     .environmentObject(installation)
 }

mac/Config/Config/KeyboardListView.swift → mac/Config/Config/KeyboardListDebugView.swift

@@ -10,7 +10,7 @@ import SwiftUI
 import KeymanSettings
 import Combine
 
-struct KeyboardListView: View {
+struct KeyboardListDebugView: View {
   @EnvironmentObject var settings: SettingsContainer
   @State var packageId: UUID
   @State var keyboards: [Keyboard]

mac/Config/Installation/InputMethodUtil.swift

@@ -52,14 +52,6 @@ public class InputMethodUtil {
     return FileManager.default.fileExists(atPath: inputMethodUrl.path)
   }
 
-  /**
-   * true if the Keyman input method of the correct version exists in the correct location
-   */
-  public func isKeymanInputMethodCurrent()  -> Bool {
-    // MAC-CONFIG-TODO: implement with version check
-    return true
-  }
-
   /**
    * Returns version number string of Keyman input method
    */
@@ -177,6 +169,11 @@ public class InputMethodUtil {
     var success = false
     do {
       print("invokeKeymanInputMethodRequestAccess()")
+
+      // because we are launching Keyman with a specific command line argument
+      // for this request, we must kill it first
+      _ = self.killKeymanInputMethod()
+
       try self.launchKeymanInputMethodAsSeparateProcess(argument: kAccessCommand)
       success = true
     } catch {
@@ -187,14 +184,19 @@ public class InputMethodUtil {
   }
 
   /**
-   * Calls Keyman input to check whether it has accessibility permission granted.
+   * Calls Keyman input method to check whether it has accessibility permission granted.
    * The actual result is not returned from Keyman when called as a separate process.
-   * After this function is called, listen to the `NotificationCenter` for the notification named
-   * `com.keyman.accessibility.state`
+   * After this function is called, listen to the `DistributedNotificationCenter` for the notification named
+   * `accessibilityStateResponse`
    * It contains a message with a value of `granted` or `not-granted`
    */
   func invokeKeymanInputMethodCheckAccess() throws {
     print("invokeKeymanInputMethodCheckAccess()")
+
+    // because we are launching Keyman with a specific command line argument
+    // for this request, we must kill it first
+    _ = self.killKeymanInputMethod()
+
     try self.launchKeymanInputMethodAsSeparateProcess(argument: kCheckCommand)
   }
 
@@ -250,11 +252,8 @@ public class InputMethodUtil {
   }
 
   /**
-   * Special care is needed with this code because `processAccessCheckResult(with:)` is bound to the Main Actor,
-   * but it is called from a closure which may not run on the Main Actor.
-   * DistributedNotificationCenter is not fully updated for concurrency, so specifying `.main` for the `OperationQueue`
-   * does not ensure that the closure is running on the main actor.
-   * To ensure this, a Task is defined around the call to  `processAccessCheckResult`.
+   * Calls Keyman input method to check whether it has accessibility permission granted.
+   * Receives response as distributed notification named `accessibilityStateResponse`
    */
   func doAsyncAccessibilityCheck() {
     do {
@@ -273,7 +272,7 @@ public class InputMethodUtil {
 
   /**
    * Kill the application with the specified bundle Id
-   * This is only permitted when running oustide sandbox
+   * This is only permitted when running outside sandbox
    */
   func killApplication(bundleId: String) -> Bool {
     let runningApps = NSRunningApplication.runningApplications(withBundleIdentifier: bundleId)