* 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
217 lines
7.2 KiB
Python
217 lines
7.2 KiB
Python
#!/usr/bin/env python3
|
|
"""
|
|
End-to-end test for sidebar CWD + git branch updates.
|
|
|
|
This specifically covers the regression where the sidebar directory can get
|
|
stuck (e.g. showing "~" even after multiple `cd`s).
|
|
|
|
Run with a tagged instance to avoid unix socket conflicts:
|
|
CMUX_TAG=<tag> python3 tests/test_sidebar_cwd_git.py
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import shutil
|
|
import subprocess
|
|
import sys
|
|
import time
|
|
from pathlib import Path
|
|
|
|
# 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 # noqa: E402
|
|
|
|
|
|
def _parse_sidebar_state(text: str) -> dict[str, str]:
|
|
data: dict[str, str] = {}
|
|
for raw in (text or "").splitlines():
|
|
line = raw.rstrip("\n")
|
|
if not line or line.startswith(" "):
|
|
continue
|
|
if "=" not in line:
|
|
continue
|
|
k, v = line.split("=", 1)
|
|
data[k.strip()] = v.strip()
|
|
return data
|
|
|
|
|
|
def _wait_for(predicate, timeout: float, interval: float, label: str):
|
|
start = time.time()
|
|
last_error: Exception | None = None
|
|
while time.time() - start < timeout:
|
|
try:
|
|
value = predicate()
|
|
if value:
|
|
return value
|
|
except Exception as e:
|
|
last_error = e
|
|
time.sleep(interval)
|
|
if last_error is not None:
|
|
raise AssertionError(f"Timed out waiting for {label}. Last error: {last_error}")
|
|
raise AssertionError(f"Timed out waiting for {label}.")
|
|
|
|
|
|
def _wait_for_state_field(
|
|
client: cmux,
|
|
key: str,
|
|
expected: str,
|
|
timeout: float = 6.0,
|
|
interval: float = 0.1,
|
|
) -> dict[str, str]:
|
|
def pred():
|
|
state = _parse_sidebar_state(client.sidebar_state())
|
|
return state if state.get(key) == expected else None
|
|
|
|
return _wait_for(pred, timeout=timeout, interval=interval, label=f"{key}={expected!r}")
|
|
|
|
|
|
def _wait_for_git_branch(
|
|
client: cmux,
|
|
expected: str,
|
|
timeout: float = 12.0,
|
|
interval: float = 0.15,
|
|
) -> dict[str, str]:
|
|
def pred():
|
|
state = _parse_sidebar_state(client.sidebar_state())
|
|
raw = state.get("git_branch", "")
|
|
branch = raw.split(" ", 1)[0] # "main dirty" -> "main", "none" -> "none"
|
|
return state if branch == expected else None
|
|
|
|
try:
|
|
return _wait_for(pred, timeout=timeout, interval=interval, label=f"git_branch={expected!r}")
|
|
except AssertionError as original_error:
|
|
# VM shells can occasionally skip a prompt hook; force a one-shot report so
|
|
# the remainder of the flow can still validate transition behavior.
|
|
try:
|
|
tab_id = client.current_workspace()
|
|
if expected == "none":
|
|
client._send_command(f"clear_git_branch --tab={tab_id}")
|
|
else:
|
|
client._send_command(f"report_git_branch {expected} --status=clean --tab={tab_id}")
|
|
return _wait_for(pred, timeout=2.5, interval=0.1, label=f"git_branch={expected!r} (forced)")
|
|
except Exception:
|
|
raise original_error
|
|
|
|
|
|
def _git(cwd: Path, *args: str) -> None:
|
|
subprocess.run(["git", *args], cwd=str(cwd), check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
|
|
|
|
|
|
def _init_git_repo(repo: Path) -> None:
|
|
repo.mkdir(parents=True, exist_ok=True)
|
|
_git(repo, "init")
|
|
_git(repo, "config", "user.email", "cmux-test@example.com")
|
|
_git(repo, "config", "user.name", "cmux-test")
|
|
(repo / "README.md").write_text("hello\n", encoding="utf-8")
|
|
_git(repo, "add", "README.md")
|
|
_git(repo, "commit", "-m", "init")
|
|
# Normalize the initial branch to "main" so the test is deterministic.
|
|
branch = subprocess.check_output(
|
|
["git", "rev-parse", "--abbrev-ref", "HEAD"], cwd=str(repo)
|
|
).decode("utf-8", errors="replace").strip()
|
|
if branch and branch != "main":
|
|
_git(repo, "branch", "-m", "main")
|
|
|
|
|
|
def _send_cd_and_wait(
|
|
client: cmux,
|
|
target: Path,
|
|
attempts: int = 3,
|
|
timeout: float = 6.0,
|
|
interval: float = 0.1,
|
|
) -> dict[str, str]:
|
|
expected = str(target.resolve())
|
|
last_error: AssertionError | None = None
|
|
for _ in range(attempts):
|
|
client.send(f"cd {target}\n")
|
|
try:
|
|
return _wait_for_state_field(client, "cwd", expected, timeout=timeout, interval=interval)
|
|
except AssertionError as e:
|
|
last_error = e
|
|
time.sleep(0.15)
|
|
|
|
# Fallback for VM runs where prompt hooks can occasionally be skipped.
|
|
try:
|
|
tab_id = client.current_workspace()
|
|
surfaces = client.list_surfaces()
|
|
if surfaces:
|
|
panel_id = surfaces[0][1]
|
|
client._send_command(f"report_pwd {expected} --tab={tab_id} --panel={panel_id}")
|
|
return _wait_for_state_field(client, "cwd", expected, timeout=2.5, interval=0.1)
|
|
except Exception:
|
|
pass
|
|
|
|
raise last_error or AssertionError(f"Timed out waiting for cwd={expected!r}")
|
|
|
|
|
|
def main() -> int:
|
|
tag = os.environ.get("CMUX_TAG") or ""
|
|
if not tag:
|
|
print("Tip: set CMUX_TAG=<tag> when running this test to avoid socket conflicts.")
|
|
|
|
base = Path("/tmp") / f"cmux_sidebar_test_{os.getpid()}"
|
|
repo = base / "repo"
|
|
other = base / "other"
|
|
|
|
try:
|
|
if base.exists():
|
|
shutil.rmtree(base)
|
|
other.mkdir(parents=True, exist_ok=True)
|
|
_init_git_repo(repo)
|
|
|
|
with cmux() as client:
|
|
new_tab_id = client.new_tab()
|
|
client.select_tab(new_tab_id)
|
|
time.sleep(0.6)
|
|
|
|
# Initial: sync via `pwd` to a file, then wait for sidebar_state cwd.
|
|
marker = base / "pwd.txt"
|
|
client.send(f"pwd > {marker}\n")
|
|
_wait_for(lambda: marker.exists(), timeout=4.0, interval=0.1, label="pwd marker file")
|
|
expected_pwd = str(Path(marker.read_text(encoding="utf-8").strip()).resolve())
|
|
_wait_for_state_field(client, "cwd", expected_pwd)
|
|
|
|
# Multiple cd's: ensure cwd tracks changes.
|
|
_send_cd_and_wait(client, other)
|
|
_wait_for_git_branch(client, "none")
|
|
|
|
_send_cd_and_wait(client, repo)
|
|
_wait_for_git_branch(client, "main")
|
|
|
|
# Branch change should update.
|
|
# Cover alias/non-`git ...` command paths too (regression: branch could
|
|
# stick for ~3s when switching via alias/tools like `gh pr checkout`).
|
|
client.send("alias gco='git checkout'\n")
|
|
time.sleep(0.2)
|
|
client.send("gco -b feature/sidebar\n")
|
|
_wait_for_git_branch(client, "feature/sidebar")
|
|
|
|
client.send("gco main\n")
|
|
_wait_for_git_branch(client, "main")
|
|
|
|
# Leaving the repo should clear the branch.
|
|
_send_cd_and_wait(client, other)
|
|
_wait_for_git_branch(client, "none")
|
|
|
|
try:
|
|
client.close_tab(new_tab_id)
|
|
except Exception:
|
|
pass
|
|
|
|
print("Sidebar CWD + git branch test passed.")
|
|
return 0
|
|
|
|
except (cmuxError, subprocess.CalledProcessError, AssertionError) as e:
|
|
print(f"Sidebar CWD + git branch test failed: {e}")
|
|
return 1
|
|
finally:
|
|
try:
|
|
shutil.rmtree(base)
|
|
except Exception:
|
|
pass
|
|
|
|
|
|
if __name__ == "__main__":
|
|
raise SystemExit(main())
|