Fix frozen terminals after split churn (#12)
* Fix blank terminal after split operations and add visual tests ## Blank Terminal Fix - Add `needsRefreshAfterWindowChange` flag in GhosttyTerminalView - Force terminal refresh when view is added to window, even if size unchanged - Add `ghostty_surface_refresh()` call in attachToView for same-view reattachment - Add debug logging for surface attachment lifecycle (DEBUG builds only) ## Bonsplit Migration - Add bonsplit as local Swift package (vendor/bonsplit submodule) - Replace custom SplitTree with BonsplitController - Add Panel protocol with TerminalPanel and BrowserPanel implementations - Add SidebarTab as main tab container with BonsplitController - Remove old Splits/ directory (SplitTree, SplitView, TerminalSplitTreeView) ## Visual Screenshot Tests - Add test_visual_screenshots.py for automated visual regression testing - Uses in-app screenshot API (CGWindowListCreateImage) - no screen recording needed - Generates HTML report with before/after comparisons - Tests: splits, browser panels, focus switching, close operations, rapid cycles - Includes annotation fields for easy feedback ## Browser Shortcut (⌘⇧B) - Add keyboard shortcut to open browser panel in current pane - Add openBrowser() method to TabManager - Add shortcut configuration in KeyboardShortcutSettings ## Screenshot Command - Add 'screenshot' command to TerminalController for in-app window capture - Returns OK with screenshot ID and path ## Other - Add tests/visual_output/ and tests/visual_report.html to .gitignore * Add browser title subscription and set tab height to 30px - Subscribe to BrowserPanel.$pageTitle changes to update bonsplit tabs - Update tab titles in real-time as page navigation occurs - Clean up subscriptions when panels are removed - Set bonsplit tab bar and tab height to 30px (in submodule) * Fix socket API regressions in list_surfaces, list_bonsplit_tabs, focus_pane - list_surfaces: Remove [terminal]/[browser] suffix to keep UUID-only format that clients and tests expect for parsing - list_bonsplit_tabs --pane: Properly look up pane by UUID instead of creating a new PaneID (requires bonsplit PaneID.id to be public) - focus_pane: Accept both UUID strings and integer indices as documented * Fix browser panel stability and keyboard shortcuts - Prevent WKWebView focus lifecycle crashes during split/view reshuffles - Match bracket shortcuts via keyCode (Cmd+Shift+[ / ], Cmd+Ctrl+[ / ]) - Support Ghostty config goto_split:* keybinds when WebView is focused - Add focus_webview/is_webview_focused socket commands and regression tests - Rename SidebarTab to Workspace and update docs * Make ctrl+enter keybind test skippable Skip when the Ghostty keybind isn't configured or when osascript can't send keystrokes (no Accessibility permission), so VM runs stay green. * Auto-focus browser omnibar when blank When a browser surface is focused but no URL is loaded yet, focus the address bar instead of the WKWebView. * Stabilize socket surface indexing * Focus browser omnibar escape; add webview keybind UI tests - Escape in omnibar now returns focus to WKWebView\n- Add UI tests for Cmd+Ctrl+H pane navigation with WebKit focused (including Ghostty config)\n- Avoid flaky element screenshots in UpdatePillUITests on the UTM VM * Fix browser drag-to-split blanks and socket parsing * Fix webview-focused shortcuts and stabilize browser splits - Match ctrl/shift shortcuts by keyCode where needed (Ctrl+H, bracket keys) - Load Ghostty goto_split triggers reliably and refresh on config load - Add debug socket helpers: set_shortcut + simulate_shortcut for tests - Convert browser goto_split/keybind tests to socket-based injection (no osascript) - Bump bonsplit for drag-to-split fixes * Fix split layout collapse and harden socket pane APIs * Stabilize OSC 99 notification test timing * Fix terminal focus routing after split reparent * Support simulate_shortcut enter for focus routing test * Stabilize terminal focus routing test * Fix frozen new terminal tabs after many splits * Fix frozen new terminal tabs after splits * Fix terminal freeze on launch/new tabs * Update ghostty submodule * Fix terminal focus/render stalls after split churn * Fix nested split collapsing existing pane * Fix nested split collapse + stabilize new-surface focus * Update bonsplit submodule * Fix SIGINT test flake * Remove bonsplit tab-switch crossfade * Remove PROJECTS.md * Remove bonsplit tab selection animation * Ignore generated test reports * Middle click closes tab * Revert unintended .gitignore change * Fix build after main merge * Revert "Fix build after main merge" This reverts commit 16bf9816d0856b5385d52f886aa5eb50f3c9d9a4. * Revert "Merge remote-tracking branch 'origin/main' into fix/blank-terminal-and-visual-tests" This reverts commit 7c20fb53fd71fea7a19a3673f2dd73e5f0c783c4, reversing changes made to 0aff107d787bc9d8bbc28220090b4ca7af72e040. * Remove tab close fade animation * Use terminal.fill icon * Make terminal tab icon smaller * Match browser globe tab icon size * Bonsplit: tab min width 48 and tighter close button * Bonsplit: smaller tab title font * Show unread notification badge in bonsplit tabs and improve UI polish Sync unread notification state to bonsplit tab badges (blue dot). Improve EmptyPanelView with Terminal/Browser buttons and shortcut hints. Add tooltips to close tab button and search overlay buttons. * Fix reload.sh single-instance safety check on macOS Replace GNU-only `ps -o etimes=` with portable `ps -o etime=` and parse the dd-hh:mm:ss format manually for macOS compatibility. * Centralize keyboard shortcut definitions into Action enum Replace per-shortcut boilerplate with a single Action enum that holds the label, defaults key, and default binding for each shortcut. All call sites now use shortcut(for:). Settings UI is data-driven via ForEach(Action.allCases). Titlebar tooltips update dynamically when shortcuts are changed. Remove duplicate .keyboardShortcut() modifiers from menu items that are already handled by the event monitor. * Fix WKWebView consuming app menu shortcuts and close panel confirmation Add CmuxWebView subclass that routes key equivalents through the main menu before WebKit, so Cmd+N/Cmd+W/tab switching work when a browser pane is focused. Fix Cmd+W close-panel path: bypass Bonsplit delegate gating after the user confirms the running-process dialog by tracking forceCloseTabIds. Add unit tests (CmuxWebViewKeyEquivalentTests) and UI test scaffolding (MenuKeyEquivalentRoutingUITests) with a new cmux-unit Xcode scheme. * Update CLAUDE.md and PROJECTS.md with recent changes CLAUDE.md: enforce --tag for reload commands, add cleanup safety rules. PROJECTS.md: log notification badge, reload.sh fix, Cmd+W fix, WebView key equiv fix, and centralized shortcuts work. * Keep selection index stable on close * Add concepts page documenting terminology hierarchy New docs page explaining Window > Workspace > Pane > Surface > Panel hierarchy with aligned ASCII diagram. Updated tabs.mdx and splits.mdx to use consistent terminology (workspace instead of tab, surface instead of panel) and corrected outdated CLI command references. * Update bonsplit submodule * WIP: improve split close stability and UI regressions * Close terminal panel on child exit; hide terminal dirty dot * Fix split close/focus regressions and stabilize UI tests * Add unread Dock/Cmd+Tab badge with settings toggle * Fix browser-surface shortcuts and Cmd+L browser opening * Snapshot current workspace state before regression fixes * Update bonsplit submodule snapshot * Stabilize split-close regression capture and sidebar resize assertions * Change default Show Notifications shortcut from Cmd+Shift+I to Cmd+I * Fix update check readiness race, enable release update logging, and improve checking spinner * Restore terminal file drop, fix browser omnibar click focus, and add panel workspace ID mutation for surface moves * Add Cmd+digit workspace hints, titlebar shortcut pills, sidebar drag-reorder, and workspace placement settings * Add v2 browser automation API, surface move/reorder commands, and short-handle ref system to TerminalController * Add CLI browser command surface, --id-format flag, and move/reorder commands * Extend test clients with move/reorder APIs, ref-handle support, and increased timeouts * Harden test runner scripts with deterministic builds, retry logic, and robust socket readiness * Stabilize existing test suites with focus-wait helpers, increased timeouts, and API shape updates * Add terminal file drop e2e regression test * Add v2 browser API, CLI ref resolution, and surface move/reorder test suites * Add unit tests for shortcut hints, workspace reorder, drop planner, and update UI test stabilization * Add cmux-debug-windows skill with snapshot script and agent config * Update project docs: mark browser parity and move/reorder phases complete, add parallel agent workflow guidelines * Update bonsplit submodule: re-entrant setPosition guard, tab shortcut hints, and moveTab/reorderTab API * Add browser agent UX improvements: snapshot refs, placement reuse, diagnostics, and skill docs - Upgrade browser.snapshot to emit accessibility tree text with element refs (eN) - Add right-sibling pane reuse policy for browser.open_split placement - Add rich not_found diagnostics with retry logic for selector actions - Support --snapshot-after for post-action verification on mutating commands - Allow browser fill with empty text for clearing inputs - Default CLI --id-format to refs-first (UUIDs opt-in via --id-format uuids|both) - Format legacy new-pane/new-surface output with short surface refs - Add skills/cmuxterm-browser/ and skills/cmuxterm/ end-user skill docs - Add regression tests for placement policy, snapshot refs, diagnostics, and ID defaults * Update bonsplit submodule: keep raster favicons in color when inactive
This commit is contained in:
Lawrence Chen
GitHub
parent
eb19e8fa25
commit
50f0dd334d
160 changed files with 46002 additions and 4222 deletions
|
|
@ -1,48 +1,183 @@
|
|||
import AppKit
|
||||
import SwiftUI
|
||||
|
||||
/// Stores customizable keyboard shortcuts
|
||||
/// Stores customizable keyboard shortcuts (definitions + persistence).
|
||||
enum KeyboardShortcutSettings {
|
||||
static let showNotificationsKey = "shortcut.showNotifications"
|
||||
static let jumpToUnreadKey = "shortcut.jumpToUnread"
|
||||
enum Action: String, CaseIterable, Identifiable {
|
||||
// Titlebar / primary UI
|
||||
case toggleSidebar
|
||||
case newTab
|
||||
case showNotifications
|
||||
case jumpToUnread
|
||||
case triggerFlash
|
||||
|
||||
/// Default shortcut: Cmd+Shift+I
|
||||
static let showNotificationsDefault = StoredShortcut(key: "i", command: true, shift: true, option: false, control: false)
|
||||
/// Default shortcut: Cmd+Shift+U
|
||||
static let jumpToUnreadDefault = StoredShortcut(key: "u", command: true, shift: true, option: false, control: false)
|
||||
// Navigation
|
||||
case nextSurface
|
||||
case prevSurface
|
||||
case nextSidebarTab
|
||||
case prevSidebarTab
|
||||
case newSurface
|
||||
|
||||
static func showNotificationsShortcut() -> StoredShortcut {
|
||||
guard let data = UserDefaults.standard.data(forKey: showNotificationsKey),
|
||||
// Panes / splits
|
||||
case focusLeft
|
||||
case focusRight
|
||||
case focusUp
|
||||
case focusDown
|
||||
case splitRight
|
||||
case splitDown
|
||||
|
||||
// Panels
|
||||
case openBrowser
|
||||
|
||||
var id: String { rawValue }
|
||||
|
||||
var label: String {
|
||||
switch self {
|
||||
case .toggleSidebar: return "Toggle Sidebar"
|
||||
case .newTab: return "New Tab"
|
||||
case .showNotifications: return "Show Notifications"
|
||||
case .jumpToUnread: return "Jump to Latest Unread"
|
||||
case .triggerFlash: return "Flash Focused Panel"
|
||||
case .nextSurface: return "Next Surface"
|
||||
case .prevSurface: return "Previous Surface"
|
||||
case .nextSidebarTab: return "Next Workspace"
|
||||
case .prevSidebarTab: return "Previous Workspace"
|
||||
case .newSurface: return "New Surface"
|
||||
case .focusLeft: return "Focus Pane Left"
|
||||
case .focusRight: return "Focus Pane Right"
|
||||
case .focusUp: return "Focus Pane Up"
|
||||
case .focusDown: return "Focus Pane Down"
|
||||
case .splitRight: return "Split Right"
|
||||
case .splitDown: return "Split Down"
|
||||
case .openBrowser: return "Open Browser"
|
||||
}
|
||||
}
|
||||
|
||||
var defaultsKey: String {
|
||||
switch self {
|
||||
case .toggleSidebar: return "shortcut.toggleSidebar"
|
||||
case .newTab: return "shortcut.newTab"
|
||||
case .showNotifications: return "shortcut.showNotifications"
|
||||
case .jumpToUnread: return "shortcut.jumpToUnread"
|
||||
case .triggerFlash: return "shortcut.triggerFlash"
|
||||
case .nextSidebarTab: return "shortcut.nextSidebarTab"
|
||||
case .prevSidebarTab: return "shortcut.prevSidebarTab"
|
||||
case .focusLeft: return "shortcut.focusLeft"
|
||||
case .focusRight: return "shortcut.focusRight"
|
||||
case .focusUp: return "shortcut.focusUp"
|
||||
case .focusDown: return "shortcut.focusDown"
|
||||
case .splitRight: return "shortcut.splitRight"
|
||||
case .splitDown: return "shortcut.splitDown"
|
||||
case .nextSurface: return "shortcut.nextSurface"
|
||||
case .prevSurface: return "shortcut.prevSurface"
|
||||
case .newSurface: return "shortcut.newSurface"
|
||||
case .openBrowser: return "shortcut.openBrowser"
|
||||
}
|
||||
}
|
||||
|
||||
var defaultShortcut: StoredShortcut {
|
||||
switch self {
|
||||
case .toggleSidebar:
|
||||
return StoredShortcut(key: "b", command: true, shift: false, option: false, control: false)
|
||||
case .newTab:
|
||||
return StoredShortcut(key: "n", command: true, shift: false, option: false, control: false)
|
||||
case .showNotifications:
|
||||
return StoredShortcut(key: "i", command: true, shift: false, option: false, control: false)
|
||||
case .jumpToUnread:
|
||||
return StoredShortcut(key: "u", command: true, shift: true, option: false, control: false)
|
||||
case .triggerFlash:
|
||||
// Unused by existing app shortcuts, and avoids clobbering Cmd+L (browser omnibar).
|
||||
return StoredShortcut(key: "l", command: true, shift: true, option: false, control: false)
|
||||
case .nextSidebarTab:
|
||||
return StoredShortcut(key: "]", command: true, shift: false, option: false, control: true)
|
||||
case .prevSidebarTab:
|
||||
return StoredShortcut(key: "[", command: true, shift: false, option: false, control: true)
|
||||
case .focusLeft:
|
||||
return StoredShortcut(key: "←", command: true, shift: false, option: true, control: false)
|
||||
case .focusRight:
|
||||
return StoredShortcut(key: "→", command: true, shift: false, option: true, control: false)
|
||||
case .focusUp:
|
||||
return StoredShortcut(key: "↑", command: true, shift: false, option: true, control: false)
|
||||
case .focusDown:
|
||||
return StoredShortcut(key: "↓", command: true, shift: false, option: true, control: false)
|
||||
case .splitRight:
|
||||
return StoredShortcut(key: "d", command: true, shift: false, option: false, control: false)
|
||||
case .splitDown:
|
||||
return StoredShortcut(key: "d", command: true, shift: true, option: false, control: false)
|
||||
case .nextSurface:
|
||||
return StoredShortcut(key: "]", command: true, shift: true, option: false, control: false)
|
||||
case .prevSurface:
|
||||
return StoredShortcut(key: "[", command: true, shift: true, option: false, control: false)
|
||||
case .newSurface:
|
||||
return StoredShortcut(key: "t", command: true, shift: false, option: false, control: false)
|
||||
case .openBrowser:
|
||||
return StoredShortcut(key: "b", command: true, shift: true, option: false, control: false)
|
||||
}
|
||||
}
|
||||
|
||||
func tooltip(_ base: String) -> String {
|
||||
"\(base) (\(KeyboardShortcutSettings.shortcut(for: self).displayString))"
|
||||
}
|
||||
}
|
||||
|
||||
static func shortcut(for action: Action) -> StoredShortcut {
|
||||
guard let data = UserDefaults.standard.data(forKey: action.defaultsKey),
|
||||
let shortcut = try? JSONDecoder().decode(StoredShortcut.self, from: data) else {
|
||||
return showNotificationsDefault
|
||||
return action.defaultShortcut
|
||||
}
|
||||
return shortcut
|
||||
}
|
||||
|
||||
static func setShowNotificationsShortcut(_ shortcut: StoredShortcut) {
|
||||
static func setShortcut(_ shortcut: StoredShortcut, for action: Action) {
|
||||
if let data = try? JSONEncoder().encode(shortcut) {
|
||||
UserDefaults.standard.set(data, forKey: showNotificationsKey)
|
||||
UserDefaults.standard.set(data, forKey: action.defaultsKey)
|
||||
}
|
||||
}
|
||||
|
||||
static func jumpToUnreadShortcut() -> StoredShortcut {
|
||||
guard let data = UserDefaults.standard.data(forKey: jumpToUnreadKey),
|
||||
let shortcut = try? JSONDecoder().decode(StoredShortcut.self, from: data) else {
|
||||
return jumpToUnreadDefault
|
||||
}
|
||||
return shortcut
|
||||
}
|
||||
|
||||
static func setJumpToUnreadShortcut(_ shortcut: StoredShortcut) {
|
||||
if let data = try? JSONEncoder().encode(shortcut) {
|
||||
UserDefaults.standard.set(data, forKey: jumpToUnreadKey)
|
||||
}
|
||||
static func resetShortcut(for action: Action) {
|
||||
UserDefaults.standard.removeObject(forKey: action.defaultsKey)
|
||||
}
|
||||
|
||||
static func resetAll() {
|
||||
UserDefaults.standard.removeObject(forKey: showNotificationsKey)
|
||||
UserDefaults.standard.removeObject(forKey: jumpToUnreadKey)
|
||||
for action in Action.allCases {
|
||||
resetShortcut(for: action)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Backwards-Compatible API (call-sites can migrate gradually)
|
||||
|
||||
// Keys (used by debug socket command + UI tests)
|
||||
static let focusLeftKey = Action.focusLeft.defaultsKey
|
||||
static let focusRightKey = Action.focusRight.defaultsKey
|
||||
static let focusUpKey = Action.focusUp.defaultsKey
|
||||
static let focusDownKey = Action.focusDown.defaultsKey
|
||||
|
||||
// Defaults (used by settings reset + recorder button initial title)
|
||||
static let showNotificationsDefault = Action.showNotifications.defaultShortcut
|
||||
static let jumpToUnreadDefault = Action.jumpToUnread.defaultShortcut
|
||||
|
||||
static func showNotificationsShortcut() -> StoredShortcut { shortcut(for: .showNotifications) }
|
||||
static func setShowNotificationsShortcut(_ shortcut: StoredShortcut) { setShortcut(shortcut, for: .showNotifications) }
|
||||
|
||||
static func jumpToUnreadShortcut() -> StoredShortcut { shortcut(for: .jumpToUnread) }
|
||||
static func setJumpToUnreadShortcut(_ shortcut: StoredShortcut) { setShortcut(shortcut, for: .jumpToUnread) }
|
||||
|
||||
static func nextSidebarTabShortcut() -> StoredShortcut { shortcut(for: .nextSidebarTab) }
|
||||
static func prevSidebarTabShortcut() -> StoredShortcut { shortcut(for: .prevSidebarTab) }
|
||||
|
||||
static func focusLeftShortcut() -> StoredShortcut { shortcut(for: .focusLeft) }
|
||||
static func focusRightShortcut() -> StoredShortcut { shortcut(for: .focusRight) }
|
||||
static func focusUpShortcut() -> StoredShortcut { shortcut(for: .focusUp) }
|
||||
static func focusDownShortcut() -> StoredShortcut { shortcut(for: .focusDown) }
|
||||
|
||||
static func splitRightShortcut() -> StoredShortcut { shortcut(for: .splitRight) }
|
||||
static func splitDownShortcut() -> StoredShortcut { shortcut(for: .splitDown) }
|
||||
|
||||
static func nextSurfaceShortcut() -> StoredShortcut { shortcut(for: .nextSurface) }
|
||||
static func prevSurfaceShortcut() -> StoredShortcut { shortcut(for: .prevSurface) }
|
||||
static func newSurfaceShortcut() -> StoredShortcut { shortcut(for: .newSurface) }
|
||||
|
||||
static func openBrowserShortcut() -> StoredShortcut { shortcut(for: .openBrowser) }
|
||||
}
|
||||
|
||||
/// A keyboard shortcut that can be stored in UserDefaults
|
||||
|
|
@ -59,7 +194,14 @@ struct StoredShortcut: Codable, Equatable {
|
|||
if option { parts.append("⌥") }
|
||||
if shift { parts.append("⇧") }
|
||||
if command { parts.append("⌘") }
|
||||
parts.append(key.uppercased())
|
||||
let keyText: String
|
||||
switch key {
|
||||
case "\t":
|
||||
keyText = "TAB"
|
||||
default:
|
||||
keyText = key.uppercased()
|
||||
}
|
||||
parts.append(keyText)
|
||||
return parts.joined()
|
||||
}
|
||||
|
||||
|
|
@ -73,20 +215,60 @@ struct StoredShortcut: Codable, Equatable {
|
|||
}
|
||||
|
||||
static func from(event: NSEvent) -> StoredShortcut? {
|
||||
guard let chars = event.charactersIgnoringModifiers?.lowercased(),
|
||||
let char = chars.first,
|
||||
char.isLetter || char.isNumber else {
|
||||
return nil
|
||||
}
|
||||
guard let key = storedKey(from: event) else { return nil }
|
||||
|
||||
let flags = event.modifierFlags
|
||||
return StoredShortcut(
|
||||
key: String(char),
|
||||
// Some keys include extra flags depending on the responder chain.
|
||||
let flags = event.modifierFlags.intersection(.deviceIndependentFlagsMask)
|
||||
.subtracting([.numericPad, .function])
|
||||
|
||||
let shortcut = StoredShortcut(
|
||||
key: key,
|
||||
command: flags.contains(.command),
|
||||
shift: flags.contains(.shift),
|
||||
option: flags.contains(.option),
|
||||
control: flags.contains(.control)
|
||||
)
|
||||
|
||||
// Avoid recording plain typing; require at least one modifier.
|
||||
if !shortcut.command && !shortcut.shift && !shortcut.option && !shortcut.control {
|
||||
return nil
|
||||
}
|
||||
return shortcut
|
||||
}
|
||||
|
||||
private static func storedKey(from event: NSEvent) -> String? {
|
||||
// Prefer keyCode mapping so shifted symbol keys (e.g. "}") record as "]".
|
||||
switch event.keyCode {
|
||||
case 123: return "←" // left arrow
|
||||
case 124: return "→" // right arrow
|
||||
case 125: return "↓" // down arrow
|
||||
case 126: return "↑" // up arrow
|
||||
case 48: return "\t" // tab
|
||||
case 33: return "[" // kVK_ANSI_LeftBracket
|
||||
case 30: return "]" // kVK_ANSI_RightBracket
|
||||
case 27: return "-" // kVK_ANSI_Minus
|
||||
case 24: return "=" // kVK_ANSI_Equal
|
||||
case 43: return "," // kVK_ANSI_Comma
|
||||
case 47: return "." // kVK_ANSI_Period
|
||||
case 44: return "/" // kVK_ANSI_Slash
|
||||
case 41: return ";" // kVK_ANSI_Semicolon
|
||||
case 39: return "'" // kVK_ANSI_Quote
|
||||
case 50: return "`" // kVK_ANSI_Grave
|
||||
case 42: return "\\" // kVK_ANSI_Backslash
|
||||
default:
|
||||
break
|
||||
}
|
||||
|
||||
guard let chars = event.charactersIgnoringModifiers?.lowercased(),
|
||||
let char = chars.first else {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Allow letters/numbers; everything else should be handled by keyCode mapping above.
|
||||
if char.isLetter || char.isNumber {
|
||||
return String(char)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -192,7 +374,8 @@ private class ShortcutRecorderNSButton: NSButton {
|
|||
return nil
|
||||
}
|
||||
|
||||
return event
|
||||
// Consume unsupported keys while recording to avoid triggering app shortcuts.
|
||||
return nil
|
||||
}
|
||||
|
||||
// Also stop recording if window loses focus
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue