* 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
149 lines
5.5 KiB
Python
Executable file
149 lines
5.5 KiB
Python
Executable file
#!/usr/bin/env python3
|
|
"""Regression: nested split must keep panel-to-view routing consistent.
|
|
|
|
Symptom (user report): after split churn, it can look like you're typing into one terminal
|
|
but the visible terminal doesn't update until refocus. Another manifestation is that a
|
|
pane can appear to disappear or show the wrong surface.
|
|
|
|
We validate routing using debug-only `panel_snapshot` diffs:
|
|
- Create a 3-pane horizontal layout: split right, focus right, split right again.
|
|
- For each panel, send a unique marker line to that specific panel.
|
|
- After each send, only that panel's snapshot should change materially.
|
|
|
|
This test avoids `layout_debug` because it calls `layoutSubtreeIfNeeded()` and can mask
|
|
layout/view-tree problems.
|
|
"""
|
|
|
|
import os
|
|
import sys
|
|
import time
|
|
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_terminal_focus(c: cmux, panel_id: str, timeout_s: float = 4.0) -> None:
|
|
deadline = time.time() + timeout_s
|
|
while time.time() < deadline:
|
|
try:
|
|
if c.is_terminal_focused(panel_id):
|
|
return
|
|
except Exception:
|
|
pass
|
|
time.sleep(0.05)
|
|
raise cmuxError(f"Timed out waiting for terminal focus: {panel_id}")
|
|
|
|
|
|
def _baseline_all(c: cmux, panel_ids: list[str], label: str) -> None:
|
|
for pid in panel_ids:
|
|
c.panel_snapshot(pid, label=f"{label}_base_{pid[:6]}")
|
|
|
|
|
|
def _after_all(c: cmux, panel_ids: list[str], label: str) -> dict[str, int]:
|
|
diffs: dict[str, int] = {}
|
|
for pid in panel_ids:
|
|
snap = c.panel_snapshot(pid, label=f"{label}_after_{pid[:6]}")
|
|
diffs[pid] = int(snap["changed_pixels"])
|
|
return diffs
|
|
|
|
|
|
def _assert_routing(diffs: dict[str, int], target: str, *, min_changed: int = 250, ratio: float = 3.0) -> None:
|
|
tgt = diffs.get(target)
|
|
if tgt is None:
|
|
raise cmuxError(f"missing diff for target {target}")
|
|
# -1 means first diff or size mismatch; treat as failure here.
|
|
if tgt < min_changed:
|
|
raise cmuxError(f"target panel did not change enough (changed_pixels={tgt}): diffs={diffs}")
|
|
|
|
others = [v for k, v in diffs.items() if k != target]
|
|
max_other = max(others) if others else 0
|
|
if max_other > 0 and float(tgt) < float(max_other) * ratio:
|
|
raise cmuxError(
|
|
f"non-target changed too much (target={tgt} max_other={max_other} ratio={ratio}): diffs={diffs}"
|
|
)
|
|
|
|
|
|
def main() -> int:
|
|
with cmux(SOCKET_PATH) as c:
|
|
c.activate_app()
|
|
c.new_workspace()
|
|
time.sleep(0.25)
|
|
|
|
surfaces0 = c.list_surfaces()
|
|
if not surfaces0:
|
|
raise cmuxError("expected initial surface")
|
|
left_panel = surfaces0[0][1]
|
|
|
|
right_panel = c.new_split("right")
|
|
time.sleep(0.1)
|
|
|
|
c.focus_surface(right_panel)
|
|
time.sleep(0.05)
|
|
|
|
new_right_panel = c.new_split("right")
|
|
time.sleep(0.15)
|
|
|
|
panel_ids = [left_panel, right_panel, new_right_panel]
|
|
|
|
# Prime each shell/panel so we don't mistake "prompt finished rendering" for
|
|
# a routing regression. New panels can take a moment to print the first prompt
|
|
# (git status, theme init, etc). Ensure each surface has executed at least one
|
|
# command and rendered output before we start snapshot-diff assertions.
|
|
for pid in panel_ids:
|
|
c.send_surface(pid, f"echo CMUX_READY_{pid[:6]}\n")
|
|
time.sleep(0.6)
|
|
|
|
# Ensure snapshots start from a clean baseline.
|
|
for pid in panel_ids:
|
|
c.panel_snapshot_reset(pid)
|
|
|
|
# Warm up: take an initial baseline.
|
|
_baseline_all(c, panel_ids, label="warm")
|
|
|
|
# Route-check each panel.
|
|
for i, target in enumerate(panel_ids):
|
|
marker = f"CMUX_ROUTE_{i}_{target[:6]}"
|
|
|
|
# Route assertions are meaningful only for the surface the user is currently
|
|
# interacting with. Focus the target surface, then validate that typing/output
|
|
# changes the *visible* pixels for that same panel (not a sibling).
|
|
c.focus_surface(target)
|
|
_wait_for_terminal_focus(c, target, timeout_s=6.0)
|
|
time.sleep(0.1)
|
|
|
|
_baseline_all(c, panel_ids, label=f"step{i}")
|
|
|
|
# Send marker to the target panel.
|
|
c.send_surface(target, f"echo {marker}\n")
|
|
|
|
# Allow time for the terminal to render the new line.
|
|
#
|
|
# In some VM/SSH runs, compositor updates can lag by a few hundred ms under load.
|
|
# Retry a few times (using successive snapshots) before declaring routing broken.
|
|
last_err: Exception | None = None
|
|
for attempt in range(4):
|
|
time.sleep(0.35 if attempt == 0 else 0.25)
|
|
diffs = _after_all(c, panel_ids, label=f"step{i}_a{attempt}")
|
|
try:
|
|
_assert_routing(diffs, target)
|
|
last_err = None
|
|
break
|
|
except Exception as e:
|
|
last_err = e
|
|
if last_err is not None:
|
|
raise last_err
|
|
|
|
# Sanity: the marker should be present in the terminal model too.
|
|
text = c.read_terminal_text(target)
|
|
if marker not in text:
|
|
raise cmuxError(f"marker missing from read_terminal_text for {target}: {marker}")
|
|
|
|
print("PASS: nested split panel routing via snapshots")
|
|
return 0
|
|
|
|
|
|
if __name__ == "__main__":
|
|
raise SystemExit(main())
|