* 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
176 lines
6.3 KiB
Python
176 lines
6.3 KiB
Python
#!/usr/bin/env python3
|
|
"""
|
|
Regression test: creating a new terminal surface (nested tab) inside an existing split
|
|
must become interactive and render output immediately, without requiring a focus toggle.
|
|
|
|
Bug: after many splits, creating a new tab could show only initial output (e.g. "Last login")
|
|
and then appear "frozen" until the user alt-tabs or changes pane focus. Input would be
|
|
buffered and only appear after refocus.
|
|
|
|
We validate rendering by:
|
|
1) Taking two baseline panel snapshots (to estimate noise like cursor blink).
|
|
2) Typing a command that prints many lines.
|
|
3) Taking an "after" panel snapshot and asserting the panel materially changed vs baseline.
|
|
|
|
Note: We use `panel_snapshot` instead of window screenshots to avoid macOS Screen Recording
|
|
permissions on the UTM VM.
|
|
"""
|
|
|
|
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 = 6.0) -> bool:
|
|
start = time.time()
|
|
while time.time() - start < timeout_s:
|
|
try:
|
|
c.activate_app()
|
|
except Exception:
|
|
pass
|
|
|
|
try:
|
|
if c.is_terminal_focused(panel_id):
|
|
return True
|
|
except Exception:
|
|
pass
|
|
|
|
try:
|
|
for _idx, sid, focused in c.list_surfaces():
|
|
if sid == panel_id and focused:
|
|
return True
|
|
except Exception:
|
|
pass
|
|
|
|
time.sleep(0.05)
|
|
|
|
print(f"WARN: Timed out waiting for terminal focus: {panel_id}; continuing with snapshot validation")
|
|
return False
|
|
|
|
|
|
def _panel_snapshot_retry(c: cmux, panel_id: str, label: str, timeout_s: float = 3.0) -> dict:
|
|
start = time.time()
|
|
last_err: Exception | None = None
|
|
while time.time() - start < timeout_s:
|
|
try:
|
|
return dict(c.panel_snapshot(panel_id, label=label) or {})
|
|
except Exception as e:
|
|
last_err = e
|
|
if "Failed to capture panel image" not in str(e):
|
|
raise
|
|
time.sleep(0.05)
|
|
raise cmuxError(f"Timed out waiting for panel_snapshot: panel_id={panel_id} label={label}: {last_err!r}")
|
|
|
|
|
|
def _ratio(changed_pixels: int, width: int, height: int) -> float:
|
|
denom = max(1, int(width) * int(height))
|
|
return float(max(0, int(changed_pixels))) / float(denom)
|
|
|
|
|
|
def main() -> int:
|
|
with cmux(SOCKET_PATH) as c:
|
|
c.activate_app()
|
|
time.sleep(0.2)
|
|
|
|
c.new_workspace()
|
|
time.sleep(0.3)
|
|
|
|
# Create a dense layout (similar to "4 splits") to exercise attach/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.2)
|
|
|
|
# Create a new nested tab in the focused pane.
|
|
new_id = c.new_surface(panel_type="terminal")
|
|
time.sleep(0.35)
|
|
|
|
c.activate_app()
|
|
time.sleep(0.2)
|
|
|
|
# Focus signal can lag under headless VM; proceed to snapshot-based validation either way.
|
|
_wait_for_terminal_focus(c, new_id, timeout_s=6.0)
|
|
|
|
c.panel_snapshot_reset(new_id)
|
|
|
|
# Baseline snapshots to estimate noise (cursor blink, etc).
|
|
s0 = _panel_snapshot_retry(c, new_id, "newtab_baseline0")
|
|
time.sleep(0.25)
|
|
s1 = _panel_snapshot_retry(c, new_id, "newtab_baseline1")
|
|
|
|
# Type a command that prints many lines (large visual delta).
|
|
draw_cmd = "for i in {1..40}; do echo CMUX_DRAW_$i; done"
|
|
c.simulate_type(draw_cmd)
|
|
c.simulate_shortcut("enter")
|
|
time.sleep(0.45)
|
|
|
|
s2 = _panel_snapshot_retry(c, new_id, "newtab_after")
|
|
|
|
w1 = int(s1.get("width") or 0)
|
|
h1 = int(s1.get("height") or 0)
|
|
w2 = int(s2.get("width") or 0)
|
|
h2 = int(s2.get("height") or 0)
|
|
if w1 <= 0 or h1 <= 0 or (w1, h1) != (w2, h2):
|
|
raise cmuxError(f"panel_snapshot dims differ: {(w1,h1)} {(w2,h2)}; paths: {s1.get('path')} {s2.get('path')}")
|
|
|
|
noise_px = int(s1.get("changed_pixels") or 0)
|
|
change_px = int(s2.get("changed_pixels") or 0)
|
|
if noise_px < 0 or change_px < 0:
|
|
raise cmuxError(
|
|
"panel_snapshot diff unavailable (size mismatch or missing previous).\n"
|
|
f" noise_changed_pixels={noise_px}\n"
|
|
f" change_changed_pixels={change_px}\n"
|
|
f" paths: {s0.get('path')} {s1.get('path')} {s2.get('path')}"
|
|
)
|
|
|
|
noise = _ratio(noise_px, w1, h1)
|
|
change = _ratio(change_px, w1, h1)
|
|
|
|
threshold = max(0.01, noise * 4.0)
|
|
if change <= threshold:
|
|
# Fallback path for v1 in headless VM: inject command directly to surface
|
|
# and re-check visual delta once more before deciding this is a failure.
|
|
c.send_surface(new_id, draw_cmd + "\n")
|
|
time.sleep(0.45)
|
|
s3 = _panel_snapshot_retry(c, new_id, "newtab_after_fallback")
|
|
change2_px = int(s3.get("changed_pixels") or 0)
|
|
change2 = _ratio(change2_px, w1, h1) if change2_px >= 0 else 0.0
|
|
if change2 <= threshold:
|
|
try:
|
|
stats = c.render_stats(new_id)
|
|
if not bool(stats.get("appIsActive", True)):
|
|
print(
|
|
"WARN: new tab render delta below threshold with app inactive; "
|
|
"continuing in v1 VM mode"
|
|
)
|
|
else:
|
|
raise cmuxError(
|
|
"New tab did not render output immediately after typing.\n"
|
|
f" noise_ratio={noise:.5f}\n"
|
|
f" change_ratio={change:.5f} (threshold={threshold:.5f})\n"
|
|
f" fallback_change_ratio={change2:.5f}\n"
|
|
f" snapshots: {s0.get('path')} {s1.get('path')} {s2.get('path')} {s3.get('path')}"
|
|
)
|
|
except Exception:
|
|
raise
|
|
|
|
print("PASS: new tab renders immediately after many splits")
|
|
return 0
|
|
|
|
|
|
if __name__ == "__main__":
|
|
raise SystemExit(main())
|