Fix Show Binky when the main window is closed

Route menu bar and global hotkey through SwiftUI openWindow(id: "main").
WindowGroup now has an explicit id; BinkyShortcutCommands stays alive for
the app lifetime and handles .binkyShowMainWindow. Removes unreliable
newWindow: fallback when ContentView is unmounted.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: heyderekj

Binky/BinkyApp.swift

@@ -25,7 +25,9 @@ struct BinkyApp: App {
     @StateObject private var updater = UpdateChecker()
 
     var body: some Scene {
-        WindowGroup {
+        // Explicit `id` lets the menu bar / hotkey bridge re-open this window via
+        // `openWindow(id: "main")` even when ContentView has been unmounted (closed).
+        WindowGroup(id: "main") {
             ContentView(vm: root.organizerVM)
                 .environmentObject(root.prefs)
                 .environmentObject(updater)
@@ -103,6 +105,10 @@ private struct LastSortSummaryCommands: View {
 
 private struct BinkyShortcutCommands: View {
     @ObservedObject var prefs: BinkyPreferences
+    // `openWindow` lives in the App's environment and is callable any time the App scene
+    // tree is alive — even when no WindowGroup window is currently presented. This is the
+    // only reliable path for "Show Binky" after the user has closed the main window.
+    @Environment(\.openWindow) private var openWindow
 
     private var sortNowMenuTitle: String {
         let enabledCount = prefs.savedPresets.filter {
@@ -123,6 +129,15 @@ private struct BinkyShortcutCommands: View {
             NotificationCenter.default.post(name: .binkyStartSort, object: nil)
         }
         .keyboardShortcut(prefs.shortcut(for: .sortNow).swiftUIKeyboardShortcut)
+        // Bridges the AppKit menu bar's "Show Binky" / global hotkey into SwiftUI's
+        // `openWindow(id:)`. SwiftUI keeps Commands views alive for the full app lifetime
+        // (they back the main menu bar), so this `.onReceive` fires whether or not the
+        // main window is currently presented. `openWindow(id:)` brings an existing instance
+        // forward, or creates a fresh one if the user previously closed the window.
+        .onReceive(NotificationCenter.default.publisher(for: .binkyShowMainWindow)) { _ in
+            NSApp.activate()
+            openWindow(id: "main")
+        }
     }
 }
 

Binky/ContentView.swift

@@ -163,10 +163,9 @@ private struct MenuBridgeObservers: ViewModifier {
                 NSApp.activate()
                 openSettings()
             }
-            .onReceive(NotificationCenter.default.publisher(for: .binkyShowMainWindow)) { _ in
-                NSApp.activate()
-                BinkyMenuBarController.bringMainOrganizerWindowForward()
-            }
+            // `.binkyShowMainWindow` is handled at App scope in `BinkyShortcutCommands`
+            // via `openWindow(id: "main")` — that path works whether or not this view is
+            // currently mounted (and thus survives closing/reopening the main window).
             .onReceive(NotificationCenter.default.publisher(for: .binkyCheckUpdates)) { _ in
                 Task {
                     let result = await updater.check(manual: true)

Binky/Localizable.xcstrings

@@ -10197,6 +10197,9 @@
     },
     "Sort" : {
       "comment" : "Menu bar: parent menu for choosing which folder to sweep.\nOpen panel button."
+    },
+    "Sort ${files} with Binky" : {
+
     },
     "Sort All" : {
       "comment" : "File menu: run sort across every enabled automation.\nPrimary sort button: sort all enabled automations."

Binky/Services/BinkyMenuBarController.swift

@@ -304,14 +304,14 @@ final class BinkyMenuBarController: NSObject, NSMenuDelegate {
     }
 
     @objc private func showMainWindow() {
-        // Activate first so the SwiftUI scene receiver below can run inside a foregrounded app.
-        NSApp.activate()
-        // Primary path: SwiftUI scene picks up the notification and uses the `openWindow`
-        // environment action (handles closed-window / menu-bar-only scenarios reliably).
-        NotificationCenter.default.post(name: .binkyShowMainWindow, object: nil)
-        // AppKit fallback in case ContentView isn't currently mounted (e.g. very early startup).
+        // SwiftUI Commands bridge in `BinkyApp` (`BinkyShortcutCommands`) listens for this
+        // notification and calls `openWindow(id: "main")` — the only reliable way to
+        // (re)create or refocus a `WindowGroup` window from the AppKit menu bar, including
+        // when the user has closed the main window entirely. We post on the next runloop tick
+        // so AppKit finishes dismissing the status menu first.
         DispatchQueue.main.async {
-            GlobalHotkeyManager.activateMainWindow()
+            NSApp.activate()
+            NotificationCenter.default.post(name: .binkyShowMainWindow, object: nil)
         }
     }
 
@@ -328,24 +328,4 @@ final class BinkyMenuBarController: NSObject, NSMenuDelegate {
             }
         }
     }
-
-    /// Bring an existing organizer window forward. Called from `ContentView` after the
-    /// `binkyShowMainWindow` notification fires; if no main window exists, the AppKit fallback
-    /// path in `showMainWindow()` (via `GlobalHotkeyManager`) handles creating one.
-    static func bringMainOrganizerWindowForward() {
-        if let w = NSApp.windows.first(where: { $0.frameAutosaveName == "BinkyMainWindow" && $0.isVisible }) {
-            w.makeKeyAndOrderFront(nil)
-            return
-        }
-        if let w = NSApp.windows.first(where: { w in
-            w.isVisible
-                && w.canBecomeKey
-                && w.title != "Binky Help"
-                && w.frameAutosaveName != "help"
-        }) {
-            w.makeKeyAndOrderFront(nil)
-            return
-        }
-        NSApp.sendAction(Selector(("newWindow:")), to: nil, from: nil)
-    }
 }

Binky/Services/GlobalHotkeyManager.swift

@@ -68,24 +68,11 @@ final class GlobalHotkeyManager {
         // macOS 14+: prefer parameterless `activate()`; older `activate(ignoringOtherApps:)`
         // is deprecated and may be a no-op on recent macOS when invoked from a status item.
         NSApp.activate()
-        bringMainWindowForward()
-    }
-
-    private static func bringMainWindowForward() {
-        if let w = NSApp.windows.first(where: { $0.frameAutosaveName == "BinkyMainWindow" && $0.isVisible }) {
-            w.makeKeyAndOrderFront(nil)
-            return
-        }
-        if let w = NSApp.windows.first(where: { w in
-            w.isVisible
-                && w.canBecomeKey
-                && w.title != "Binky Help"
-                && w.frameAutosaveName != "help"
-        }) {
-            w.makeKeyAndOrderFront(nil)
-            return
-        }
-        NSApp.sendAction(Selector(("newWindow:")), to: nil, from: nil)
+        // Routed through SwiftUI Commands (`BinkyShortcutCommands`), which calls
+        // `openWindow(id: "main")`. The AppKit `newWindow:` selector does not reliably
+        // open a SwiftUI `WindowGroup` window once the user has closed the only instance;
+        // `openWindow(id:)` does — and brings an existing window forward when present.
+        NotificationCenter.default.post(name: .binkyShowMainWindow, object: nil)
     }
 
     // MARK: - Carbon event handler