* 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
183 lines
5.6 KiB
Python
183 lines
5.6 KiB
Python
#!/usr/bin/env python3
|
|
"""
|
|
Automated test for ctrl+enter keybind using real keystrokes.
|
|
|
|
Requires:
|
|
- cmux running
|
|
- Accessibility permissions for System Events (osascript)
|
|
- keybind = ctrl+enter=text:\\r (or \\n/\\x0d) configured in Ghostty config
|
|
"""
|
|
|
|
import os
|
|
import sys
|
|
import time
|
|
import subprocess
|
|
from pathlib import Path
|
|
from typing import Optional
|
|
|
|
# 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 SkipTest(Exception):
|
|
"""Raised to skip this test when the environment can't support it."""
|
|
|
|
def infer_app_name_for_osascript(socket_path: str) -> str:
|
|
"""
|
|
Infer the app display name from the socket path.
|
|
|
|
Examples:
|
|
- /tmp/cmux-debug.sock -> "cmux DEV"
|
|
- /tmp/cmux-debug-foo.sock -> "cmux DEV foo"
|
|
- /tmp/cmux.sock -> "cmux"
|
|
- /tmp/cmux-foo.sock -> "cmux foo"
|
|
"""
|
|
base = Path(socket_path).name
|
|
if base.startswith("cmux-debug") and base.endswith(".sock"):
|
|
suffix = base[len("cmux-debug") : -len(".sock")]
|
|
if suffix.startswith("-") and suffix[1:]:
|
|
return f"cmux DEV {suffix[1:]}"
|
|
return "cmux DEV"
|
|
if base.startswith("cmux") and base.endswith(".sock"):
|
|
suffix = base[len("cmux") : -len(".sock")]
|
|
if suffix.startswith("-") and suffix[1:]:
|
|
return f"cmux {suffix[1:]}"
|
|
return "cmux"
|
|
# Fallback: tests usually run against Debug builds.
|
|
return "cmux DEV"
|
|
|
|
|
|
def run_osascript(script: str) -> None:
|
|
# Use capture_output so we can detect the common "keystrokes not allowed" error
|
|
# in SSH / non-interactive environments without Accessibility permissions.
|
|
proc = subprocess.run(
|
|
["osascript", "-e", script],
|
|
capture_output=True,
|
|
text=True,
|
|
)
|
|
if proc.returncode == 0:
|
|
return
|
|
|
|
combined = (proc.stdout or "") + (proc.stderr or "")
|
|
if "not allowed to send keystrokes" in combined:
|
|
raise SkipTest("osascript is not allowed to send keystrokes (Accessibility permissions missing).")
|
|
|
|
raise subprocess.CalledProcessError(
|
|
proc.returncode,
|
|
proc.args,
|
|
output=proc.stdout,
|
|
stderr=proc.stderr,
|
|
)
|
|
|
|
|
|
def has_ctrl_enter_keybind(config_text: str) -> bool:
|
|
for line in config_text.splitlines():
|
|
stripped = line.strip()
|
|
if not stripped or stripped.startswith("#"):
|
|
continue
|
|
if "ctrl+enter" in stripped and "text:" in stripped:
|
|
if "\\r" in stripped or "\\n" in stripped or "\\x0d" in stripped:
|
|
return True
|
|
return False
|
|
|
|
|
|
def find_config_with_keybind() -> Optional[Path]:
|
|
home = Path.home()
|
|
candidates = [
|
|
home / "Library/Application Support/com.mitchellh.ghostty/config.ghostty",
|
|
home / "Library/Application Support/com.mitchellh.ghostty/config",
|
|
home / ".config/ghostty/config.ghostty",
|
|
home / ".config/ghostty/config",
|
|
]
|
|
for path in candidates:
|
|
if not path.exists():
|
|
continue
|
|
try:
|
|
if has_ctrl_enter_keybind(path.read_text(encoding="utf-8")):
|
|
return path
|
|
except OSError:
|
|
continue
|
|
return None
|
|
|
|
|
|
def test_ctrl_enter_keybind(client: cmux) -> tuple[bool, str]:
|
|
marker = Path("/tmp") / f"ghostty_ctrl_enter_{os.getpid()}"
|
|
marker.unlink(missing_ok=True)
|
|
|
|
# Create a fresh tab to avoid interfering with existing sessions
|
|
new_workspace_id = client.new_workspace()
|
|
client.select_workspace(new_workspace_id)
|
|
time.sleep(0.3)
|
|
|
|
# Make sure the app is focused for keystrokes
|
|
app_name = infer_app_name_for_osascript(client.socket_path)
|
|
run_osascript(f'tell application "{app_name}" to activate')
|
|
time.sleep(0.2)
|
|
|
|
# Clear any running command
|
|
try:
|
|
client.send_key("ctrl-c")
|
|
time.sleep(0.2)
|
|
except Exception:
|
|
pass
|
|
|
|
# Type the command (without pressing Enter)
|
|
run_osascript(f'tell application "System Events" to keystroke "touch {marker}"')
|
|
time.sleep(0.1)
|
|
|
|
# Send Ctrl+Enter (key code 36 = Return)
|
|
run_osascript('tell application "System Events" to key code 36 using control down')
|
|
time.sleep(0.5)
|
|
|
|
ok = marker.exists()
|
|
if ok:
|
|
marker.unlink(missing_ok=True)
|
|
try:
|
|
client.close_workspace(new_workspace_id)
|
|
except Exception:
|
|
pass
|
|
return ok, ("Ctrl+Enter keybind executed command" if ok else "Marker not created by Ctrl+Enter")
|
|
|
|
|
|
def run_tests() -> int:
|
|
print("=" * 60)
|
|
print("cmux Ctrl+Enter Keybind Test")
|
|
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
|
|
|
|
config_path = find_config_with_keybind()
|
|
if not config_path:
|
|
print("SKIP: Required keybind not found in Ghostty config.")
|
|
print("Add a line like `keybind = ctrl+enter=text:\\r` to enable this test.")
|
|
return 0
|
|
|
|
print(f"Using keybind from: {config_path}")
|
|
print()
|
|
|
|
try:
|
|
with cmux() as client:
|
|
ok, message = test_ctrl_enter_keybind(client)
|
|
status = "✅" if ok else "❌"
|
|
print(f"{status} {message}")
|
|
return 0 if ok else 1
|
|
except cmuxError as e:
|
|
print(f"Error: {e}")
|
|
return 1
|
|
except SkipTest as e:
|
|
print(f"SKIP: {e}")
|
|
return 0
|
|
except subprocess.CalledProcessError as e:
|
|
print(f"Error: osascript failed: {e}")
|
|
return 1
|
|
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(run_tests())
|