* 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
147 lines
5.1 KiB
Markdown
147 lines
5.1 KiB
Markdown
# V2 Socket API + Test Migration
|
|
|
|
This doc tracks the migration from the existing v1 line protocol (space-delimited commands) to a v2 JSON protocol intended for LLM agents.
|
|
|
|
## Goals
|
|
|
|
- Add a **v2 JSON socket protocol** (handle-based: `window_id`, `workspace_id`, `pane_id`, `surface_id`).
|
|
- Keep **v1 fully working** until v2 reaches feature parity.
|
|
- Re-implement the existing automated test suite to use **v2**.
|
|
- Run both suites:
|
|
- v1 tests (existing `tests/`)
|
|
- v2 tests (new `tests_v2/`)
|
|
|
|
## Non-Goals (for initial parity)
|
|
|
|
- Removing v1.
|
|
- Changing existing v1 behaviors/output formats.
|
|
|
|
## Status
|
|
|
|
- [x] Implement v2 request/response envelope (JSON, newline-delimited)
|
|
- [x] Implement v2 core methods (workspaces/surfaces/panes/input/notifications/browser)
|
|
- [x] Implement v2 multi-window methods (windows + cross-window workspace moves)
|
|
- [x] Add `surface.trigger_flash` (agent-visible highlight for a surface)
|
|
- [x] Implement v2 debug/test methods (simulate typing, render stats, screenshots, etc.)
|
|
- [x] Add `tests_v2/` using v2 client
|
|
- [x] Add runners for v1 + v2 suites on the VM (`./scripts/run-tests-v1.sh`, `./scripts/run-tests-v2.sh`)
|
|
- [x] Verify v1 suite passes (VM)
|
|
- [x] Verify v2 suite passes (VM)
|
|
|
|
Notes:
|
|
- A close-top nested split sequence (T-shape) could leave terminal views detached from the window until the user switched workspaces.
|
|
Fix: a debounced post-close reattach pass (see `Sources/Workspace.swift`, `Sources/Panels/TerminalPanel.swift`).
|
|
|
|
## V2 Protocol Sketch
|
|
|
|
Each request is one JSON object per line:
|
|
|
|
```json
|
|
{"id":"1","method":"workspace.list","params":{}}
|
|
```
|
|
|
|
Each response is one JSON object per line:
|
|
|
|
```json
|
|
{"id":"1","ok":true,"result":{...}}
|
|
```
|
|
|
|
Errors:
|
|
|
|
```json
|
|
{"id":"1","ok":false,"error":{"code":"not_found","message":"workspace not found"}}
|
|
```
|
|
|
|
Notes:
|
|
- `id` is echoed back when present (string or number).
|
|
- v2 methods should accept **IDs**; v2 responses may include ephemeral `index` fields for ordering/debugging, but IDs are the stable handles.
|
|
|
|
## Method Parity Checklist (v1 -> v2)
|
|
|
|
Windows:
|
|
- [x] list_windows -> `window.list`
|
|
- [x] current_window -> `window.current`
|
|
- [x] focus_window -> `window.focus`
|
|
- [x] new_window -> `window.create`
|
|
- [x] close_window -> `window.close`
|
|
- [x] move_workspace_to_window -> `workspace.move_to_window`
|
|
|
|
Workspaces:
|
|
- [x] list_workspaces -> `workspace.list`
|
|
- [x] new_workspace -> `workspace.create`
|
|
- [x] select_workspace -> `workspace.select`
|
|
- [x] current_workspace -> `workspace.current`
|
|
- [x] close_workspace -> `workspace.close`
|
|
|
|
Surfaces / Splits:
|
|
- [x] list_surfaces -> `surface.list`
|
|
- [x] focus_surface / focus_surface_by_panel -> `surface.focus`
|
|
- [x] new_split -> `surface.split`
|
|
- [x] new_surface -> `surface.create`
|
|
- [x] close_surface -> `surface.close`
|
|
- [x] drag_surface_to_split -> `surface.drag_to_split`
|
|
- [x] refresh_surfaces -> `surface.refresh`
|
|
- [x] surface_health -> `surface.health`
|
|
- [x] trigger_flash -> `surface.trigger_flash` (new in v2)
|
|
|
|
Panes:
|
|
- [x] list_panes -> `pane.list`
|
|
- [x] focus_pane -> `pane.focus`
|
|
- [x] list_pane_surfaces -> `pane.surfaces`
|
|
- [x] new_pane -> `pane.create`
|
|
|
|
Input:
|
|
- [x] send / send_surface -> `surface.send_text`
|
|
- [x] send_key / send_key_surface -> `surface.send_key`
|
|
|
|
Notifications:
|
|
- [x] notify -> `notification.create`
|
|
- [x] notify_surface -> `notification.create_for_surface`
|
|
- [x] notify_target -> `notification.create_for_target`
|
|
- [x] list_notifications -> `notification.list`
|
|
- [x] clear_notifications -> `notification.clear`
|
|
- [x] set_app_focus -> `app.focus_override.set`
|
|
- [x] simulate_app_active -> `app.simulate_active`
|
|
|
|
Browser:
|
|
- [x] open_browser -> `browser.open_split`
|
|
- [x] navigate -> `browser.navigate`
|
|
- [x] browser_back -> `browser.back`
|
|
- [x] browser_forward -> `browser.forward`
|
|
- [x] browser_reload -> `browser.reload`
|
|
- [x] get_url -> `browser.url.get`
|
|
- [x] focus_webview -> `browser.focus_webview`
|
|
- [x] is_webview_focused -> `browser.is_webview_focused`
|
|
|
|
Debug / Test-only:
|
|
- [x] set_shortcut -> `debug.shortcut.set`
|
|
- [x] simulate_shortcut -> `debug.shortcut.simulate`
|
|
- [x] simulate_type -> `debug.type`
|
|
- [x] activate_app -> `debug.app.activate`
|
|
- [x] is_terminal_focused -> `debug.terminal.is_focused`
|
|
- [x] read_terminal_text -> `debug.terminal.read_text`
|
|
- [x] render_stats -> `debug.terminal.render_stats`
|
|
- [x] layout_debug -> `debug.layout`
|
|
- [x] bonsplit_underflow_count/reset -> `debug.bonsplit_underflow.*`
|
|
- [x] empty_panel_count/reset -> `debug.empty_panel.*`
|
|
- [x] focus_notification -> `debug.notification.focus`
|
|
- [x] flash_count/reset -> `debug.flash.*`
|
|
- [x] panel_snapshot/panel_snapshot_reset -> `debug.panel_snapshot.*`
|
|
- [x] screenshot -> `debug.window.screenshot`
|
|
|
|
## Test Migration
|
|
|
|
v1 suite stays in `tests/`.
|
|
|
|
v2 suite lives in `tests_v2/` and should:
|
|
- use a v2 JSON client (`tests_v2/cmux.py`)
|
|
- avoid depending on v1 text output formats
|
|
|
|
VM runners:
|
|
- v1: `ssh cmux-vm 'cd /Users/cmux/GhosttyTabs && ./scripts/run-tests-v1.sh'`
|
|
- v2: `ssh cmux-vm 'cd /Users/cmux/GhosttyTabs && ./scripts/run-tests-v2.sh'`
|
|
|
|
## Open Questions
|
|
|
|
- Should v2 require explicit `workspace_id`/`surface_id` for all operations, or default to the currently-focused ones?
|
|
- For move/reorder operations (future): what are the policies for empty workspaces/windows?
|