Fix ⌘⌫ archive hotkey when clicking a sidebar worktree#264
Merged
Conversation
The cached `focused` flag is updated via `becomeFirstResponder` / `resignFirstResponder`, but AppKit walks `performKeyEquivalent` over every view in the window. Clicking a sidebar `List` row takes selection without always demoting the surface out of the responder chain, so ⌘⌫ reached `keyDown` and was consumed by the terminal instead of firing Archive Worktree in the main menu. Check `window?.firstResponder === self` alongside `focused` so the surface only processes events AppKit actually routes to it.
jzillmann
referenced
this pull request
in jzillmann/supacool
Apr 23, 2026
The cached `focused` flag is updated via `becomeFirstResponder` / `resignFirstResponder`, but AppKit walks `performKeyEquivalent` over every view in the window. Clicking a sidebar `List` row takes selection without always demoting the surface out of the responder chain, so ⌘⌫ reached `keyDown` and was consumed by the terminal instead of firing Archive Worktree in the main menu. Check `window?.firstResponder === self` alongside `focused` so the surface only processes events AppKit actually routes to it.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
GhosttySurfaceView.performKeyEquivalentrelied on a cachedfocusedflag that stayedtruewhen a sidebarListrow was clicked — AppKit walksperformKeyEquivalentover every view in the window, so the surface was swallowing ⌘⌫ even though the selection had moved to the sidebar.window?.firstResponder === selfcheck alongsidefocusedso the surface only processes events AppKit actually routes to it. ⌘⌫ now falls through to the main-menu Archive item instead of being consumed by the terminal.Test plan
make check && make test— all 939 tests pass