* 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
293 lines
8 KiB
Python
293 lines
8 KiB
Python
#!/usr/bin/env python3
|
|
"""
|
|
CPU usage tests for notification scenarios.
|
|
|
|
Tests that CPU usage stays reasonable when:
|
|
1. Notifications arrive
|
|
2. Notifications popover is opened and closed
|
|
3. Multiple notifications arrive in sequence
|
|
|
|
Usage:
|
|
python3 tests/test_cpu_notifications.py
|
|
|
|
Requires cmux to be running with socket control enabled.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import subprocess
|
|
import sys
|
|
import time
|
|
import os
|
|
from typing import List, Optional
|
|
|
|
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
|
|
|
|
from cmux import cmux, cmuxError
|
|
|
|
|
|
# Maximum acceptable CPU usage during idle (after notifications)
|
|
MAX_IDLE_CPU_PERCENT = 20.0
|
|
|
|
# Maximum acceptable CPU usage right after notification burst
|
|
MAX_POST_NOTIFICATION_CPU_PERCENT = 30.0
|
|
|
|
# How long to wait for app to settle (seconds)
|
|
SETTLE_TIME = 2.0
|
|
|
|
# Duration to monitor CPU (seconds)
|
|
MONITOR_DURATION = 3.0
|
|
|
|
|
|
def get_cmux_pid() -> Optional[int]:
|
|
"""Get the PID of the running cmux process."""
|
|
result = subprocess.run(
|
|
["pgrep", "-f", r"cmux\.app/Contents/MacOS/cmux$"],
|
|
capture_output=True,
|
|
text=True,
|
|
)
|
|
if result.returncode != 0:
|
|
# Try DEV build
|
|
result = subprocess.run(
|
|
["pgrep", "-f", r"cmux DEV\.app/Contents/MacOS/cmux"],
|
|
capture_output=True,
|
|
text=True,
|
|
)
|
|
if result.returncode != 0:
|
|
return None
|
|
pids = result.stdout.strip().split("\n")
|
|
return int(pids[0]) if pids and pids[0] else None
|
|
|
|
|
|
def get_cpu_usage(pid: int) -> float:
|
|
"""Get current CPU usage percentage for a process."""
|
|
result = subprocess.run(
|
|
["ps", "-p", str(pid), "-o", "%cpu="],
|
|
capture_output=True,
|
|
text=True,
|
|
)
|
|
if result.returncode != 0:
|
|
return 0.0
|
|
try:
|
|
return float(result.stdout.strip())
|
|
except ValueError:
|
|
return 0.0
|
|
|
|
|
|
def monitor_cpu(pid: int, duration: float, interval: float = 0.5) -> List[float]:
|
|
"""Monitor CPU usage over a period."""
|
|
readings = []
|
|
start = time.time()
|
|
while time.time() - start < duration:
|
|
readings.append(get_cpu_usage(pid))
|
|
time.sleep(interval)
|
|
return readings
|
|
|
|
|
|
def test_cpu_after_notification_burst(client: cmux, pid: int) -> tuple[bool, str]:
|
|
"""
|
|
Test that CPU returns to normal after a burst of notifications.
|
|
"""
|
|
# Clear any existing notifications
|
|
try:
|
|
client.clear_notifications()
|
|
except cmuxError:
|
|
pass
|
|
time.sleep(0.5)
|
|
|
|
# Send a burst of notifications
|
|
for i in range(5):
|
|
try:
|
|
client.notify(f"Test notification {i+1}")
|
|
except cmuxError:
|
|
pass
|
|
time.sleep(0.1)
|
|
|
|
# Wait for processing
|
|
time.sleep(1.0)
|
|
|
|
# Monitor CPU
|
|
readings = monitor_cpu(pid, MONITOR_DURATION)
|
|
avg_cpu = sum(readings) / len(readings) if readings else 0
|
|
|
|
# Clean up
|
|
try:
|
|
client.clear_notifications()
|
|
except cmuxError:
|
|
pass
|
|
|
|
if avg_cpu > MAX_POST_NOTIFICATION_CPU_PERCENT:
|
|
return False, f"CPU {avg_cpu:.1f}% exceeds {MAX_POST_NOTIFICATION_CPU_PERCENT}% after notification burst"
|
|
|
|
return True, f"CPU {avg_cpu:.1f}% is acceptable after notification burst"
|
|
|
|
|
|
def test_cpu_after_popover_close(client: cmux, pid: int) -> tuple[bool, str]:
|
|
"""
|
|
Test that CPU returns to normal after opening and closing the notifications popover.
|
|
|
|
This tests that the popover's SwiftUI view is properly cleaned up when closed.
|
|
"""
|
|
# Create some notifications first
|
|
try:
|
|
client.clear_notifications()
|
|
except cmuxError:
|
|
pass
|
|
for i in range(3):
|
|
try:
|
|
client.notify(f"Popover test {i+1}")
|
|
except cmuxError:
|
|
pass
|
|
time.sleep(0.1)
|
|
time.sleep(0.5)
|
|
|
|
# Toggle the popover via our debug socket shortcut simulator (doesn't require Accessibility).
|
|
# Default: Cmd+Shift+I (Show Notifications).
|
|
try:
|
|
client.simulate_shortcut("cmd+shift+i")
|
|
except Exception:
|
|
# Keep this test best-effort; if shortcut simulation is unavailable, fall back to osascript.
|
|
subprocess.run([
|
|
"osascript", "-e",
|
|
'tell application "System Events" to keystroke "i" using {command down, shift down}'
|
|
], capture_output=True)
|
|
time.sleep(0.5)
|
|
|
|
# Close it
|
|
try:
|
|
client.simulate_shortcut("cmd+shift+i")
|
|
except Exception:
|
|
subprocess.run([
|
|
"osascript", "-e",
|
|
'tell application "System Events" to keystroke "i" using {command down, shift down}'
|
|
], capture_output=True)
|
|
time.sleep(1.0)
|
|
|
|
# Monitor CPU - should be low now
|
|
readings = monitor_cpu(pid, MONITOR_DURATION)
|
|
avg_cpu = sum(readings) / len(readings) if readings else 0
|
|
|
|
# Clean up
|
|
try:
|
|
client.clear_notifications()
|
|
except cmuxError:
|
|
pass
|
|
|
|
if avg_cpu > MAX_IDLE_CPU_PERCENT:
|
|
return False, f"CPU {avg_cpu:.1f}% exceeds {MAX_IDLE_CPU_PERCENT}% after closing popover"
|
|
|
|
return True, f"CPU {avg_cpu:.1f}% is acceptable after closing popover"
|
|
|
|
|
|
def test_cpu_idle_with_notifications(client: cmux, pid: int) -> tuple[bool, str]:
|
|
"""
|
|
Test that CPU stays low when notifications exist but popover is closed.
|
|
"""
|
|
# Create notifications
|
|
try:
|
|
client.clear_notifications()
|
|
except cmuxError:
|
|
pass
|
|
for i in range(3):
|
|
try:
|
|
client.notify(f"Idle test {i+1}")
|
|
except cmuxError:
|
|
pass
|
|
time.sleep(0.2)
|
|
|
|
# Wait for things to settle
|
|
time.sleep(SETTLE_TIME)
|
|
|
|
# Monitor CPU
|
|
readings = monitor_cpu(pid, MONITOR_DURATION)
|
|
avg_cpu = sum(readings) / len(readings) if readings else 0
|
|
|
|
# Clean up
|
|
try:
|
|
client.clear_notifications()
|
|
except cmuxError:
|
|
pass
|
|
|
|
if avg_cpu > MAX_IDLE_CPU_PERCENT:
|
|
return False, f"CPU {avg_cpu:.1f}% exceeds {MAX_IDLE_CPU_PERCENT}% with notifications pending"
|
|
|
|
return True, f"CPU {avg_cpu:.1f}% is acceptable with notifications pending"
|
|
|
|
|
|
def main():
|
|
print("=" * 60)
|
|
print("cmux Notification CPU Tests")
|
|
print("=" * 60)
|
|
|
|
pid = get_cmux_pid()
|
|
if pid is None:
|
|
print("\n❌ SKIP: cmux is not running")
|
|
return 0
|
|
|
|
print(f"\nFound cmux process: PID {pid}")
|
|
|
|
# Try to connect to the socket
|
|
socket_paths = ["/tmp/cmux.sock", "/tmp/cmux-debug.sock"]
|
|
client = None
|
|
for socket_path in socket_paths:
|
|
if os.path.exists(socket_path):
|
|
try:
|
|
client = cmux(socket_path)
|
|
client.connect()
|
|
print(f"Connected to {socket_path}")
|
|
break
|
|
except cmuxError:
|
|
continue
|
|
|
|
if client is None:
|
|
print(f"\n❌ SKIP: Could not connect to cmux socket")
|
|
return 0
|
|
|
|
results = []
|
|
|
|
print("\nRunning tests...")
|
|
|
|
# Test 1: CPU after notification burst
|
|
print("\n[1/3] Testing CPU after notification burst...")
|
|
passed, msg = test_cpu_after_notification_burst(client, pid)
|
|
results.append(("CPU after notification burst", passed, msg))
|
|
print(f" {'✓' if passed else '✗'} {msg}")
|
|
|
|
time.sleep(1)
|
|
|
|
# Test 2: CPU after popover close
|
|
print("\n[2/3] Testing CPU after popover open/close...")
|
|
passed, msg = test_cpu_after_popover_close(client, pid)
|
|
results.append(("CPU after popover close", passed, msg))
|
|
print(f" {'✓' if passed else '✗'} {msg}")
|
|
|
|
time.sleep(1)
|
|
|
|
# Test 3: CPU idle with pending notifications
|
|
print("\n[3/3] Testing CPU idle with pending notifications...")
|
|
passed, msg = test_cpu_idle_with_notifications(client, pid)
|
|
results.append(("CPU idle with notifications", passed, msg))
|
|
print(f" {'✓' if passed else '✗'} {msg}")
|
|
|
|
client.close()
|
|
|
|
# Summary
|
|
print("\n" + "=" * 60)
|
|
print("Results:")
|
|
all_passed = True
|
|
for name, passed, msg in results:
|
|
status = "PASS" if passed else "FAIL"
|
|
print(f" {status}: {name}")
|
|
if not passed:
|
|
all_passed = False
|
|
|
|
if all_passed:
|
|
print("\n✅ All notification CPU tests passed!")
|
|
return 0
|
|
else:
|
|
print("\n❌ Some tests failed")
|
|
return 1
|
|
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(main())
|