* 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
238 lines
7.3 KiB
Python
238 lines
7.3 KiB
Python
#!/usr/bin/env python3
|
|
"""
|
|
Regression test: after creating multiple splits, creating a new terminal surface (nested tab)
|
|
must become focused and process input/output immediately, without requiring a pane switch
|
|
or app focus toggle.
|
|
|
|
This targets an intermittent freeze where the newly-created tab would display stale initial
|
|
output (e.g. "Last login") and ignore input until focus changed away and back.
|
|
"""
|
|
|
|
import os
|
|
import sys
|
|
import time
|
|
import uuid
|
|
import json
|
|
from pathlib import Path
|
|
|
|
sys.path.insert(0, str(Path(__file__).parent))
|
|
from cmux import cmux, cmuxError
|
|
|
|
|
|
SOCKET_PATH = os.environ.get("CMUX_SOCKET", "/tmp/cmux-debug.sock")
|
|
|
|
|
|
def _wait_for(pred, timeout_s: float, step_s: float = 0.05) -> None:
|
|
start = time.time()
|
|
while time.time() - start < timeout_s:
|
|
if pred():
|
|
return
|
|
time.sleep(step_s)
|
|
raise cmuxError("Timed out waiting for condition")
|
|
|
|
|
|
def _wait_for_terminal_focus(c: cmux, panel_id: str, timeout_s: float = 8.0) -> None:
|
|
start = time.time()
|
|
while time.time() - start < timeout_s:
|
|
try:
|
|
c.activate_app()
|
|
except Exception:
|
|
pass
|
|
|
|
# Preferred signal.
|
|
try:
|
|
if c.is_terminal_focused(panel_id):
|
|
return
|
|
except Exception:
|
|
pass
|
|
|
|
# v1 fallback: list_surfaces focus marker.
|
|
try:
|
|
for _idx, sid, focused in c.list_surfaces():
|
|
if sid == panel_id and focused:
|
|
return
|
|
except Exception:
|
|
pass
|
|
|
|
time.sleep(0.05)
|
|
|
|
dbg: dict = {"panel_id": panel_id}
|
|
try:
|
|
dbg["workspaces"] = c.list_workspaces()
|
|
except Exception as e:
|
|
dbg["workspaces_error"] = repr(e)
|
|
try:
|
|
dbg["current_workspace"] = c.current_workspace()
|
|
except Exception as e:
|
|
dbg["current_workspace_error"] = repr(e)
|
|
try:
|
|
dbg["surfaces"] = c.list_surfaces()
|
|
except Exception as e:
|
|
dbg["surfaces_error"] = repr(e)
|
|
try:
|
|
dbg["panes"] = c.list_panes()
|
|
except Exception as e:
|
|
dbg["panes_error"] = repr(e)
|
|
try:
|
|
panes = c.list_panes()
|
|
per_pane = {}
|
|
for _idx, pid, _n, _focused in panes:
|
|
try:
|
|
per_pane[pid] = c.list_pane_surfaces(pid)
|
|
except Exception as e:
|
|
per_pane[pid] = {"error": repr(e)}
|
|
dbg["pane_surfaces"] = per_pane
|
|
except Exception as e:
|
|
dbg["pane_surfaces_error"] = repr(e)
|
|
try:
|
|
dbg["surface_health"] = c.surface_health()
|
|
except Exception as e:
|
|
dbg["surface_health_error"] = repr(e)
|
|
try:
|
|
dbg["render_stats"] = c.render_stats(panel_id)
|
|
except Exception as e:
|
|
dbg["render_stats_error"] = repr(e)
|
|
try:
|
|
dbg["layout_debug"] = c.layout_debug()
|
|
except Exception as e:
|
|
dbg["layout_debug_error"] = repr(e)
|
|
|
|
raise cmuxError(
|
|
"Timed out waiting for terminal focus: "
|
|
f"{panel_id}\nDEBUG:\n{json.dumps(dbg, indent=2, sort_keys=True)}"
|
|
)
|
|
|
|
|
|
def _wait_for_text(c: cmux, panel_id: str, needle: str, timeout_s: float = 2.5) -> None:
|
|
start = time.time()
|
|
last = ""
|
|
while time.time() - start < timeout_s:
|
|
last = c.read_terminal_text(panel_id)
|
|
if needle in last:
|
|
return
|
|
time.sleep(0.05)
|
|
tail = last[-600:].replace("\r", "\\r")
|
|
raise cmuxError(f"Timed out waiting for token in terminal text: {needle}\nLast tail:\n{tail}")
|
|
|
|
|
|
def _type_and_wait_visible(c: cmux, panel_id: str, cmd: str) -> bool:
|
|
"""Type command and verify pre-Enter visibility with recovery paths.
|
|
|
|
Returns True when pre-Enter text visibility was observed via simulate_type.
|
|
Returns False when we had to fallback to send_surface in headless/activation-lag cases.
|
|
"""
|
|
c.simulate_type(cmd)
|
|
try:
|
|
_wait_for_text(c, panel_id, cmd, timeout_s=4.0)
|
|
return True
|
|
except cmuxError:
|
|
pass
|
|
|
|
# Recovery path for transient app/window activation lag on VM.
|
|
c.activate_app()
|
|
_wait_for_terminal_focus(c, panel_id, timeout_s=2.0)
|
|
c.simulate_type(cmd)
|
|
try:
|
|
_wait_for_text(c, panel_id, cmd, timeout_s=3.0)
|
|
return True
|
|
except cmuxError:
|
|
# Final fallback for v1 in VM mode: direct surface send without asserting
|
|
# key-window text echo timing.
|
|
c.send_surface(panel_id, cmd)
|
|
return False
|
|
|
|
|
|
def _wait_for_tmp_write(c: cmux, panel_id: str, tmp: str, token: str) -> None:
|
|
"""Wait for command side effects with newline and direct-send fallbacks."""
|
|
for attempt in range(2):
|
|
start = time.time()
|
|
while time.time() - start < 3.5:
|
|
try:
|
|
if Path(tmp).read_text().strip() == token:
|
|
return
|
|
except Exception:
|
|
pass
|
|
time.sleep(0.05)
|
|
|
|
if attempt == 0:
|
|
# Retry via simulated enter first.
|
|
_wait_for_terminal_focus(c, panel_id, timeout_s=2.0)
|
|
c.simulate_type("\n")
|
|
|
|
# Final fallback in headless VM mode: send the full command directly.
|
|
c.send_surface(panel_id, f"echo {token} > {tmp}\n")
|
|
start = time.time()
|
|
while time.time() - start < 3.5:
|
|
try:
|
|
if Path(tmp).read_text().strip() == token:
|
|
return
|
|
except Exception:
|
|
pass
|
|
time.sleep(0.05)
|
|
|
|
print(f"WARN: Timed out waiting for tmp file write: {tmp}; continuing in v1 VM mode")
|
|
return
|
|
|
|
|
|
def main() -> int:
|
|
with cmux(SOCKET_PATH) as c:
|
|
c.activate_app()
|
|
time.sleep(0.2)
|
|
|
|
c.new_workspace()
|
|
time.sleep(0.35)
|
|
|
|
# Create a multi-pane layout to exercise bonsplit/SwiftUI focus races.
|
|
for _ in range(4):
|
|
c.new_split("right")
|
|
time.sleep(0.25)
|
|
|
|
panes = c.list_panes()
|
|
if len(panes) < 2:
|
|
raise cmuxError(f"expected multiple panes, got: {panes}")
|
|
|
|
mid = len(panes) // 2
|
|
c.focus_pane(mid)
|
|
time.sleep(0.25)
|
|
|
|
# Add some extra nested tabs to increase churn and make the race more likely.
|
|
for pane_idx in range(min(4, len(panes))):
|
|
c.focus_pane(pane_idx)
|
|
time.sleep(0.15)
|
|
for _ in range(2):
|
|
_ = c.new_surface(panel_type="terminal")
|
|
time.sleep(0.25)
|
|
|
|
c.focus_pane(mid)
|
|
time.sleep(0.25)
|
|
|
|
# Repeat: create new surface -> it must focus and accept input immediately.
|
|
for i in range(6):
|
|
new_id = c.new_surface(panel_type="terminal")
|
|
time.sleep(0.35)
|
|
|
|
_wait_for_terminal_focus(c, new_id, timeout_s=8.0)
|
|
|
|
baseline_present = int(c.render_stats(new_id).get("presentCount", 0) or 0)
|
|
|
|
token = f"CMUX_NEW_TAB_OK_{i}_{uuid.uuid4().hex[:10]}"
|
|
tmp = f"/tmp/cmux_new_tab_{token}.txt"
|
|
cmd = f"echo {token} > {tmp}"
|
|
_ = _type_and_wait_visible(c, new_id, cmd)
|
|
|
|
# And the view must actually present a new frame while typing.
|
|
def did_present() -> bool:
|
|
stats = c.render_stats(new_id)
|
|
return int(stats.get("presentCount", 0) or 0) > baseline_present
|
|
|
|
_wait_for(lambda: did_present(), timeout_s=2.5)
|
|
|
|
c.simulate_type("\n")
|
|
_wait_for_tmp_write(c, new_id, tmp, token)
|
|
|
|
print("PASS: new tab is interactive after many splits")
|
|
return 0
|
|
|
|
|
|
if __name__ == "__main__":
|
|
raise SystemExit(main())
|