Activate Xcode when closing chat and prompt to code

Author: intitni

Core/Sources/ActiveApplicationMonitor/ActiveApplicationMonitor.swift

@@ -4,11 +4,13 @@ public final class ActiveApplicationMonitor {
     static let shared = ActiveApplicationMonitor()
     var latestXcode: NSRunningApplication? = NSWorkspace.shared.runningApplications
         .first(where: \.isXcode)
+    var previousApp: NSRunningApplication?
     var activeApplication = NSWorkspace.shared.runningApplications.first(where: \.isActive) {
         didSet {
             if activeApplication?.isXcode ?? false {
                 latestXcode = activeApplication
             }
+            previousApp = oldValue
         }
     }
 
@@ -35,6 +37,8 @@ public final class ActiveApplicationMonitor {
     }
 
     public static var activeApplication: NSRunningApplication? { shared.activeApplication }
+    
+    public static var previousActiveApplication: NSRunningApplication? { shared.previousApp }
 
     public static var activeXcode: NSRunningApplication? {
         if activeApplication?.isXcode ?? false {
@@ -77,3 +81,4 @@ public final class ActiveApplicationMonitor {
 public extension NSRunningApplication {
     var isXcode: Bool { bundleIdentifier == "com.apple.dt.Xcode" }
 }
+

Core/Sources/Service/GUI/WidgetDataSource.swift

@@ -1,9 +1,10 @@
+import ActiveApplicationMonitor
 import ChatService
-import SuggestionModel
-import GitHubCopilotService
 import Foundation
+import GitHubCopilotService
 import OpenAIService
 import PromptToCodeService
+import SuggestionModel
 import SuggestionWidget
 
 @ServiceActor
@@ -52,6 +53,9 @@ final class WidgetDataSource {
                     }
                     let presenter = PresentInWindowSuggestionPresenter()
                     presenter.closeChatRoom(fileURL: url)
+                    if let app = ActiveApplicationMonitor.previousActiveApplication, app.isXcode {
+                        app.activate()
+                    }
                 },
                 onSwitchContext: { [weak self] in
                     let useGlobalChat = UserDefaults.shared.value(for: \.useGlobalChat)
@@ -114,6 +118,9 @@ final class WidgetDataSource {
                     self?.removePromptToCode(for: url)
                     let presenter = PresentInWindowSuggestionPresenter()
                     presenter.closePromptToCode(fileURL: url)
+                    if let app = ActiveApplicationMonitor.previousActiveApplication, app.isXcode {
+                        app.activate()
+                    }
                 }
             )
             return PromptToCode(promptToCodeService: service, provider: provider)
@@ -199,3 +206,4 @@ extension WidgetDataSource: SuggestionWidgetDataSource {
         return promptToCodes[url]?.provider
     }
 }
+