Fix floating bar queries from foregrounding main app

Author: kodjima33

desktop/Desktop/Sources/FloatingControlBar/FloatingControlBarWindow.swift

@@ -848,11 +848,14 @@ class FloatingControlBarManager {
     }
 
     /// Toggle visibility.
+    /// When visible with an AI conversation open, collapse to the pill instead of hiding.
     func toggle() {
         guard let window = window else { return }
         if window.isVisible {
-            AnalyticsManager.shared.floatingBarToggled(visible: false, source: "shortcut")
-            hide()
+            if window.state.showingAIConversation {
+                window.closeAIConversation()
+            }
+            // Already collapsed pill — do nothing (don't hide)
         } else {
             AnalyticsManager.shared.floatingBarToggled(visible: true, source: "shortcut")
             show()
@@ -980,14 +983,20 @@ class FloatingControlBarManager {
     // MARK: - AI Query
 
     private func sendAIQuery(_ message: String, barWindow: FloatingControlBarWindow, provider: ChatProvider) async {
-        // Hide the bar, capture a clean screenshot, then restore — same path for both typed and PTT
-        barWindow.orderOut(nil)
+        // Hide the bar visually (without ordering it out) so we keep key-window ownership
+        // and avoid promoting the main Omi window while capturing a clean screenshot.
+        let previousAlpha = barWindow.alphaValue
+        let previousIgnoresMouseEvents = barWindow.ignoresMouseEvents
+        barWindow.alphaValue = 0
+        barWindow.ignoresMouseEvents = true
         try? await Task.sleep(nanoseconds: 150_000_000) // 150ms for window to disappear
         let screenshotData = await Task.detached { () -> Data? in
             guard let url = ScreenCaptureManager.captureScreen() else { return nil }
             return try? Data(contentsOf: url)
         }.value
-        barWindow.makeKeyAndOrderFront(nil)
+        barWindow.alphaValue = previousAlpha
+        barWindow.ignoresMouseEvents = previousIgnoresMouseEvents
+        barWindow.orderFrontRegardless()
 
         AnalyticsManager.shared.floatingBarQuerySent(messageLength: message.count, hasScreenshot: screenshotData != nil)
 

desktop/Desktop/Sources/Providers/ChatProvider.swift

@@ -1962,11 +1962,15 @@ A screenshot may be attached — use it silently only if relevant. Never mention
                                 log("ChatProvider: Browser tool \(name) called without extension token — aborting query and prompting setup")
                                 self?.needsBrowserExtensionSetup = true
                                 self?.stopAgent()
-                                // Bring the app to the foreground so the setup sheet is visible
-                                // (the failed browser attempt may have opened Chrome, stealing focus)
-                                NSApp.activate(ignoringOtherApps: true)
-                                for window in NSApp.windows where window.title.hasPrefix("Omi") {
-                                    window.makeKeyAndOrderFront(nil)
+                                // Keep floating-bar sessions non-intrusive: do not foreground
+                                // the main window when the query originated from the floating bar.
+                                if sessionKey != "floating" {
+                                    // Bring the app to the foreground so the setup sheet is visible
+                                    // (the failed browser attempt may have opened Chrome, stealing focus)
+                                    NSApp.activate(ignoringOtherApps: true)
+                                    for window in NSApp.windows where window.title.hasPrefix("Omi") {
+                                        window.makeKeyAndOrderFront(nil)
+                                    }
                                 }
                             }
                             // Show the floating bar so the user has an always-on-top UI