* 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
402 lines
13 KiB
Swift
402 lines
13 KiB
Swift
import AppKit
|
|
import SwiftUI
|
|
import Sparkle
|
|
|
|
/// Popover view that displays detailed update information and actions.
|
|
struct UpdatePopoverView: View {
|
|
@ObservedObject var model: UpdateViewModel
|
|
@Environment(\.dismiss) private var dismiss
|
|
|
|
var body: some View {
|
|
VStack(alignment: .leading, spacing: 0) {
|
|
switch model.effectiveState {
|
|
case .idle:
|
|
EmptyView()
|
|
|
|
case .permissionRequest(let request):
|
|
PermissionRequestView(request: request, dismiss: dismiss)
|
|
|
|
case .checking(let checking):
|
|
CheckingView(checking: checking, dismiss: dismiss)
|
|
|
|
case .updateAvailable(let update):
|
|
UpdateAvailableView(update: update, dismiss: dismiss)
|
|
|
|
case .downloading(let download):
|
|
DownloadingView(download: download, dismiss: dismiss)
|
|
|
|
case .extracting(let extracting):
|
|
ExtractingView(extracting: extracting)
|
|
|
|
case .installing(let installing):
|
|
InstallingView(installing: installing, dismiss: dismiss)
|
|
|
|
case .notFound(let notFound):
|
|
NotFoundView(notFound: notFound, dismiss: dismiss)
|
|
|
|
case .error(let error):
|
|
UpdateErrorView(error: error, dismiss: dismiss)
|
|
}
|
|
}
|
|
.frame(width: 300)
|
|
}
|
|
}
|
|
|
|
fileprivate struct PermissionRequestView: View {
|
|
let request: UpdateState.PermissionRequest
|
|
let dismiss: DismissAction
|
|
|
|
var body: some View {
|
|
VStack(alignment: .leading, spacing: 16) {
|
|
VStack(alignment: .leading, spacing: 8) {
|
|
Text("Enable automatic updates?")
|
|
.font(.system(size: 13, weight: .semibold))
|
|
|
|
Text("cmux can automatically check for updates in the background.")
|
|
.font(.system(size: 11))
|
|
.foregroundColor(.secondary)
|
|
.fixedSize(horizontal: false, vertical: true)
|
|
}
|
|
|
|
HStack(spacing: 8) {
|
|
Button("Not Now") {
|
|
request.reply(SUUpdatePermissionResponse(
|
|
automaticUpdateChecks: false,
|
|
sendSystemProfile: false))
|
|
dismiss()
|
|
}
|
|
.keyboardShortcut(.cancelAction)
|
|
|
|
Spacer()
|
|
|
|
Button("Allow") {
|
|
request.reply(SUUpdatePermissionResponse(
|
|
automaticUpdateChecks: true,
|
|
sendSystemProfile: false))
|
|
dismiss()
|
|
}
|
|
.keyboardShortcut(.defaultAction)
|
|
.buttonStyle(.borderedProminent)
|
|
}
|
|
}
|
|
.padding(16)
|
|
}
|
|
}
|
|
|
|
fileprivate struct CheckingView: View {
|
|
let checking: UpdateState.Checking
|
|
let dismiss: DismissAction
|
|
|
|
var body: some View {
|
|
VStack(alignment: .leading, spacing: 16) {
|
|
HStack(spacing: 10) {
|
|
ProgressView()
|
|
.controlSize(.small)
|
|
Text("Checking for updates…")
|
|
.font(.system(size: 13))
|
|
}
|
|
|
|
HStack {
|
|
Spacer()
|
|
Button("Cancel") {
|
|
checking.cancel()
|
|
dismiss()
|
|
}
|
|
.keyboardShortcut(.cancelAction)
|
|
.controlSize(.small)
|
|
}
|
|
}
|
|
.padding(16)
|
|
}
|
|
}
|
|
|
|
fileprivate struct UpdateAvailableView: View {
|
|
let update: UpdateState.UpdateAvailable
|
|
let dismiss: DismissAction
|
|
|
|
private let labelWidth: CGFloat = 60
|
|
|
|
var body: some View {
|
|
VStack(alignment: .leading, spacing: 0) {
|
|
VStack(alignment: .leading, spacing: 12) {
|
|
VStack(alignment: .leading, spacing: 8) {
|
|
Text("Update Available")
|
|
.font(.system(size: 13, weight: .semibold))
|
|
|
|
VStack(alignment: .leading, spacing: 4) {
|
|
HStack(spacing: 6) {
|
|
Text("Version:")
|
|
.foregroundColor(.secondary)
|
|
.frame(width: labelWidth, alignment: .trailing)
|
|
Text(update.appcastItem.displayVersionString)
|
|
}
|
|
.font(.system(size: 11))
|
|
|
|
if update.appcastItem.contentLength > 0 {
|
|
HStack(spacing: 6) {
|
|
Text("Size:")
|
|
.foregroundColor(.secondary)
|
|
.frame(width: labelWidth, alignment: .trailing)
|
|
Text(ByteCountFormatter.string(fromByteCount: Int64(update.appcastItem.contentLength), countStyle: .file))
|
|
}
|
|
.font(.system(size: 11))
|
|
}
|
|
|
|
if let date = update.appcastItem.date {
|
|
HStack(spacing: 6) {
|
|
Text("Released:")
|
|
.foregroundColor(.secondary)
|
|
.frame(width: labelWidth, alignment: .trailing)
|
|
Text(date.formatted(date: .abbreviated, time: .omitted))
|
|
}
|
|
.font(.system(size: 11))
|
|
}
|
|
}
|
|
.textSelection(.enabled)
|
|
}
|
|
|
|
HStack(spacing: 8) {
|
|
Button("Skip") {
|
|
update.reply(.skip)
|
|
dismiss()
|
|
}
|
|
.controlSize(.small)
|
|
|
|
Button("Later") {
|
|
update.reply(.dismiss)
|
|
dismiss()
|
|
}
|
|
.controlSize(.small)
|
|
.keyboardShortcut(.cancelAction)
|
|
|
|
Spacer()
|
|
|
|
Button("Install and Relaunch") {
|
|
update.reply(.install)
|
|
dismiss()
|
|
}
|
|
.keyboardShortcut(.defaultAction)
|
|
.buttonStyle(.borderedProminent)
|
|
.controlSize(.small)
|
|
}
|
|
}
|
|
.padding(16)
|
|
|
|
if let notes = update.releaseNotes {
|
|
Divider()
|
|
|
|
Link(destination: notes.url) {
|
|
HStack {
|
|
Image(systemName: "doc.text")
|
|
.font(.system(size: 11))
|
|
Text(notes.label)
|
|
.font(.system(size: 11, weight: .medium))
|
|
Spacer()
|
|
Image(systemName: "arrow.up.right")
|
|
.font(.system(size: 10))
|
|
}
|
|
.foregroundColor(.primary)
|
|
.padding(12)
|
|
.frame(maxWidth: .infinity)
|
|
.background(Color(nsColor: .controlBackgroundColor))
|
|
.contentShape(Rectangle())
|
|
}
|
|
.buttonStyle(.plain)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fileprivate struct DownloadingView: View {
|
|
let download: UpdateState.Downloading
|
|
let dismiss: DismissAction
|
|
|
|
var body: some View {
|
|
VStack(alignment: .leading, spacing: 16) {
|
|
VStack(alignment: .leading, spacing: 8) {
|
|
Text("Downloading Update")
|
|
.font(.system(size: 13, weight: .semibold))
|
|
|
|
if let expectedLength = download.expectedLength, expectedLength > 0 {
|
|
let progress = min(1, max(0, Double(download.progress) / Double(expectedLength)))
|
|
VStack(alignment: .leading, spacing: 6) {
|
|
ProgressView(value: progress)
|
|
Text(String(format: "%.0f%%", progress * 100))
|
|
.font(.system(size: 11))
|
|
.foregroundColor(.secondary)
|
|
}
|
|
} else {
|
|
ProgressView()
|
|
.controlSize(.small)
|
|
}
|
|
}
|
|
|
|
HStack {
|
|
Spacer()
|
|
Button("Cancel") {
|
|
download.cancel()
|
|
dismiss()
|
|
}
|
|
.keyboardShortcut(.cancelAction)
|
|
.controlSize(.small)
|
|
}
|
|
}
|
|
.padding(16)
|
|
}
|
|
}
|
|
|
|
fileprivate struct ExtractingView: View {
|
|
let extracting: UpdateState.Extracting
|
|
|
|
var body: some View {
|
|
VStack(alignment: .leading, spacing: 8) {
|
|
Text("Preparing Update")
|
|
.font(.system(size: 13, weight: .semibold))
|
|
|
|
VStack(alignment: .leading, spacing: 6) {
|
|
ProgressView(value: min(1, max(0, extracting.progress)), total: 1.0)
|
|
Text(String(format: "%.0f%%", min(1, max(0, extracting.progress)) * 100))
|
|
.font(.system(size: 11))
|
|
.foregroundColor(.secondary)
|
|
}
|
|
}
|
|
.padding(16)
|
|
}
|
|
}
|
|
|
|
fileprivate struct InstallingView: View {
|
|
let installing: UpdateState.Installing
|
|
let dismiss: DismissAction
|
|
|
|
var body: some View {
|
|
VStack(alignment: .leading, spacing: 16) {
|
|
VStack(alignment: .leading, spacing: 8) {
|
|
Text("Restart Required")
|
|
.font(.system(size: 13, weight: .semibold))
|
|
|
|
Text("The update is ready. Please restart the application to complete the installation.")
|
|
.font(.system(size: 11))
|
|
.foregroundColor(.secondary)
|
|
.fixedSize(horizontal: false, vertical: true)
|
|
}
|
|
|
|
HStack {
|
|
Button("Restart Later") {
|
|
installing.dismiss()
|
|
dismiss()
|
|
}
|
|
.keyboardShortcut(.cancelAction)
|
|
.controlSize(.small)
|
|
|
|
Spacer()
|
|
|
|
Button("Restart Now") {
|
|
installing.retryTerminatingApplication()
|
|
dismiss()
|
|
}
|
|
.keyboardShortcut(.defaultAction)
|
|
.buttonStyle(.borderedProminent)
|
|
.controlSize(.small)
|
|
}
|
|
}
|
|
.padding(16)
|
|
}
|
|
}
|
|
|
|
fileprivate struct NotFoundView: View {
|
|
let notFound: UpdateState.NotFound
|
|
let dismiss: DismissAction
|
|
|
|
var body: some View {
|
|
VStack(alignment: .leading, spacing: 16) {
|
|
VStack(alignment: .leading, spacing: 8) {
|
|
Text("No Updates Found")
|
|
.font(.system(size: 13, weight: .semibold))
|
|
|
|
Text("You're already running the latest version.")
|
|
.font(.system(size: 11))
|
|
.foregroundColor(.secondary)
|
|
.fixedSize(horizontal: false, vertical: true)
|
|
}
|
|
|
|
HStack {
|
|
Spacer()
|
|
Button("OK") {
|
|
notFound.acknowledgement()
|
|
dismiss()
|
|
}
|
|
.keyboardShortcut(.defaultAction)
|
|
.controlSize(.small)
|
|
}
|
|
}
|
|
.padding(16)
|
|
}
|
|
}
|
|
|
|
fileprivate struct UpdateErrorView: View {
|
|
let error: UpdateState.Error
|
|
let dismiss: DismissAction
|
|
|
|
var body: some View {
|
|
let title = UpdateViewModel.userFacingErrorTitle(for: error.error)
|
|
let message = UpdateViewModel.userFacingErrorMessage(for: error.error)
|
|
let details = UpdateViewModel.errorDetails(
|
|
for: error.error,
|
|
technicalDetails: error.technicalDetails,
|
|
feedURLString: error.feedURLString
|
|
)
|
|
|
|
VStack(alignment: .leading, spacing: 16) {
|
|
VStack(alignment: .leading, spacing: 8) {
|
|
HStack(spacing: 8) {
|
|
Image(systemName: "exclamationmark.triangle.fill")
|
|
.foregroundColor(.orange)
|
|
.font(.system(size: 13))
|
|
Text(title)
|
|
.font(.system(size: 13, weight: .semibold))
|
|
}
|
|
|
|
Text(message)
|
|
.font(.system(size: 11))
|
|
.foregroundColor(.secondary)
|
|
.fixedSize(horizontal: false, vertical: true)
|
|
}
|
|
|
|
VStack(alignment: .leading, spacing: 6) {
|
|
Text("Details")
|
|
.font(.system(size: 11, weight: .semibold))
|
|
Text(details)
|
|
.font(.system(size: 10, design: .monospaced))
|
|
.foregroundColor(.secondary)
|
|
.fixedSize(horizontal: false, vertical: true)
|
|
.textSelection(.enabled)
|
|
}
|
|
|
|
HStack(spacing: 8) {
|
|
Button("Copy Details") {
|
|
let pasteboard = NSPasteboard.general
|
|
pasteboard.clearContents()
|
|
pasteboard.setString(details, forType: .string)
|
|
}
|
|
.controlSize(.small)
|
|
|
|
Button("OK") {
|
|
error.dismiss()
|
|
dismiss()
|
|
}
|
|
.keyboardShortcut(.cancelAction)
|
|
.controlSize(.small)
|
|
|
|
Spacer()
|
|
|
|
Button("Retry") {
|
|
error.retry()
|
|
dismiss()
|
|
}
|
|
.keyboardShortcut(.defaultAction)
|
|
.controlSize(.small)
|
|
}
|
|
}
|
|
.padding(16)
|
|
}
|
|
}
|