Multi-installation discovery + switching

Author: stronk-dev

AppDelegate.swift

@@ -19,6 +19,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
   // MARK: - Component Managers
   private let mistServerManager = MistServerManager.shared
 
+  /// Re-detect all installations and resolve active mode
+  func redetectServerMode() {
+    let installations = mistServerManager.detectAllInstallations()
+    let preference = mistServerManager.loadPreferredInstallation()
+    appState.discoveredInstallations = installations
+    appState.serverMode = mistServerManager.resolveActiveMode(
+      installations: installations, preference: preference)
+  }
+
   override init() {
     super.init()
   }
@@ -37,8 +46,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     // 1) Create the menu bar icon
     setupStatusBarIcon()
 
-    // 2) Detect server mode and running state
-    appState.serverMode = mistServerManager.detectServerMode()
+    // 2) Detect server installations and resolve active mode
+    let installations = mistServerManager.detectAllInstallations()
+    let preference = mistServerManager.loadPreferredInstallation()
+    appState.discoveredInstallations = installations
+    appState.serverMode = mistServerManager.resolveActiveMode(
+      installations: installations, preference: preference)
     appState.serverRunning = mistServerManager.isMistServerRunning(mode: appState.serverMode)
 
     // 3) Initial data refresh with auth check (capabilities included in main fetch)
@@ -55,11 +68,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     // 5) Schedule regular data updates (every 10 seconds)
     activeStreamsTimer = Timer.scheduledTimer(withTimeInterval: 10, repeats: true) { [weak self] _ in
       guard let self = self else { return }
-      // Re-detect mode on background queue to avoid blocking main thread
+      // Re-detect installations on background queue to avoid blocking main thread
       DispatchQueue.global(qos: .utility).async {
-        let mode = self.mistServerManager.detectServerMode()
+        let installations = self.mistServerManager.detectAllInstallations()
+        let preference = self.mistServerManager.loadPreferredInstallation()
+        let mode = self.mistServerManager.resolveActiveMode(
+          installations: installations, preference: preference)
         let running = self.mistServerManager.isMistServerRunning(mode: mode)
         DispatchQueue.main.async {
+          self.appState.discoveredInstallations = installations
           self.appState.serverMode = mode
           self.appState.serverRunning = running
           if running {
@@ -283,7 +300,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
           self?.appState.serverRunning = !success
           if success {
             // Re-detect mode after stopping
-            self?.appState.serverMode = self?.mistServerManager.detectServerMode() ?? .notFound
+            self?.redetectServerMode()
           }
         }
       }
@@ -302,7 +319,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         DispatchQueue.main.async {
           self?.appState.serverRunning = success
           if success {
-            self?.appState.serverMode = self?.mistServerManager.detectServerMode() ?? mode
+            self?.redetectServerMode()
             DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
               self?.checkAuthAndRefresh()
             }

AppState.swift

@@ -13,6 +13,7 @@ class AppState {
   var needsAuth = false
   var authError: String?
   var serverMode: ServerMode = .notFound
+  var discoveredInstallations: [MistInstallation] = []
 
   var serverURL: String = UserDefaults.standard.string(forKey: "ServerURL") ?? "http://localhost:4242" {
     didSet {

DashboardView.swift

@@ -383,7 +383,9 @@ struct DashboardView: View {
           appState.serverRunning = !success
           appState.isTogglingServer = false
           if success {
-            appState.serverMode = manager.detectServerMode()
+            if let appDelegate = NSApp.delegate as? AppDelegate {
+              appDelegate.redetectServerMode()
+            }
           }
         }
       }
@@ -404,7 +406,9 @@ struct DashboardView: View {
           appState.serverRunning = success
           appState.isTogglingServer = false
           if success {
-            appState.serverMode = manager.detectServerMode()
+            if let appDelegate = NSApp.delegate as? AppDelegate {
+              appDelegate.redetectServerMode()
+            }
             DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
               refreshData()
             }

DetailViews.swift

@@ -1623,14 +1623,40 @@ struct SettingsView: View {
             .onChange(of: showNotifications) { hasChanges = true }
         }
 
-        Section {
-          HStack {
-            Text("Mode:")
-              .foregroundStyle(.secondary)
-            Text(appState.serverMode.description)
+        if appState.discoveredInstallations.count > 1 {
+          Section("Server Installation") {
+            Picker("Active Installation", selection: Binding(
+              get: {
+                MistServerManager.shared.loadPreferredInstallation()
+                  ?? appState.discoveredInstallations.first?.key ?? ""
+              },
+              set: { newKey in
+                MistServerManager.shared.savePreferredInstallation(newKey)
+                let installations = MistServerManager.shared.detectAllInstallations()
+                appState.discoveredInstallations = installations
+                appState.serverMode = MistServerManager.shared.resolveActiveMode(
+                  installations: installations, preference: newKey)
+              }
+            )) {
+              ForEach(appState.discoveredInstallations) { install in
+                Text(install.label).tag(install.key)
+              }
+            }
+            .pickerStyle(.inline)
+            .font(.caption)
           }
-          .font(.caption)
+        } else {
+          Section("Server Installation") {
+            HStack {
+              Text("Mode:")
+                .foregroundStyle(.secondary)
+              Text(appState.serverMode.description)
+            }
+            .font(.caption)
+          }
+        }
 
+        Section {
           VStack(alignment: .leading, spacing: 4) {
             Text("Custom Binary Path")
               .font(.caption.weight(.medium))
@@ -1746,8 +1772,12 @@ struct SettingsView: View {
     UserDefaults.standard.set(customBinaryPath.trimmed, forKey: "CustomBinaryPath")
     UserDefaults.standard.set(customConfigPath.trimmed, forKey: "CustomConfigPath")
     hasChanges = false
-    // Re-detect mode after path changes
-    appState.serverMode = MistServerManager.shared.detectServerMode()
+    // Re-detect installations after path changes
+    let installations = MistServerManager.shared.detectAllInstallations()
+    let preference = MistServerManager.shared.loadPreferredInstallation()
+    appState.discoveredInstallations = installations
+    appState.serverMode = MistServerManager.shared.resolveActiveMode(
+      installations: installations, preference: preference)
   }
 
   private func browseForBinary() {