fix(mac): keep launch-at-login app running (#102465)

steipete · web-flow · commit 363cf0461f25 · 2026-07-09T08:08:17.000+01:00
* fix(mac): avoid launch-agent self-reload

* chore: leave release changelog generation

* style(mac): use conditional expression
diff --git a/apps/macos/Sources/OpenClaw/LaunchAgentManager.swift b/apps/macos/Sources/OpenClaw/LaunchAgentManager.swift
@@ -8,13 +8,32 @@ enum LaunchAgentManager {
 
     static func status() async -> Bool {
         guard FileManager().fileExists(atPath: self.plistURL.path) else { return false }
+        return await self.isLoaded()
+    }
+
+    private static func isLoaded() async -> Bool {
         let result = await self.runLaunchctl(["print", "gui/\(getuid())/\(launchdLabel)"])
         return result == 0
     }
 
-    static func set(enabled: Bool, bundlePath: String) async {
+    @discardableResult
+    static func set(
+        enabled: Bool,
+        bundlePath: String,
+        loaded: Bool? = nil,
+        writePlist: ((String) -> Void)? = nil) async -> Bool
+    {
         if enabled {
-            self.writePlist(bundlePath: bundlePath)
+            let persist = writePlist ?? { self.writePlist(bundlePath: $0) }
+            persist(bundlePath)
+            let alreadyLoaded = if let loaded {
+                loaded
+            } else {
+                await self.isLoaded()
+            }
+            // Startup hydrates the toggle from launchd. Reinstalling the active job here
+            // would boot out the app that is still responsible for bootstrapping it again.
+            guard !alreadyLoaded else { return false }
             _ = await self.runLaunchctl(["bootout", "gui/\(getuid())/\(launchdLabel)"])
             _ = await self.runLaunchctl(["bootstrap", "gui/\(getuid())", self.plistURL.path])
             _ = await self.runLaunchctl(["kickstart", "-k", "gui/\(getuid())/\(launchdLabel)"])
@@ -23,6 +42,7 @@ enum LaunchAgentManager {
             // bootout would terminate the launchd job immediately (and crash the app if launched via agent).
             try? FileManager().removeItem(at: self.plistURL)
         }
+        return true
     }
 
     private static func writePlist(bundlePath: String) {
diff --git a/apps/macos/Tests/OpenClawIPCTests/LaunchAgentManagerTests.swift b/apps/macos/Tests/OpenClawIPCTests/LaunchAgentManagerTests.swift
@@ -3,6 +3,18 @@ import Testing
 @testable import OpenClaw
 
 struct LaunchAgentManagerTests {
+    @Test func `enabling an already loaded login job only refreshes its plist`() async {
+        var persistedBundlePaths: [String] = []
+        let reloaded = await LaunchAgentManager.set(
+            enabled: true,
+            bundlePath: "/Applications/OpenClaw.app",
+            loaded: true,
+            writePlist: { persistedBundlePaths.append($0) })
+
+        #expect(reloaded == false)
+        #expect(persistedBundlePaths == ["/Applications/OpenClaw.app"])
+    }
+
     @Test func `launch at login plist does not keep app alive after manual quit`() throws {
         let plist = LaunchAgentManager.plistContents(bundlePath: "/Applications/OpenClaw.app")
         let data = try #require(plist.data(using: .utf8))
