50f0dd334d
* 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
291 lines
8.1 KiB
Python
291 lines
8.1 KiB
Python
#!/usr/bin/env python3
|
|
"""
|
|
Manual visual report: terminal caret blink + single-character typing visibility.
|
|
|
|
This generates a self-contained HTML report (base64-embedded PNGs) so you can
|
|
open it locally and visually confirm:
|
|
1) The caret is blinking (or not).
|
|
2) A single typed character appears immediately (before Enter / focus toggle).
|
|
|
|
Usage:
|
|
python3 tests/test_terminal_input_render_report.py
|
|
# Then open: tests/terminal_input_report.html
|
|
|
|
Environment:
|
|
CMUX_SOCKET or CMUX_SOCKET_PATH can override the socket path.
|
|
"""
|
|
|
|
import base64
|
|
import json
|
|
import os
|
|
import sys
|
|
import time
|
|
from dataclasses import dataclass
|
|
from datetime import datetime
|
|
from pathlib import Path
|
|
from typing import Optional
|
|
|
|
sys.path.insert(0, str(Path(__file__).parent))
|
|
from cmux import cmux, cmuxError
|
|
|
|
|
|
SOCKET_PATH = os.environ.get("CMUX_SOCKET") or os.environ.get("CMUX_SOCKET_PATH") or "/tmp/cmux-debug.sock"
|
|
HTML_REPORT = Path(__file__).parent / "terminal_input_report.html"
|
|
|
|
|
|
@dataclass
|
|
class Shot:
|
|
path: Path
|
|
label: str
|
|
changed_pixels: int
|
|
|
|
def to_base64(self) -> str:
|
|
return base64.b64encode(self.path.read_bytes()).decode("utf-8")
|
|
|
|
|
|
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 _focused_panel_id(c: cmux) -> str:
|
|
surfaces = c.list_surfaces()
|
|
if not surfaces:
|
|
raise cmuxError("Expected at least 1 surface")
|
|
return next((sid for _i, sid, focused in surfaces if focused), surfaces[0][1])
|
|
|
|
|
|
def _snap_panel(c: cmux, panel_id: str, label: str) -> Shot:
|
|
info = c.panel_snapshot(panel_id, label)
|
|
return Shot(
|
|
path=Path(info["path"]),
|
|
label=label,
|
|
changed_pixels=int(info["changed_pixels"]),
|
|
)
|
|
|
|
|
|
def _panel_sequence_blink_and_type(c: cmux, panel_id: str, prefix: str, typed_char: str = "x") -> tuple[list[Shot], dict]:
|
|
shots: list[Shot] = []
|
|
|
|
# Keep the app key/active while we probe focus + rendering; on a host machine the
|
|
# terminal running this script can steal focus mid-sequence.
|
|
c.activate_app()
|
|
time.sleep(0.15)
|
|
|
|
_wait_for(lambda: c.is_terminal_focused(panel_id), timeout_s=3.0)
|
|
stats0 = c.render_stats(panel_id)
|
|
|
|
# Blink probe: capture a few frames over ~1.3s
|
|
c.panel_snapshot_reset(panel_id)
|
|
shots.append(_snap_panel(c, panel_id, f"{prefix}_blink_0"))
|
|
time.sleep(0.65)
|
|
shots.append(_snap_panel(c, panel_id, f"{prefix}_blink_1"))
|
|
time.sleep(0.65)
|
|
shots.append(_snap_panel(c, panel_id, f"{prefix}_blink_2"))
|
|
|
|
# Type probe: before, after typing a single char, after Enter.
|
|
c.panel_snapshot_reset(panel_id)
|
|
shots.append(_snap_panel(c, panel_id, f"{prefix}_type_before"))
|
|
# Use keyDown path (not insertText) to match real typing.
|
|
c.simulate_shortcut(typed_char)
|
|
time.sleep(0.2)
|
|
shots.append(_snap_panel(c, panel_id, f"{prefix}_type_after_char_{ord(typed_char)}"))
|
|
c.simulate_shortcut("enter")
|
|
time.sleep(0.35)
|
|
shots.append(_snap_panel(c, panel_id, f"{prefix}_type_after_enter"))
|
|
|
|
# Grab stats after, for debugging.
|
|
stats1 = c.render_stats(panel_id)
|
|
meta = {
|
|
"panel_id": panel_id,
|
|
"render_stats_before": stats0,
|
|
"render_stats_after": stats1,
|
|
}
|
|
return shots, meta
|
|
|
|
|
|
def _write_report(cases: list[dict]) -> None:
|
|
generated = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S UTC")
|
|
|
|
def esc(s: str) -> str:
|
|
return (
|
|
s.replace("&", "&")
|
|
.replace("<", "<")
|
|
.replace(">", ">")
|
|
.replace('"', """)
|
|
)
|
|
|
|
html = f"""<!DOCTYPE html>
|
|
<html>
|
|
<head>
|
|
<meta charset="utf-8" />
|
|
<title>cmux terminal input render report</title>
|
|
<style>
|
|
:root {{
|
|
--bg: #0b0f14;
|
|
--panel: #111826;
|
|
--border: rgba(255,255,255,0.08);
|
|
--text: rgba(255,255,255,0.92);
|
|
--muted: rgba(255,255,255,0.68);
|
|
--mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
|
|
}}
|
|
body {{
|
|
margin: 0;
|
|
padding: 24px;
|
|
background: var(--bg);
|
|
color: var(--text);
|
|
font: 14px/1.45 -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
|
|
}}
|
|
h1 {{
|
|
margin: 0 0 6px 0;
|
|
font-size: 18px;
|
|
letter-spacing: 0.2px;
|
|
}}
|
|
.meta {{
|
|
color: var(--muted);
|
|
font-family: var(--mono);
|
|
font-size: 12px;
|
|
margin-bottom: 18px;
|
|
}}
|
|
.case {{
|
|
border: 1px solid var(--border);
|
|
background: rgba(255,255,255,0.03);
|
|
border-radius: 12px;
|
|
padding: 14px 14px 10px 14px;
|
|
margin: 14px 0;
|
|
}}
|
|
.case h2 {{
|
|
font-size: 15px;
|
|
margin: 0 0 6px 0;
|
|
}}
|
|
.desc {{
|
|
color: var(--muted);
|
|
margin: 0 0 10px 0;
|
|
}}
|
|
.shots {{
|
|
display: grid;
|
|
grid-template-columns: repeat(auto-fit, minmax(320px, 1fr));
|
|
gap: 12px;
|
|
align-items: start;
|
|
}}
|
|
figure {{
|
|
margin: 0;
|
|
padding: 10px;
|
|
border: 1px solid var(--border);
|
|
background: rgba(0,0,0,0.18);
|
|
border-radius: 10px;
|
|
}}
|
|
figcaption {{
|
|
margin: 0 0 8px 0;
|
|
font-family: var(--mono);
|
|
font-size: 12px;
|
|
color: var(--muted);
|
|
}}
|
|
img {{
|
|
width: 100%;
|
|
height: auto;
|
|
border-radius: 8px;
|
|
border: 1px solid rgba(255,255,255,0.06);
|
|
background: #000;
|
|
}}
|
|
pre {{
|
|
margin: 10px 0 0 0;
|
|
padding: 10px;
|
|
border: 1px solid var(--border);
|
|
background: rgba(0,0,0,0.25);
|
|
border-radius: 10px;
|
|
overflow: auto;
|
|
font-size: 12px;
|
|
line-height: 1.35;
|
|
font-family: var(--mono);
|
|
color: rgba(255,255,255,0.85);
|
|
}}
|
|
</style>
|
|
</head>
|
|
<body>
|
|
<h1>cmux terminal input render report</h1>
|
|
<div class="meta">generated: {esc(generated)} | socket: {esc(SOCKET_PATH)}</div>
|
|
"""
|
|
|
|
for case in cases:
|
|
html += f"""
|
|
<div class="case">
|
|
<h2>{esc(case["name"])}</h2>
|
|
<div class="desc">{esc(case["description"])}</div>
|
|
<div class="shots">
|
|
"""
|
|
for shot in case["shots"]:
|
|
label = f'{shot.label} | changed_pixels={shot.changed_pixels}'
|
|
html += f"""
|
|
<figure>
|
|
<figcaption>{esc(label)}</figcaption>
|
|
<img src="data:image/png;base64,{shot.to_base64()}" alt="{esc(shot.label)}" />
|
|
</figure>
|
|
"""
|
|
html += f"""
|
|
</div>
|
|
<pre>{esc(json.dumps(case.get("meta", {}), indent=2))}</pre>
|
|
</div>
|
|
"""
|
|
|
|
html += """
|
|
</body>
|
|
</html>
|
|
"""
|
|
HTML_REPORT.write_text(html)
|
|
|
|
|
|
def main() -> int:
|
|
cases: list[dict] = []
|
|
|
|
with cmux(SOCKET_PATH) as c:
|
|
c.activate_app()
|
|
time.sleep(0.25)
|
|
|
|
# Case 1: fresh workspace, initial terminal
|
|
ws_id = c.new_workspace()
|
|
c.select_workspace(ws_id)
|
|
time.sleep(0.35)
|
|
|
|
panel0 = _focused_panel_id(c)
|
|
shots0, meta0 = _panel_sequence_blink_and_type(c, panel0, "initial", typed_char="a")
|
|
cases.append(
|
|
{
|
|
"name": "Initial Terminal (Fresh Workspace)",
|
|
"description": "Caret blink probe + type a single character, then Enter.",
|
|
"shots": shots0,
|
|
"meta": meta0,
|
|
}
|
|
)
|
|
|
|
# Case 2: after split churn + new surface in a split
|
|
for _ in range(4):
|
|
c.new_split("right")
|
|
time.sleep(0.7)
|
|
|
|
new_id = c.new_surface(panel_type="terminal")
|
|
time.sleep(0.5)
|
|
# new_surface doesn't always steal focus (depends on split state); ensure we test the right panel.
|
|
c.focus_surface(new_id)
|
|
time.sleep(0.25)
|
|
shots1, meta1 = _panel_sequence_blink_and_type(c, new_id, "after_splits", typed_char="b")
|
|
cases.append(
|
|
{
|
|
"name": "After 4 Right Splits + New Surface",
|
|
"description": "Repro-oriented: split churn then create a new terminal surface; verify caret + typing.",
|
|
"shots": shots1,
|
|
"meta": meta1,
|
|
}
|
|
)
|
|
|
|
_write_report(cases)
|
|
print(f"Wrote report: {HTML_REPORT}")
|
|
return 0
|
|
|
|
|
|
if __name__ == "__main__":
|
|
raise SystemExit(main())
|