Fix that can't bring the extension service app back to live when it quits

Author: intitni

CommunicationBridge/ServiceDelegate.swift

@@ -117,7 +117,17 @@ actor ExtensionServiceLauncher {
     var isLaunching: Bool = false
     var application: NSRunningApplication?
     var isApplicationValid: Bool {
-        if let application, !application.isTerminated { return true }
+        guard let application else { return false }
+        if application.isTerminated { return false }
+        let identifier = application.processIdentifier
+        if let application = NSWorkspace.shared.runningApplications.first(where: {
+            $0.processIdentifier == identifier
+        }) {
+            Logger.communicationBridge.info(
+                "Service app found: \(application.processIdentifier) \(String(describing: application.bundleIdentifier))"
+            )
+            return true
+        }
         return false
     }
 
@@ -126,9 +136,16 @@ actor ExtensionServiceLauncher {
         isLaunching = true
 
         Logger.communicationBridge.info("Launching extension service app.")
+
         NSWorkspace.shared.openApplication(
             at: appURL,
-            configuration: .init()
+            configuration: {
+                let configuration = NSWorkspace.OpenConfiguration()
+                configuration.createsNewApplicationInstance = false
+                configuration.addsToRecentItems = false
+                configuration.activates = false
+                return configuration
+            }()
         ) { app, error in
             if let error = error {
                 Logger.communicationBridge.error(

Core/Sources/HostApp/General.swift

@@ -24,6 +24,8 @@ struct General {
     }
 
     @Dependency(\.toast) var toast
+    
+    struct ReloadStatusCancellableId: Hashable {}
 
     var body: some ReducerOf<Self> {
         Reduce { state, action in
@@ -91,7 +93,7 @@ struct General {
                         toast(error.localizedDescription, .error)
                         await send(.failedReloading)
                     }
-                }
+                }.cancellable(id: ReloadStatusCancellableId(), cancelInFlight: true)
 
             case let .finishReloading(version, granted):
                 state.xpcServiceVersion = version

ExtensionService/AppDelegate.swift

@@ -53,6 +53,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
     @objc func quit() {
         Task { @MainActor in
             await service.prepareForExit()
+            await xpcController?.quit()
             NSApp.terminate(self)
         }
     }

ExtensionService/XPCController.swift

@@ -20,10 +20,16 @@ final class XPCController: XPCServiceDelegate {
         self.bridge = bridge
 
         Task {
-            await bridge.setDelegate(self)
+            bridge.setDelegate(self)
             createPingTask()
         }
     }
+    
+    func quit() async {
+        bridge.setDelegate(nil)
+        pingTask?.cancel()
+        try? await bridge.quit()
+    }
 
     deinit {
         xpcListener.invalidate()

Tool/Sources/XPCShared/XPCCommunicationBridge.swift

@@ -34,7 +34,7 @@ public class XPCCommunicationBridge {
         self.logger = logger
     }
 
-    public func setDelegate(_ delegate: XPCServiceDelegate) {
+    public func setDelegate(_ delegate: XPCServiceDelegate?) {
         service.delegate = delegate
     }