Update to activate extension app when using hotkey to show widgets

Author: intitni

Core/Sources/Service/Service.swift

@@ -1,3 +1,4 @@
+import AppKit
 import Combine
 import Dependencies
 import Foundation
@@ -83,14 +84,28 @@ final class GlobalShortcutManager {
         setupShortcutIfNeeded()
 
         KeyboardShortcuts.onKeyUp(for: .showHideWidget) { [guiController] in
-            if XcodeInspector.shared.activeXcode == nil,
+            let isXCodeActive = XcodeInspector.shared.activeXcode != nil
+            let isExtensionActive = NSApplication.shared.isActive
+
+            if !isXCodeActive,
                !guiController.viewStore.state.suggestionWidgetState.chatPanelState.isPanelDisplayed,
                UserDefaults.shared.value(for: \.showHideWidgetShortcutGlobally)
             {
                 guiController.viewStore.send(.openChatPanel(forceDetach: true))
             } else {
                 guiController.viewStore.send(.suggestionWidget(.circularWidget(.widgetClicked)))
             }
+
+            if !isExtensionActive {
+                Task {
+                    try await Task.sleep(nanoseconds: 150_000_000)
+                    NSApplication.shared.activate(ignoringOtherApps: true)
+                }
+            } else if let previous = XcodeInspector.shared.previousActiveApplication,
+                      !previous.isActive
+            {
+                previous.runningApplication.activate()
+            }
         }
 
         XcodeInspector.shared.$activeApplication.sink { app in

Tool/Sources/XcodeInspector/XcodeInspector.swift

@@ -14,6 +14,7 @@ public final class XcodeInspector: ObservableObject {
     private var activeXcodeCancellable = Set<AnyCancellable>()
 
     @Published public internal(set) var activeApplication: AppInstanceInspector?
+    @Published public internal(set) var previousActiveApplication: AppInstanceInspector?
     @Published public internal(set) var activeXcode: XcodeAppInstanceInspector?
     @Published public internal(set) var latestActiveXcode: XcodeAppInstanceInspector?
     @Published public internal(set) var xcodes: [XcodeAppInstanceInspector] = []
@@ -110,6 +111,7 @@ public final class XcodeInspector: ObservableObject {
                         setActiveXcode(new)
                     }
                 } else {
+                    previousActiveApplication = activeApplication
                     activeApplication = AppInstanceInspector(runningApplication: app)
                 }
             }
@@ -145,6 +147,7 @@ public final class XcodeInspector: ObservableObject {
 
     @MainActor
     func setActiveXcode(_ xcode: XcodeAppInstanceInspector) {
+        previousActiveApplication = activeApplication
         activeApplication = xcode
         xcode.refresh()
         for task in activeXcodeObservations { task.cancel() }