Fix browser up/down arrows after omnibar focus

Sources/Panels/BrowserPanel.swift

@@ -4908,6 +4908,28 @@ extension BrowserPanel {
 #endif
     }
 
+    func syncWebViewFirstResponderPolicy(isPanelFocused: Bool, reason: String) {
+        guard let cmuxWebView = webView as? CmuxWebView else { return }
+        let next = isPanelFocused && !shouldSuppressWebViewFocus()
+        if cmuxWebView.allowsFirstResponderAcquisition != next {
+#if DEBUG
+            dlog(
+                "browser.focus.policy.resync panel=\(id.uuidString.prefix(5)) " +
+                "web=\(ObjectIdentifier(cmuxWebView)) old=\(cmuxWebView.allowsFirstResponderAcquisition ? 1 : 0) " +
+                "new=\(next ? 1 : 0) reason=\(reason) " +
+                "panelFocusedUsed=\(isPanelFocused ? 1 : 0)"
+            )
+#endif
+        }
+        cmuxWebView.allowsFirstResponderAcquisition = next
+    }
+
+    func prepareForExplicitWebViewFocus(isPanelFocused: Bool, reason: String) {
+        endSuppressWebViewFocusForAddressBar()
+        clearWebViewFocusSuppression()
+        syncWebViewFirstResponderPolicy(isPanelFocused: isPanelFocused, reason: reason)
+    }
+
     func shouldSuppressOmnibarAutofocus() -> Bool {
         if let until = suppressOmnibarAutofocusUntil {
             return Date() < until

Sources/Panels/BrowserPanelView.swift

@@ -1239,20 +1239,8 @@ struct BrowserPanelView: View {
         reason: String,
         isPanelFocusedOverride: Bool? = nil
     ) {
-        guard let cmuxWebView = panel.webView as? CmuxWebView else { return }
         let isPanelFocused = isPanelFocusedOverride ?? isFocused
-        let next = isPanelFocused && !panel.shouldSuppressWebViewFocus()
-        if cmuxWebView.allowsFirstResponderAcquisition != next {
-#if DEBUG
-            dlog(
-                "browser.focus.policy.resync panel=\(panel.id.uuidString.prefix(5)) " +
-                "web=\(ObjectIdentifier(cmuxWebView)) old=\(cmuxWebView.allowsFirstResponderAcquisition ? 1 : 0) " +
-                "new=\(next ? 1 : 0) reason=\(reason) " +
-                "panelFocusedUsed=\(isPanelFocused ? 1 : 0)"
-            )
-#endif
-        }
-        cmuxWebView.allowsFirstResponderAcquisition = next
+        panel.syncWebViewFirstResponderPolicy(isPanelFocused: isPanelFocused, reason: reason)
     }
 
     private func setAddressBarFocused(_ focused: Bool, reason: String) {
@@ -6336,19 +6324,11 @@ struct WebViewRepresentable: NSViewRepresentable {
         webView: WKWebView,
         isPanelFocused: Bool
     ) {
-        guard let cmuxWebView = webView as? CmuxWebView else { return }
-        let next = isPanelFocused && !panel.shouldSuppressWebViewFocus()
-        if cmuxWebView.allowsFirstResponderAcquisition != next {
-#if DEBUG
-            dlog(
-                "browser.focus.policy panel=\(panel.id.uuidString.prefix(5)) " +
-                "web=\(ObjectIdentifier(cmuxWebView)) old=\(cmuxWebView.allowsFirstResponderAcquisition ? 1 : 0) " +
-                "new=\(next ? 1 : 0) isPanelFocused=\(isPanelFocused ? 1 : 0) " +
-                "suppress=\(panel.shouldSuppressWebViewFocus() ? 1 : 0)"
-            )
-#endif
-        }
-        cmuxWebView.allowsFirstResponderAcquisition = next
+        guard webView is CmuxWebView else { return }
+        panel.syncWebViewFirstResponderPolicy(
+            isPanelFocused: isPanelFocused,
+            reason: "applyWebViewFirstResponderPolicy"
+        )
     }
 
     static func dismantleNSView(_ nsView: NSView, coordinator: Coordinator) {

Sources/TerminalController.swift

@@ -8635,6 +8635,12 @@ class TerminalController {
                 tabManager.selectWorkspace(ws)
             }
 
+            browserPanel.prepareForExplicitWebViewFocus(
+                isPanelFocused: true,
+                reason: "socket.browser.focus_webview"
+            )
+            NotificationCenter.default.post(name: .browserDidBlurAddressBar, object: surfaceId)
+
             // Prevent omnibar auto-focus from immediately stealing first responder back.
             browserPanel.suppressOmnibarAutofocus(for: 1.0)
 
@@ -11804,19 +11810,19 @@ class TerminalController {
         case "left":
             storedKey = "←"
             keyCode = 123
-            charactersIgnoringModifiers = storedKey
+            charactersIgnoringModifiers = String(UnicodeScalar(NSLeftArrowFunctionKey)!)
         case "right":
             storedKey = "→"
             keyCode = 124
-            charactersIgnoringModifiers = storedKey
+            charactersIgnoringModifiers = String(UnicodeScalar(NSRightArrowFunctionKey)!)
         case "down":
             storedKey = "↓"
             keyCode = 125
-            charactersIgnoringModifiers = storedKey
+            charactersIgnoringModifiers = String(UnicodeScalar(NSDownArrowFunctionKey)!)
         case "up":
             storedKey = "↑"
             keyCode = 126
-            charactersIgnoringModifiers = storedKey
+            charactersIgnoringModifiers = String(UnicodeScalar(NSUpArrowFunctionKey)!)
         case "enter", "return":
             storedKey = "\r"
             keyCode = UInt16(kVK_Return)
@@ -13587,8 +13593,10 @@ class TerminalController {
 
             // Programmatic WebView focus should win over stale omnibar focus state, especially
             // after workspace switches where the blank-page omnibar auto-focus can re-trigger.
-            browserPanel.endSuppressWebViewFocusForAddressBar()
-            browserPanel.clearWebViewFocusSuppression()
+            browserPanel.prepareForExplicitWebViewFocus(
+                isPanelFocused: true,
+                reason: "socket.focus_webview"
+            )
             NotificationCenter.default.post(name: .browserDidBlurAddressBar, object: panelId)
 
             // Prevent omnibar auto-focus from immediately stealing first responder back.

cmuxTests/AppDelegateShortcutRoutingTests.swift

@@ -1,4 +1,5 @@
 import XCTest
+import WebKit
 
 #if canImport(cmux_DEV)
 @testable import cmux_DEV
@@ -2328,6 +2329,68 @@ final class AppDelegateShortcutRoutingTests: XCTestCase {
         XCTAssertEqual(observedDelta, 1)
     }
 
+    func testDownArrowIsNotConsumedAfterBrowserWebViewRetakesFocusFromStaleAddressBarState() {
+        guard let appDelegate = AppDelegate.shared else {
+            XCTFail("Expected AppDelegate.shared")
+            return
+        }
+
+        let windowId = appDelegate.createMainWindow()
+        defer {
+            closeWindow(withId: windowId)
+        }
+
+        guard let window = window(withId: windowId),
+              let contentView = window.contentView else {
+            XCTFail("Expected test window")
+            return
+        }
+
+        let webView = CmuxWebView(frame: contentView.bounds, configuration: WKWebViewConfiguration())
+        webView.autoresizingMask = [.width, .height]
+        contentView.addSubview(webView)
+
+        window.makeKeyAndOrderFront(nil)
+        RunLoop.main.run(until: Date(timeIntervalSinceNow: 0.05))
+
+        XCTAssertTrue(window.makeFirstResponder(webView), "Expected test web view to become first responder")
+
+        let stalePanelId = UUID()
+        NotificationCenter.default.post(name: .browserDidFocusAddressBar, object: stalePanelId)
+        RunLoop.main.run(until: Date(timeIntervalSinceNow: 0.05))
+        XCTAssertEqual(
+            appDelegate.focusedBrowserAddressBarPanelId(),
+            stalePanelId,
+            "Expected stale address-bar focus state to be installed for the regression setup"
+        )
+
+        NotificationCenter.default.post(name: .browserDidBecomeFirstResponderWebView, object: webView)
+        RunLoop.main.run(until: Date(timeIntervalSinceNow: 0.05))
+
+        guard let downArrowEvent = makeKeyDownEvent(
+            key: String(UnicodeScalar(NSDownArrowFunctionKey)!),
+            modifiers: [],
+            keyCode: 125,
+            windowNumber: window.windowNumber
+        ) else {
+            XCTFail("Failed to construct Down Arrow event")
+            return
+        }
+
+#if DEBUG
+        XCTAssertFalse(
+            appDelegate.debugHandleCustomShortcut(event: downArrowEvent),
+            "Plain Down Arrow should reach WebKit once the page retakes focus from the omnibar"
+        )
+#else
+        XCTFail("debugHandleCustomShortcut is only available in DEBUG")
+#endif
+        XCTAssertNil(
+            appDelegate.focusedBrowserAddressBarPanelId(),
+            "Browser web view focus should clear stale omnibar focus state"
+        )
+    }
+
     func testEscapeDismissesCommandPaletteWhenVisibilityStateStaysStalePastInitialPendingWindow() {
         guard let appDelegate = AppDelegate.shared else {
             XCTFail("Expected AppDelegate.shared")

cmuxTests/BrowserConfigTests.swift

@@ -2547,6 +2547,56 @@ final class BrowserReturnKeyDownRoutingTests: XCTestCase {
     }
 }
 
+final class BrowserDirectKeyDownRoutingTests: XCTestCase {
+    func testRoutesWhenBrowserWebViewIsFirstResponder() {
+        let webView = CmuxWebView(frame: .zero, configuration: WKWebViewConfiguration())
+
+        XCTAssertTrue(
+            shouldDirectRouteBrowserFirstResponderKeyDown(
+                firstResponder: webView,
+                firstResponderIsBrowser: true,
+                focusedBrowserAddressBarPanelId: nil
+            )
+        )
+    }
+
+    func testRoutesWhenBrowserFieldEditorIsFirstResponder() {
+        let fieldEditor = NSTextView(frame: .zero)
+        fieldEditor.isFieldEditor = true
+
+        XCTAssertTrue(
+            shouldDirectRouteBrowserFirstResponderKeyDown(
+                firstResponder: fieldEditor,
+                firstResponderIsBrowser: true,
+                focusedBrowserAddressBarPanelId: nil
+            )
+        )
+    }
+
+    func testDoesNotRouteWhenBrowserAddressBarRemainsFocused() {
+        let webView = CmuxWebView(frame: .zero, configuration: WKWebViewConfiguration())
+
+        XCTAssertFalse(
+            shouldDirectRouteBrowserFirstResponderKeyDown(
+                firstResponder: webView,
+                firstResponderIsBrowser: true,
+                focusedBrowserAddressBarPanelId: UUID()
+            )
+        )
+    }
+
+    func testDoesNotRouteWhenFirstResponderIsNotBrowser() {
+        let view = NSView(frame: .zero)
+
+        XCTAssertFalse(
+            shouldDirectRouteBrowserFirstResponderKeyDown(
+                firstResponder: view,
+                firstResponderIsBrowser: false,
+                focusedBrowserAddressBarPanelId: nil
+            )
+        )
+    }
+}
 
 final class BrowserZoomShortcutActionTests: XCTestCase {
     func testZoomInSupportsEqualsAndPlusVariants() {