fix: remove NSEvent monitor on ProjectPicker close (#59)

gi11es · claude · web-flow · commit 70875fa96ca1 · 2026-03-30T22:27:18.000+02:00
* fix: remove NSEvent monitor on ProjectPicker close (#56) Each call to ProjectPicker.show() was adding a local key-down monitor that was never removed, causing monitors to accumulate on every Cmd+O. Store the monitor token and remove it in cancel(), confirm(), and before re-adding in show(). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: handle panel close button in ProjectPicker monitor cleanup Make ProjectPicker the panel's NSWindowDelegate so clicking the close button (X) routes through cancel(), which removes the key monitor and calls completion(nil). Previously, the close button bypassed cleanup entirely. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
diff --git a/Sources/Window/ProjectPicker.swift b/Sources/Window/ProjectPicker.swift
@@ -3,7 +3,7 @@ import Fuse
 
 /// A Spotlight-style project picker that appears when creating a new Claude tab.
 /// Shows recent projects from ~/.claude/projects/, sorted by recency.
-class ProjectPicker: NSObject, NSTableViewDataSource, NSTableViewDelegate, NSTextFieldDelegate {
+class ProjectPicker: NSObject, NSTableViewDataSource, NSTableViewDelegate, NSTextFieldDelegate, NSWindowDelegate {
 
     typealias Completion = (String?) -> Void  // nil = cancelled, String = chosen path
 
@@ -17,6 +17,7 @@ class ProjectPicker: NSObject, NSTableViewDataSource, NSTableViewDelegate, NSTex
     private var filteredProjects: [(path: String, lastUsed: Date)] = []
     private var spotlightSearch: Process?
     private var spotlightPipe: Pipe?
+    private var keyMonitor: Any?
     private var excludePaths: Set<String> = []
     private let fuse = Fuse(threshold: 0.4)
 
@@ -61,6 +62,7 @@ class ProjectPicker: NSObject, NSTableViewDataSource, NSTableViewDelegate, NSTex
 
         super.init()
 
+        panel.delegate = self
         tableView.dataSource = self
         tableView.delegate = self
         tableView.target = self
@@ -116,8 +118,12 @@ class ProjectPicker: NSObject, NSTableViewDataSource, NSTableViewDelegate, NSTex
         panel.makeKeyAndOrderFront(nil)
         panel.makeFirstResponder(searchField)
 
-        // Monitor for Escape key
-        NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in
+        // Monitor for Escape key — remove any prior monitor to avoid leaks
+        if let existing = keyMonitor {
+            NSEvent.removeMonitor(existing)
+            keyMonitor = nil
+        }
+        keyMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in
             guard let self = self, self.panel.isVisible else { return event }
 
             if event.keyCode == 53 { // Escape
@@ -148,13 +154,15 @@ class ProjectPicker: NSObject, NSTableViewDataSource, NSTableViewDelegate, NSTex
 
     private func cancel() {
         cancelSpotlightSearch()
+        removeKeyMonitor()
         panel.orderOut(nil)
         completion?(nil)
         completion = nil
     }
 
     private func confirm() {
         cancelSpotlightSearch()
+        removeKeyMonitor()
         let row = tableView.selectedRow
         let path: String
         if row >= 0, row < filteredProjects.count {
@@ -204,6 +212,19 @@ class ProjectPicker: NSObject, NSTableViewDataSource, NSTableViewDelegate, NSTex
         confirm()
     }
 
+    private func removeKeyMonitor() {
+        if let monitor = keyMonitor {
+            NSEvent.removeMonitor(monitor)
+            keyMonitor = nil
+        }
+    }
+
+    // MARK: - NSWindowDelegate
+
+    func windowWillClose(_ notification: Notification) {
+        cancel()
+    }
+
     /// Safely terminate the spotlight search, clearing the readability handler
     /// first to prevent NSFileHandleOperationException crashes.
     private func cancelSpotlightSearch() {
