* 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
161 lines
5.5 KiB
Python
161 lines
5.5 KiB
Python
#!/usr/bin/env python3
|
|
"""
|
|
Regression tests for browser-focused keybind handling.
|
|
|
|
Why this exists:
|
|
- When WKWebView is first responder, some shortcuts still need to work
|
|
(pane navigation, etc).
|
|
- Control-key combos can produce control characters (e.g. Ctrl+H => backspace),
|
|
so matching must use keyCode fallbacks.
|
|
|
|
Requires:
|
|
- cmux running
|
|
- Debug socket commands enabled (`set_shortcut`, `simulate_shortcut`)
|
|
"""
|
|
|
|
import os
|
|
import sys
|
|
import time
|
|
from typing import Optional
|
|
|
|
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
|
|
from cmux import cmux
|
|
|
|
def focused_pane_id(client: cmux) -> Optional[str]:
|
|
for _idx, pane_id, _count, is_focused in client.list_panes():
|
|
if is_focused:
|
|
return pane_id
|
|
return None
|
|
|
|
|
|
def wait_url_contains(client: cmux, panel_id: str, needle: str, timeout_s: float = 10.0) -> None:
|
|
start = time.time()
|
|
while time.time() - start < timeout_s:
|
|
url = client.get_url(panel_id).strip()
|
|
if url and not url.startswith("ERROR") and needle in url:
|
|
return
|
|
time.sleep(0.1)
|
|
raise RuntimeError(f"Timed out waiting for url to contain '{needle}': {url!r}")
|
|
|
|
|
|
def test_cmd_ctrl_h_goto_split_left_from_webview(client: cmux) -> tuple[bool, str]:
|
|
"""
|
|
Verifies: Cmd+Ctrl+H moves pane focus left while WKWebView is first responder.
|
|
This uses the app shortcut override path so the test is hermetic.
|
|
"""
|
|
ws_id = client.new_workspace()
|
|
client.select_workspace(ws_id)
|
|
time.sleep(0.5)
|
|
|
|
# Override focus-left shortcut to Cmd+Ctrl+H for this test.
|
|
client.set_shortcut("focus_left", "cmd+ctrl+h")
|
|
|
|
try:
|
|
# Create a browser pane to the right, loading a real page.
|
|
browser_id = client.new_pane(direction="right", panel_type="browser", url="https://example.com")
|
|
wait_url_contains(client, browser_id, "example.com", timeout_s=15.0)
|
|
|
|
panes = client.list_panes()
|
|
if len(panes) != 2:
|
|
return False, f"Expected 2 panes, got {len(panes)}: {panes}"
|
|
|
|
browser_pane_id = focused_pane_id(client)
|
|
terminal_pane_id = next((pid for _i, pid, _n, _f in panes if pid != browser_pane_id), None)
|
|
if not browser_pane_id or not terminal_pane_id:
|
|
return False, f"Could not identify terminal/browser pane IDs: {panes}"
|
|
|
|
# Force WKWebView first responder (socket-driven; avoids flaky clicking).
|
|
client.focus_webview(browser_id)
|
|
client.wait_for_webview_focus(browser_id, timeout_s=3.0)
|
|
|
|
pre = focused_pane_id(client)
|
|
if pre != browser_pane_id:
|
|
return False, f"Expected browser pane focused before keypress, got {pre}"
|
|
|
|
# Send Cmd+Ctrl+H via socket event injection.
|
|
client.simulate_shortcut("cmd+ctrl+h")
|
|
time.sleep(0.4)
|
|
|
|
post = focused_pane_id(client)
|
|
if post != terminal_pane_id:
|
|
return False, f"Expected focus to move left to {terminal_pane_id}, got {post}"
|
|
|
|
return True, "Cmd+Ctrl+H moved focus left while webview focused"
|
|
finally:
|
|
# Restore defaults for subsequent tests.
|
|
try:
|
|
client.set_shortcut("focus_left", "clear")
|
|
except Exception:
|
|
pass
|
|
|
|
def test_cmd_opt_left_arrow_goto_split_left_from_webview(client: cmux) -> tuple[bool, str]:
|
|
"""
|
|
Baseline: default pane navigation (Cmd+Option+Left Arrow) moves pane focus
|
|
left while WKWebView is first responder.
|
|
"""
|
|
ws_id = client.new_workspace()
|
|
client.select_workspace(ws_id)
|
|
time.sleep(0.5)
|
|
|
|
# Ensure we use the default arrow shortcut.
|
|
client.set_shortcut("focus_left", "clear")
|
|
|
|
browser_id = client.new_pane(direction="right", panel_type="browser", url="https://example.com")
|
|
wait_url_contains(client, browser_id, "example.com", timeout_s=15.0)
|
|
|
|
panes = client.list_panes()
|
|
if len(panes) != 2:
|
|
return False, f"Expected 2 panes, got {len(panes)}: {panes}"
|
|
|
|
browser_pane_id = focused_pane_id(client)
|
|
terminal_pane_id = next((pid for _i, pid, _n, _f in panes if pid != browser_pane_id), None)
|
|
if not browser_pane_id or not terminal_pane_id:
|
|
return False, f"Could not identify terminal/browser pane IDs: {panes}"
|
|
|
|
client.focus_webview(browser_id)
|
|
client.wait_for_webview_focus(browser_id, timeout_s=3.0)
|
|
|
|
pre = focused_pane_id(client)
|
|
if pre != browser_pane_id:
|
|
return False, f"Expected browser pane focused before keypress, got {pre}"
|
|
|
|
client.simulate_shortcut("cmd+opt+left")
|
|
time.sleep(0.4)
|
|
|
|
post = focused_pane_id(client)
|
|
if post != terminal_pane_id:
|
|
return False, f"Expected focus to move left to {terminal_pane_id}, got {post}"
|
|
return True, "Cmd+Option+Left moved focus left while webview focused"
|
|
|
|
|
|
def main() -> int:
|
|
print("cmux Browser Custom Keybind Tests")
|
|
print("=" * 50)
|
|
client = cmux()
|
|
client.connect()
|
|
|
|
tests = [
|
|
("Cmd+Opt+Left goto_split:left from webview focus", test_cmd_opt_left_arrow_goto_split_left_from_webview),
|
|
("Cmd+Ctrl+H goto_split:left from webview focus", test_cmd_ctrl_h_goto_split_left_from_webview),
|
|
]
|
|
|
|
failed = 0
|
|
for name, fn in tests:
|
|
try:
|
|
ok, msg = fn(client)
|
|
except Exception as e:
|
|
ok, msg = False, str(e)
|
|
status = "PASS" if ok else "FAIL"
|
|
print(f"{status}: {name} - {msg}")
|
|
if not ok:
|
|
failed += 1
|
|
|
|
if failed == 0:
|
|
print("\nAll tests passed.")
|
|
return 0
|
|
print(f"\n{failed} test(s) failed.")
|
|
return 1
|
|
|
|
|
|
if __name__ == "__main__":
|
|
raise SystemExit(main())
|