Make runningApplication private

Author: intitni

Core/Sources/SuggestionWidget/FeatureReducers/WidgetFeature.swift

@@ -238,10 +238,10 @@ public struct WidgetFeature: ReducerProtocol {
 
             case .observeActiveApplicationChange:
                 return .run { send in
-                    let stream = AsyncStream<NSRunningApplication> { continuation in
+                    let stream = AsyncStream<AppInstanceInspector> { continuation in
                         let cancellable = xcodeInspector.$activeApplication.sink { newValue in
                             guard let newValue else { return }
-                            continuation.yield(newValue.runningApplication)
+                            continuation.yield(newValue)
                         }
                         continuation.onTermination = { _ in
                             cancellable.cancel()
@@ -293,7 +293,7 @@ public struct WidgetFeature: ReducerProtocol {
                         guard let activeXcode = xcodeInspector.activeXcode else { continue }
                         guard await windows.fullscreenDetector.isOnActiveSpace else { continue }
                         let app = AXUIElementCreateApplication(
-                            activeXcode.runningApplication.processIdentifier
+                            activeXcode.processIdentifier
                         )
                         if let _ = app.focusedWindow {
                             await windows.orderFront()
@@ -538,7 +538,7 @@ public struct WidgetFeature: ReducerProtocol {
                     let task = Task { @MainActor in
                         if let activeApp, activeApp.isXcode {
                             let application = AXUIElementCreateApplication(
-                                activeApp.runningApplication.processIdentifier
+                                activeApp.processIdentifier
                             )
                             /// We need this to hide the windows when Xcode is minimized.
                             let noFocus = application.focusedWindow == nil

ExtensionService/AppDelegate+Menu.swift

@@ -164,7 +164,7 @@ extension AppDelegate: NSMenuDelegate {
 
             for xcode in inspector.xcodes {
                 let item = NSMenuItem(
-                    title: "Xcode \(xcode.runningApplication.processIdentifier)",
+                    title: "Xcode \(xcode.processIdentifier)",
                     action: nil,
                     keyEquivalent: ""
                 )

Tool/Sources/AppActivator/AppActivator.swift

@@ -31,15 +31,15 @@ public extension NSWorkspace {
         Task { @MainActor in
             guard let app = XcodeInspector.shared.previousActiveApplication else { return }
             try await Task.sleep(nanoseconds: UInt64(delay * 1_000_000_000))
-            app.runningApplication.activate()
+            app.activate()
         }
     }
 
     static func activatePreviousActiveXcode(delay: TimeInterval = 0.2) {
         Task { @MainActor in
             guard let app = XcodeInspector.shared.latestActiveXcode else { return }
             try await Task.sleep(nanoseconds: UInt64(delay * 1_000_000_000))
-            app.runningApplication.activate()
+            app.activate()
         }
     }
 }

Tool/Sources/XcodeInspector/AppInstanceInspector.swift

@@ -2,16 +2,43 @@ import AppKit
 import Foundation
 
 public class AppInstanceInspector: ObservableObject {
+    let runningApplication: NSRunningApplication
+    public let processIdentifier: pid_t
+    public let bundleURL: URL?
+    public let bundleIdentifier: String?
+
     public var appElement: AXUIElement {
-        AXUIElementCreateApplication(runningApplication.processIdentifier)
+        return AXUIElementCreateApplication(runningApplication.processIdentifier)
+    }
+
+    public var isTerminated: Bool {
+        return runningApplication.isTerminated
+    }
+
+    public var isActive: Bool {
+        guard !runningApplication.isTerminated else { return false }
+        return runningApplication.isActive
+    }
+
+    public var isXcode: Bool {
+        guard !runningApplication.isTerminated else { return false }
+        return runningApplication.isXcode
+    }
+
+    public var isExtensionService: Bool {
+        guard !runningApplication.isTerminated else { return false }
+        return runningApplication.isCopilotForXcodeExtensionService
+    }
+
+    public func activate() -> Bool {
+        return runningApplication.activate()
     }
-    public let runningApplication: NSRunningApplication
-    public var isActive: Bool { runningApplication.isActive }
-    public var isXcode: Bool { runningApplication.isXcode }
-    public var isExtensionService: Bool { runningApplication.isCopilotForXcodeExtensionService }
 
     init(runningApplication: NSRunningApplication) {
         self.runningApplication = runningApplication
+        processIdentifier = runningApplication.processIdentifier
+        bundleURL = runningApplication.bundleURL
+        bundleIdentifier = runningApplication.bundleIdentifier
     }
 }
 

Tool/Sources/XcodeInspector/XcodeInspector.swift

@@ -122,7 +122,7 @@ public final class XcodeInspector: ObservableObject {
         appChangeObservations.forEach { $0.cancel() }
         appChangeObservations.removeAll()
 
-        let appChangeTask = Task { [weak self] in
+        let appChangeTask = Task(priority: .utility) { [weak self] in
             guard let self else { return }
             if let activeXcode {
                 await setActiveXcode(activeXcode)
@@ -140,7 +140,7 @@ public final class XcodeInspector: ObservableObject {
                         else { continue }
                         if app.isXcode {
                             if let existed = xcodes.first(where: {
-                                $0.runningApplication.processIdentifier == app.processIdentifier
+                                $0.processIdentifier == app.processIdentifier && !$0.isTerminated
                             }) {
                                 await MainActor.run {
                                     self.setActiveXcode(existed)
@@ -175,7 +175,7 @@ public final class XcodeInspector: ObservableObject {
                             let processIdentifier = app.processIdentifier
                             await MainActor.run {
                                 self.xcodes.removeAll {
-                                    $0.runningApplication.processIdentifier == processIdentifier
+                                    $0.processIdentifier == processIdentifier || $0.isTerminated
                                 }
                                 if self.latestActiveXcode?.runningApplication
                                     .processIdentifier == processIdentifier