Skip to content

Fix clipboard manager paste failing during focus transitions #2435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alexander-pecheny wants to merge 2 commits into from
Closed

Fix clipboard manager paste failing during focus transitions #2435

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e12f2a0
Fix clipboard manager paste failing during focus transitions
alexander-pecheny Mar 31, 2026
99eeec8
Guard focus-transition recovery on same-window and makeFirstResponder…
alexander-pecheny Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 33 additions & 4 deletions Sources/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12939,7 +12939,26 @@ private extension NSWindow {
// When the terminal is focused, skip the full NSWindow.performKeyEquivalent
// (which walks the SwiftUI content view hierarchy) and dispatch Command-key
// events directly to the main menu. This avoids the broken SwiftUI focus path.
if firstResponderGhosttyView != nil,
//
// When the first responder is the window itself (focus transition after
// a clipboard-manager overlay like Raycast/Tuna dismisses), restore the
// terminal as first responder before dispatching. Without this, the main
// menu can't validate items (no responder handles paste:/copy:) and the
// original performKeyEquivalent walks the broken SwiftUI focus path.
var menuBypassGhosttyView = firstResponderGhosttyView
if menuBypassGhosttyView == nil, self.firstResponder is NSWindow {
if let terminalPanel = AppDelegate.shared?.tabManager?.selectedWorkspace?.focusedTerminalPanel,
let ghosttyNSView = Self.findGhosttyNSView(in: terminalPanel.hostedView),
ghosttyNSView.window === self,
self.makeFirstResponder(ghosttyNSView) {
menuBypassGhosttyView = ghosttyNSView
Comment thread
coderabbitai[bot] marked this conversation as resolved.
#if DEBUG
dlog(" → focus-transition recovery: restored terminal as firstResponder")
#endif
}
}

if menuBypassGhosttyView != nil,
shouldRouteCommandEquivalentDirectlyToMainMenu(event),
let mainMenu = NSApp.mainMenu {
let consumedByMenu = mainMenu.performKeyEquivalent(with: event)
Expand All @@ -12956,9 +12975,7 @@ private extension NSWindow {
)
}
#endif
if !consumedByMenu {
// Fall through to the original performKeyEquivalent path below.
} else {
if consumedByMenu {
#if DEBUG
dlog(" → consumed by mainMenu (bypassed SwiftUI)")
#endif
Expand All @@ -12973,6 +12990,18 @@ private extension NSWindow {
return result
}

/// Walk the subview tree downward to find the GhosttyNSView inside a hosted view.
/// Unlike `cmuxOwningGhosttyView(for:)` which walks upward through superviews,
/// this walks downward — needed when starting from the GhosttySurfaceScrollView
/// container whose surfaceView property is private.
static func findGhosttyNSView(in view: NSView) -> GhosttyNSView? {
if let ghosttyView = view as? GhosttyNSView { return ghosttyView }
for subview in view.subviews {
if let found = findGhosttyNSView(in: subview) { return found }
}
return nil
}

static func keyDescription(_ event: NSEvent) -> String {
var parts: [String] = []
let flags = event.modifierFlags.intersection(.deviceIndependentFlagsMask)
Expand Down