Fixed restart; added run on startup

Author: Xpitfire

singularity/AppModel.swift

@@ -467,6 +467,10 @@ final class AppModel: NSObject, ObservableObject {
     @Published var cfgAutoHideOnDefocus: Bool = ConfigService.autoHideOnDefocus()
     // Option: allow automatic updates at launch (persisted, defaults on)
     @Published var cfgAutoUpdateEnabled: Bool = ConfigService.autoUpdateEnabled()
+    // Option: run on startup (persisted via SMAppService)
+    @Published var cfgRunOnStartup: Bool = ConfigService.runOnStartup() {
+        didSet { ConfigService.setRunOnStartup(cfgRunOnStartup) }
+    }
     // Overlay level suppression for app-modal panels (e.g., NSOpenPanel) so we can keep overlay visible on defocus
     private var overlayLevelSuppressedCount: Int = 0
     private var overlayOriginalLevel: NSWindow.Level? = nil

singularity/ConfigService.swift

@@ -1,5 +1,6 @@
 import Foundation
 import Security
+import ServiceManagement
 
 enum ConfigService {
     // Preferred: EXT API key used by the gateway
@@ -239,4 +240,30 @@ enum ConfigService {
             } catch { /* ignore individual write errors; best-effort */ }
         }
     }
+
+    // MARK: - Run on Startup (SMAppService)
+    static func runOnStartup() -> Bool {
+        return SMAppService.mainApp.status == .enabled
+    }
+
+    static func setRunOnStartup(_ enabled: Bool) {
+        do {
+            if enabled {
+                try SMAppService.mainApp.register()
+            } else {
+                try SMAppService.mainApp.unregister()
+            }
+        } catch {
+            print("Failed to update run on startup status: \(error)")
+        }
+    }
+
+    static func enforceRunOnStartupDefault() {
+        let key = "RunOnStartupInitialized"
+        if !UserDefaults.standard.bool(forKey: key) {
+            // First run (or migration), default to ON
+            setRunOnStartup(true)
+            UserDefaults.standard.set(true, forKey: key)
+        }
+    }
 }

singularity/PanelView.swift

@@ -6439,6 +6439,13 @@ extension PanelView {
                             Text("On click outside, hide overlay like ⌘B.")
                                 .font(.caption)
                                 .foregroundStyle(.secondary)
+                            HStack {
+                                Text("Run on Startup").frame(width: 180, alignment: .leading)
+                                Toggle("", isOn: $model.cfgRunOnStartup).labelsHidden()
+                            }
+                            Text("Automatically launch Singularity when you log in.")
+                                .font(.caption)
+                                .foregroundStyle(.secondary)
                             HStack {
                                 Text("Auto Update Singularity").frame(width: 180, alignment: .leading)
                                 Toggle("", isOn: $model.cfgAutoUpdateEnabled).labelsHidden()

singularity/StartupUpdateCoordinator.swift

@@ -586,9 +586,12 @@ extension StartupUpdateCoordinator {
     }
 
     nonisolated private static func relaunchApp(at appURL: URL) async throws {
-        try await runProcess(tool: "/usr/bin/open", arguments: [appURL.path], treatNonZeroAsError: { code in
-            AppUpdateError.processFailed(tool: "open", code: code)
-        })
+        // Use a detached shell process to wait for termination before opening
+        let process = Process()
+        process.executableURL = URL(fileURLWithPath: "/bin/sh")
+        process.arguments = ["-c", "sleep 1; open \"$0\"", appURL.path]
+        try process.run()
+        
         await MainActor.run {
             NSApp.terminate(nil)
         }

singularity/singularityApp.swift

@@ -30,6 +30,7 @@ struct interview_coderApp: App {
                     AppModel.globalFinishOnboarding = { onboardingActive = false }
                     NetworkMonitor.shared.start()
                     SupabaseAuthService.shared.start()
+                    ConfigService.enforceRunOnStartupDefault()
                 }
                 .onDisappear { AppModel.globalFinishOnboarding = nil }
         }