* 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
376 lines
11 KiB
Python
Executable file
376 lines
11 KiB
Python
Executable file
#!/usr/bin/env python3
|
|
"""
|
|
Automated tests for Ctrl+C and Ctrl+D using the cmux socket interface.
|
|
|
|
Usage:
|
|
python3 test_ctrl_socket.py
|
|
|
|
Requirements:
|
|
- cmux must be running with the socket controller enabled
|
|
"""
|
|
|
|
import json
|
|
import os
|
|
import sys
|
|
import time
|
|
import tempfile
|
|
from pathlib import Path
|
|
|
|
# Add the directory containing cmux.py to the path
|
|
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
|
|
|
|
from cmux import cmux, cmuxError
|
|
|
|
|
|
class TestResult:
|
|
def __init__(self, name: str):
|
|
self.name = name
|
|
self.passed = False
|
|
self.message = ""
|
|
|
|
def success(self, msg: str = ""):
|
|
self.passed = True
|
|
self.message = msg
|
|
|
|
def failure(self, msg: str):
|
|
self.passed = False
|
|
self.message = msg
|
|
|
|
|
|
def test_connection(client: cmux) -> TestResult:
|
|
"""Test that we can connect and ping the server"""
|
|
result = TestResult("Connection")
|
|
try:
|
|
if client.ping():
|
|
result.success("Connected and received PONG")
|
|
else:
|
|
result.failure("Ping failed")
|
|
except Exception as e:
|
|
result.failure(str(e))
|
|
return result
|
|
|
|
|
|
def test_ctrl_c(client: cmux) -> TestResult:
|
|
"""
|
|
Test Ctrl+C by:
|
|
1. Starting sleep command
|
|
2. Sending Ctrl+C
|
|
3. Verifying shell responds to next command
|
|
"""
|
|
result = TestResult("Ctrl+C (SIGINT)")
|
|
|
|
marker = Path(tempfile.gettempdir()) / f"ghostty_ctrlc_{os.getpid()}"
|
|
|
|
try:
|
|
marker.unlink(missing_ok=True)
|
|
|
|
# Start a long sleep
|
|
client.send("sleep 30\n")
|
|
time.sleep(0.8)
|
|
|
|
# Send Ctrl+C to interrupt
|
|
client.send_ctrl_c()
|
|
time.sleep(0.8)
|
|
|
|
# If Ctrl+C worked, shell should accept new command
|
|
for attempt in range(3):
|
|
client.send(f"touch {marker}\n")
|
|
for _ in range(10):
|
|
if marker.exists():
|
|
break
|
|
time.sleep(0.2)
|
|
if marker.exists():
|
|
break
|
|
# try another Ctrl+C in case the process swallowed the signal
|
|
client.send_ctrl_c()
|
|
time.sleep(0.6)
|
|
|
|
if marker.exists():
|
|
result.success("Ctrl+C interrupted sleep, shell responsive")
|
|
marker.unlink(missing_ok=True)
|
|
else:
|
|
result.failure("Shell not responsive after Ctrl+C")
|
|
|
|
except Exception as e:
|
|
result.failure(f"Exception: {e}")
|
|
marker.unlink(missing_ok=True)
|
|
|
|
return result
|
|
|
|
|
|
def test_ctrl_d(client: cmux) -> TestResult:
|
|
"""
|
|
Test Ctrl+D by:
|
|
1. Running cat command
|
|
2. Sending Ctrl+D
|
|
3. Verifying cat exits and next command runs
|
|
"""
|
|
result = TestResult("Ctrl+D (EOF)")
|
|
|
|
marker = Path(tempfile.gettempdir()) / f"ghostty_ctrld_{os.getpid()}"
|
|
|
|
try:
|
|
marker.unlink(missing_ok=True)
|
|
|
|
# Run cat (waits for input)
|
|
client.send("cat\n")
|
|
time.sleep(0.6)
|
|
|
|
# Send Ctrl+D (EOF)
|
|
client.send_ctrl_d()
|
|
time.sleep(0.4)
|
|
|
|
# If Ctrl+D worked, cat should exit and we can run another command
|
|
client.send(f"touch {marker}\n")
|
|
for _ in range(10):
|
|
if marker.exists():
|
|
break
|
|
time.sleep(0.2)
|
|
|
|
if marker.exists():
|
|
result.success("Ctrl+D sent EOF, cat exited")
|
|
marker.unlink(missing_ok=True)
|
|
else:
|
|
result.failure("cat did not exit after Ctrl+D")
|
|
|
|
except Exception as e:
|
|
result.failure(f"Exception: {e}")
|
|
marker.unlink(missing_ok=True)
|
|
|
|
return result
|
|
|
|
|
|
def test_ctrl_c_python(client: cmux) -> TestResult:
|
|
"""
|
|
Test Ctrl+C with Python process
|
|
"""
|
|
result = TestResult("Ctrl+C in Python")
|
|
|
|
marker = Path(tempfile.gettempdir()) / f"ghostty_pyctrlc_{os.getpid()}"
|
|
|
|
try:
|
|
marker.unlink(missing_ok=True)
|
|
|
|
# Start Python that loops forever
|
|
client.send("python3 -c 'import time; [time.sleep(1) for _ in iter(int, 1)]'\n")
|
|
time.sleep(1.5) # Give Python time to start
|
|
|
|
# Send Ctrl+C
|
|
client.send_ctrl_c()
|
|
time.sleep(0.8)
|
|
|
|
# If Ctrl+C worked, shell should accept new command. This can race with
|
|
# Python process teardown, so retry with additional Ctrl+C if needed.
|
|
for attempt in range(3):
|
|
client.send(f"touch {marker}\n")
|
|
for _ in range(15):
|
|
if marker.exists():
|
|
break
|
|
time.sleep(0.2)
|
|
if marker.exists():
|
|
break
|
|
client.send_ctrl_c()
|
|
time.sleep(0.6)
|
|
|
|
if marker.exists():
|
|
result.success("Ctrl+C interrupted Python process")
|
|
marker.unlink(missing_ok=True)
|
|
else:
|
|
result.failure("Python not interrupted by Ctrl+C")
|
|
|
|
except Exception as e:
|
|
result.failure(f"Exception: {type(e).__name__}: {e}")
|
|
marker.unlink(missing_ok=True)
|
|
|
|
return result
|
|
|
|
|
|
def test_environment_paths(client: cmux) -> TestResult:
|
|
"""
|
|
Verify that TERMINFO points to a real terminfo directory and that
|
|
XDG_DATA_DIRS includes the app resources path (and defaults when unset).
|
|
"""
|
|
result = TestResult("Environment Paths")
|
|
env_path = Path(tempfile.gettempdir()) / f"cmux_env_{os.getpid()}.json"
|
|
env_path.unlink(missing_ok=True)
|
|
|
|
try:
|
|
command = (
|
|
"python3 -c 'import json,os;"
|
|
f"open(\"{env_path}\",\"w\").write("
|
|
"json.dumps({"
|
|
"\"TERMINFO\": os.environ.get(\"TERMINFO\", \"\"),"
|
|
"\"XDG_DATA_DIRS\": os.environ.get(\"XDG_DATA_DIRS\", \"\"),"
|
|
"}))'"
|
|
)
|
|
|
|
for attempt in range(3):
|
|
env_path.unlink(missing_ok=True)
|
|
# Reset any partial prompt state (e.g., unmatched quotes) before retrying.
|
|
client.send_ctrl_c()
|
|
time.sleep(0.2)
|
|
client.send(command + "\n")
|
|
|
|
for _ in range(20):
|
|
if env_path.exists():
|
|
break
|
|
time.sleep(0.2)
|
|
|
|
if env_path.exists():
|
|
break
|
|
|
|
# Small backoff before retrying send in case the surface isn't ready yet.
|
|
time.sleep(0.3 * (attempt + 1))
|
|
|
|
if not env_path.exists():
|
|
result.failure("Env dump file was not created")
|
|
return result
|
|
|
|
data = json.loads(env_path.read_text())
|
|
terminfo = data.get("TERMINFO", "")
|
|
xdg_data_dirs = data.get("XDG_DATA_DIRS", "")
|
|
|
|
if not terminfo:
|
|
result.failure("TERMINFO is empty")
|
|
return result
|
|
|
|
terminfo_path = Path(terminfo)
|
|
if not terminfo_path.exists():
|
|
result.failure(f"TERMINFO path does not exist: {terminfo}")
|
|
return result
|
|
|
|
xterm_entry = terminfo_path / "78" / "xterm-ghostty"
|
|
if not xterm_entry.exists():
|
|
result.failure(f"Missing terminfo entry: {xterm_entry}")
|
|
return result
|
|
|
|
if not xdg_data_dirs:
|
|
result.failure("XDG_DATA_DIRS is empty")
|
|
return result
|
|
|
|
xdg_entries = xdg_data_dirs.split(":")
|
|
resources_dir = terminfo_path.parent
|
|
if resources_dir.as_posix() not in xdg_entries:
|
|
result.failure(f"XDG_DATA_DIRS missing resources path: {resources_dir}")
|
|
return result
|
|
|
|
if not os.environ.get("XDG_DATA_DIRS"):
|
|
if "/usr/local/share" not in xdg_entries or "/usr/share" not in xdg_entries:
|
|
result.failure(
|
|
"XDG_DATA_DIRS missing standard defaults (/usr/local/share:/usr/share)"
|
|
)
|
|
return result
|
|
|
|
result.success("TERMINFO and XDG_DATA_DIRS paths look correct")
|
|
env_path.unlink(missing_ok=True)
|
|
return result
|
|
except Exception as e:
|
|
env_path.unlink(missing_ok=True)
|
|
result.failure(f"Exception: {type(e).__name__}: {e}")
|
|
return result
|
|
|
|
|
|
def run_tests():
|
|
"""Run all tests"""
|
|
print("=" * 60)
|
|
print("cmux Ctrl+C/D Automated Tests")
|
|
print("=" * 60)
|
|
print()
|
|
|
|
socket_path = cmux.DEFAULT_SOCKET_PATH
|
|
if not os.path.exists(socket_path):
|
|
print(f"Error: Socket not found at {socket_path}")
|
|
print("Please make sure cmux is running.")
|
|
return 1
|
|
|
|
results = []
|
|
|
|
try:
|
|
with cmux() as client:
|
|
# Test connection
|
|
print("Testing connection...")
|
|
results.append(test_connection(client))
|
|
status = "✅" if results[-1].passed else "❌"
|
|
print(f" {status} {results[-1].message}")
|
|
print()
|
|
|
|
if not results[-1].passed:
|
|
return 1
|
|
|
|
# Ensure we start from a focused terminal surface (tests can be run
|
|
# after other scripts that leave focus in a browser panel).
|
|
try:
|
|
client.new_workspace()
|
|
time.sleep(0.6)
|
|
client.focus_surface(0)
|
|
time.sleep(0.2)
|
|
except Exception as e:
|
|
# Continue; individual tests will report a clearer failure.
|
|
print(f" ⚠️ Setup warning (could not focus terminal): {e}")
|
|
print()
|
|
|
|
# Test Ctrl+C
|
|
print("Testing Ctrl+C (SIGINT)...")
|
|
results.append(test_ctrl_c(client))
|
|
status = "✅" if results[-1].passed else "❌"
|
|
print(f" {status} {results[-1].message}")
|
|
print()
|
|
|
|
time.sleep(0.5)
|
|
|
|
# Test Ctrl+D
|
|
print("Testing Ctrl+D (EOF)...")
|
|
results.append(test_ctrl_d(client))
|
|
status = "✅" if results[-1].passed else "❌"
|
|
print(f" {status} {results[-1].message}")
|
|
print()
|
|
|
|
time.sleep(0.5)
|
|
|
|
# Test Ctrl+C in Python
|
|
print("Testing Ctrl+C in Python process...")
|
|
results.append(test_ctrl_c_python(client))
|
|
status = "✅" if results[-1].passed else "❌"
|
|
print(f" {status} {results[-1].message}")
|
|
print()
|
|
|
|
time.sleep(0.5)
|
|
|
|
# Test environment paths
|
|
print("Testing TERMINFO/XDG_DATA_DIRS paths...")
|
|
results.append(test_environment_paths(client))
|
|
status = "✅" if results[-1].passed else "❌"
|
|
print(f" {status} {results[-1].message}")
|
|
print()
|
|
|
|
except cmuxError as e:
|
|
print(f"Error: {e}")
|
|
return 1
|
|
|
|
# Summary
|
|
print("=" * 60)
|
|
print("Test Results Summary")
|
|
print("=" * 60)
|
|
|
|
passed = sum(1 for r in results if r.passed)
|
|
total = len(results)
|
|
|
|
for r in results:
|
|
status = "✅ PASS" if r.passed else "❌ FAIL"
|
|
print(f" {r.name}: {status}")
|
|
if not r.passed and r.message:
|
|
print(f" {r.message}")
|
|
|
|
print()
|
|
print(f"Passed: {passed}/{total}")
|
|
|
|
if passed == total:
|
|
print("\n🎉 All tests passed!")
|
|
return 0
|
|
else:
|
|
print(f"\n⚠️ {total - passed} test(s) failed")
|
|
return 1
|
|
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(run_tests())
|