Sync ghostty fork with upstream main

.github/workflows/test-e2e.yml

@@ -48,16 +48,14 @@ jobs:
       - name: Select Xcode
         run: |
           set -euo pipefail
-          if [ -d "/Applications/Xcode.app/Contents/Developer" ]; then
+          if compgen -G "/Applications/Xcode_*.app" >/dev/null 2>&1; then
+            XCODE_APP="$(ls -d /Applications/Xcode_*.app 2>/dev/null | sort -V | tail -n 1)"
+            XCODE_DIR="$XCODE_APP/Contents/Developer"
+          elif [ -d "/Applications/Xcode.app/Contents/Developer" ]; then
             XCODE_DIR="/Applications/Xcode.app/Contents/Developer"
           else
-            XCODE_APP="$(ls -d /Applications/Xcode*.app 2>/dev/null | head -n 1 || true)"
-            if [ -n "$XCODE_APP" ]; then
-              XCODE_DIR="$XCODE_APP/Contents/Developer"
-            else
-              echo "No Xcode.app found under /Applications" >&2
-              exit 1
-            fi
+            echo "No Xcode.app found under /Applications" >&2
+            exit 1
           fi
           echo "DEVELOPER_DIR=$XCODE_DIR" >> "$GITHUB_ENV"
           export DEVELOPER_DIR="$XCODE_DIR"
@@ -217,9 +215,7 @@ jobs:
             clang -framework Foundation -framework CoreGraphics \
               -o "$HELPER_PATH" scripts/create-virtual-display.m
 
-            cat >"$MANIFEST_PATH" <<EOF
-            {"helperBinaryPath":"$HELPER_PATH"}
-            EOF
+            printf '{"helperBinaryPath":"%s"}\n' "$HELPER_PATH" >"$MANIFEST_PATH"
           fi
 
           # Start recording right before the test (after build/resolve).

Sources/AppDelegate.swift

@@ -1769,15 +1769,18 @@ func startOrFocusTerminalSearch(
         return true
     }
 
+    terminalSurface.requestGhosttySearchActivation(.startSearch)
     if terminalSurface.performBindingAction("start_search") {
-        DispatchQueue.main.async { [weak terminalSurface] in
-            guard let terminalSurface, terminalSurface.searchState == nil else { return }
-            terminalSurface.searchState = TerminalSurface.SearchState()
-            searchFocusNotifier(terminalSurface)
+        DispatchQueue.main.async {
+            cmuxApplyPendingGhosttyStartSearchFallbackIfNeeded(
+                terminalSurface,
+                searchFocusNotifier: searchFocusNotifier
+            )
         }
         return true
     }
 
+    terminalSurface.clearGhosttySearchActivationRequest()
     terminalSurface.searchState = TerminalSurface.SearchState()
     searchFocusNotifier(terminalSurface)
     return true

Sources/ContentView.swift

@@ -320,6 +320,44 @@ struct TitlebarLayerBackground: NSViewRepresentable {
     }
 }
 
+func cmuxMainWindowTitlebarOpacity(
+    backgroundOpacity: Double
+) -> CGFloat {
+    GhosttyBackgroundTheme.compositedChromeOpacity(backgroundOpacity)
+}
+
+func cmuxResolveGhosttyChromeConfig(
+    loadedConfig: GhosttyConfig,
+    runtimeBackgroundColor: NSColor,
+    runtimeBackgroundOpacity: Double
+) -> GhosttyConfig {
+    let runtimeOpacity = GhosttyBackgroundTheme.clampedOpacity(runtimeBackgroundOpacity)
+    let loadedOpacity = GhosttyBackgroundTheme.clampedOpacity(loadedConfig.backgroundOpacity)
+
+    // Newer Ghostty builds can drive the window background fully clear at runtime for
+    // translucent terminals. That clear backing color should not replace cmux chrome.
+    guard runtimeOpacity > 0.001 || loadedOpacity <= 0.001 else {
+        return loadedConfig
+    }
+
+    var resolved = loadedConfig
+    resolved.backgroundColor = runtimeBackgroundColor
+    resolved.backgroundOpacity = runtimeBackgroundOpacity
+    return resolved
+}
+
+func cmuxResolveGhosttyChromeConfig(
+    loadConfig: () -> GhosttyConfig = { GhosttyConfig.load() },
+    runtimeBackgroundColor: () -> NSColor = { GhosttyApp.shared.defaultBackgroundColor },
+    runtimeBackgroundOpacity: () -> Double = { GhosttyApp.shared.defaultBackgroundOpacity }
+) -> GhosttyConfig {
+    cmuxResolveGhosttyChromeConfig(
+        loadedConfig: loadConfig(),
+        runtimeBackgroundColor: runtimeBackgroundColor(),
+        runtimeBackgroundOpacity: runtimeBackgroundOpacity()
+    )
+}
+
 final class SidebarState: ObservableObject {
     @Published var isVisible: Bool
     @Published var persistedWidth: CGFloat
@@ -1457,6 +1495,7 @@ struct ContentView: View {
     @State private var workspaceHandoffFallbackTask: Task<Void, Never>?
     @State private var didApplyUITestSidebarSelection = false
     @State private var titlebarThemeGeneration: UInt64 = 0
+    @State private var titlebarThemeConfig = cmuxResolveGhosttyChromeConfig()
     @State private var sidebarDraggedTabId: UUID?
     @State private var titlebarTextUpdateCoalescer = NotificationBurstCoalescer(delay: 1.0 / 30.0)
     @State private var sidebarResizerCursorReleaseWorkItem: DispatchWorkItem?
@@ -2183,8 +2222,7 @@ struct ContentView: View {
     @State private var titlebarLeadingInset: CGFloat = 12
     private var windowIdentifier: String { "cmux.main.\(windowId.uuidString)" }
     private var fakeTitlebarTextColor: Color {
-        _ = titlebarThemeGeneration
-        let ghosttyBackground = GhosttyApp.shared.defaultBackgroundColor
+        let ghosttyBackground = titlebarThemeConfig.backgroundColor
         return ghosttyBackground.isLightColor
             ? Color.black.opacity(0.78)
             : Color.white.opacity(0.82)
@@ -2242,14 +2280,11 @@ struct ContentView: View {
         .frame(maxWidth: .infinity)
         .contentShape(Rectangle())
         .background({
-            // The terminal area has two stacked semi-transparent layers: the Bonsplit
-            // container chrome background plus Ghostty's own Metal-rendered background.
-            // Compute the effective composited opacity so the titlebar matches visually.
-            let alpha = CGFloat(GhosttyApp.shared.defaultBackgroundOpacity)
-            let effective = alpha >= 0.999 ? alpha : 1.0 - pow(1.0 - alpha, 2)
             return TitlebarLayerBackground(
-                backgroundColor: GhosttyApp.shared.defaultBackgroundColor,
-                opacity: effective
+                backgroundColor: titlebarThemeConfig.backgroundColor,
+                opacity: cmuxMainWindowTitlebarOpacity(
+                    backgroundOpacity: titlebarThemeConfig.backgroundOpacity
+                )
             )
         }())
         .overlay(alignment: .bottom) {
@@ -2408,6 +2443,7 @@ struct ContentView: View {
             syncSidebarSelectedWorkspaceIds()
             applyUITestSidebarSelectionIfNeeded(tabs: tabManager.tabs)
             updateTitlebarText()
+            titlebarThemeConfig = cmuxResolveGhosttyChromeConfig()
 
             // Startup recovery (#399): if session restore or a race condition leaves the
             // view in a broken state (empty tabs, no selection, unmounted workspaces),
@@ -2529,9 +2565,10 @@ struct ContentView: View {
         })
 
         view = AnyView(view.onChange(of: titlebarThemeGeneration) { oldValue, newValue in
+            titlebarThemeConfig = cmuxResolveGhosttyChromeConfig()
             guard GhosttyApp.shared.backgroundLogEnabled else { return }
             GhosttyApp.shared.logBackground(
-                "titlebar theme refresh applied oldGeneration=\(oldValue) generation=\(newValue) appBg=\(GhosttyApp.shared.defaultBackgroundColor.hexString()) appOpacity=\(String(format: "%.3f", GhosttyApp.shared.defaultBackgroundOpacity))"
+                "titlebar theme refresh applied oldGeneration=\(oldValue) generation=\(newValue) titlebarBg=\(titlebarThemeConfig.backgroundColor.hexString()) titlebarOpacity=\(String(format: "%.3f", titlebarThemeConfig.backgroundOpacity)) appBg=\(GhosttyApp.shared.defaultBackgroundColor.hexString()) appOpacity=\(String(format: "%.3f", GhosttyApp.shared.defaultBackgroundOpacity))"
             )
         })
 

Sources/GhosttyConfig.swift

@@ -7,6 +7,44 @@ struct GhosttyConfig {
         case dark
     }
 
+    enum BackgroundBlur: Hashable {
+        case disabled
+        case enabled
+        case macosGlassRegular
+        case macosGlassClear
+
+        var isGlassStyle: Bool {
+            switch self {
+            case .macosGlassRegular, .macosGlassClear:
+                return true
+            case .disabled, .enabled:
+                return false
+            }
+        }
+
+        static func parse(_ rawValue: String) -> Self? {
+            let normalized = rawValue
+                .trimmingCharacters(in: .whitespacesAndNewlines)
+                .lowercased()
+
+            switch normalized {
+            case "false", "0", "off", "disabled":
+                return .disabled
+            case "true", "1", "on":
+                return .enabled
+            case "macos-glass-regular":
+                return .macosGlassRegular
+            case "macos-glass-clear":
+                return .macosGlassClear
+            default:
+                if Double(normalized) != nil {
+                    return .enabled
+                }
+                return nil
+            }
+        }
+    }
+
     private static let cmuxReleaseBundleIdentifier = "com.cmuxterm.app"
     private static let loadCacheLock = NSLock()
     private static var cachedConfigsByColorScheme: [ColorSchemePreference: GhosttyConfig] = [:]
@@ -23,6 +61,7 @@ struct GhosttyConfig {
     // Colors (from theme or config)
     var backgroundColor: NSColor = NSColor(hex: "#272822")!
     var backgroundOpacity: Double = 1.0
+    var backgroundBlur: BackgroundBlur = .disabled
     var foregroundColor: NSColor = NSColor(hex: "#fdfff1")!
     var cursorColor: NSColor = NSColor(hex: "#c0c1b5")!
     var cursorTextColor: NSColor = NSColor(hex: "#8d8e82")!
@@ -258,6 +297,10 @@ struct GhosttyConfig {
                     if let opacity = Double(value) {
                         backgroundOpacity = opacity
                     }
+                case "background-blur":
+                    if let blur = BackgroundBlur.parse(value) {
+                        backgroundBlur = blur
+                    }
                 case "foreground":
                     if let color = NSColor(hex: value) {
                         foregroundColor = color

Sources/GhosttyTerminalView.swift

@@ -27,6 +27,68 @@ private func cmuxTransparentWindowBaseColor() -> NSColor {
     // avoids visual artifacts that can happen with a fully clear window background.
     NSColor.white.withAlphaComponent(0.001)
 }
+
+enum CmuxPendingGhosttySearchRequest: Equatable {
+    case startSearch
+    case searchSelection
+}
+
+enum CmuxGhosttyStartSearchResolution: Equatable {
+    case ignore
+    case focusExisting
+    case updateExistingNeedle(String)
+    case createEmpty
+    case createWithNeedle(String)
+}
+
+func cmuxDecodeGhosttyOptionalCString(_ pointer: UnsafePointer<CChar>?) -> String? {
+    guard let pointer else { return nil }
+
+    // Guard obviously invalid low addresses so Ghostty callback corruption cannot crash us
+    // while handling an empty/open-search notification.
+    let address = UInt(bitPattern: pointer)
+    guard address >= 0x1000 else { return nil }
+
+    return String(validatingUTF8: pointer)
+}
+
+func cmuxResolveGhosttyStartSearch(
+    existingSearchState: Bool,
+    pendingRequest: CmuxPendingGhosttySearchRequest?,
+    needle: String?
+) -> CmuxGhosttyStartSearchResolution {
+    if existingSearchState {
+        if let needle, !needle.isEmpty {
+            return .updateExistingNeedle(needle)
+        }
+        return .focusExisting
+    }
+
+    switch pendingRequest {
+    case .startSearch:
+        return .createEmpty
+    case .searchSelection:
+        if let needle, !needle.isEmpty {
+            return .createWithNeedle(needle)
+        }
+        return .ignore
+    case nil:
+        return .ignore
+    }
+}
+
+func cmuxApplyPendingGhosttyStartSearchFallbackIfNeeded(
+    _ terminalSurface: TerminalSurface,
+    searchFocusNotifier: @escaping (TerminalSurface) -> Void = {
+        NotificationCenter.default.post(name: .ghosttySearchFocus, object: $0)
+    }
+) {
+    guard terminalSurface.pendingGhosttySearchActivationRequest == .startSearch else { return }
+    terminalSurface.clearGhosttySearchActivationRequest()
+    guard terminalSurface.searchState == nil else { return }
+    terminalSurface.searchState = TerminalSurface.SearchState()
+    searchFocusNotifier(terminalSurface)
+}
 #endif
 
 #if DEBUG
@@ -2131,15 +2193,41 @@ class GhosttyApp {
             return true
         case GHOSTTY_ACTION_START_SEARCH:
             guard let terminalSurface = surfaceView.terminalSurface else { return true }
-            let needle = action.action.start_search.needle.flatMap { String(cString: $0) }
+            let pendingRequest = terminalSurface.consumeGhosttySearchActivationRequest()
+            let shouldDecodeNeedle =
+                terminalSurface.searchState != nil || pendingRequest != .startSearch
+            let needle = shouldDecodeNeedle
+                ? cmuxDecodeGhosttyOptionalCString(action.action.start_search.needle)
+                : nil
             DispatchQueue.main.async {
-                if let searchState = terminalSurface.searchState {
-                    if let needle, !needle.isEmpty {
+                let resolution = cmuxResolveGhosttyStartSearch(
+                    existingSearchState: terminalSurface.searchState != nil,
+                    pendingRequest: pendingRequest,
+                    needle: needle
+                )
+
+                switch resolution {
+                case .ignore:
+#if DEBUG
+                    dlog(
+                        "find.startSearch ignored tab=\(terminalSurface.tabId.uuidString.prefix(5)) " +
+                        "surface=\(terminalSurface.id.uuidString.prefix(5)) " +
+                        "pending=\(String(describing: pendingRequest))"
+                    )
+#endif
+                    return
+                case .focusExisting:
+                    break
+                case .updateExistingNeedle(let needle):
+                    if let searchState = terminalSurface.searchState {
                         searchState.needle = needle
                     }
-                } else {
-                    terminalSurface.searchState = TerminalSurface.SearchState(needle: needle ?? "")
+                case .createEmpty:
+                    terminalSurface.searchState = TerminalSurface.SearchState()
+                case .createWithNeedle(let needle):
+                    terminalSurface.searchState = TerminalSurface.SearchState(needle: needle)
                 }
+
                 NotificationCenter.default.post(name: .ghosttySearchFocus, object: terminalSurface)
             }
             return true
@@ -2590,6 +2678,7 @@ final class TerminalSurface: Identifiable, ObservableObject {
     private var portalLifecycleState: PortalLifecycleState = .live
     private var portalLifecycleGeneration: UInt64 = 1
     private var activePortalHostLease: PortalHostLease?
+    private var pendingGhosttySearchRequest: CmuxPendingGhosttySearchRequest?
     @Published var searchState: SearchState? = nil {
 	        didSet {
 	            if let searchState {
@@ -3629,6 +3718,24 @@ final class TerminalSurface: Identifiable, ObservableObject {
         }
     }
 
+    func requestGhosttySearchActivation(_ request: CmuxPendingGhosttySearchRequest) {
+        pendingGhosttySearchRequest = request
+    }
+
+    var pendingGhosttySearchActivationRequest: CmuxPendingGhosttySearchRequest? {
+        pendingGhosttySearchRequest
+    }
+
+    func consumeGhosttySearchActivationRequest() -> CmuxPendingGhosttySearchRequest? {
+        let request = pendingGhosttySearchRequest
+        pendingGhosttySearchRequest = nil
+        return request
+    }
+
+    func clearGhosttySearchActivationRequest() {
+        pendingGhosttySearchRequest = nil
+    }
+
     @discardableResult
     func toggleKeyboardCopyMode() -> Bool {
         let handled = surfaceView.toggleKeyboardCopyMode()
@@ -4536,7 +4643,20 @@ class GhosttyNSView: NSView, NSUserInterfaceValidations {
             _ = performBindingAction("jump_to_prompt:\(delta * count)")
             refreshKeyboardCopyModeViewportRowFromVisibleAnchor(surface: surface)
         case .startSearch:
-            _ = performBindingAction("start_search")
+            if let terminalSurface, terminalSurface.searchState != nil {
+                NotificationCenter.default.post(name: .ghosttySearchFocus, object: terminalSurface)
+                break
+            }
+            terminalSurface?.requestGhosttySearchActivation(.startSearch)
+            if performBindingAction("start_search") {
+                if let terminalSurface {
+                    DispatchQueue.main.async {
+                        cmuxApplyPendingGhosttyStartSearchFallbackIfNeeded(terminalSurface)
+                    }
+                }
+            } else {
+                terminalSurface?.clearGhosttySearchActivationRequest()
+            }
         case .searchNext:
             performBindingAction("navigate_search:next", repeatCount: count)
             refreshKeyboardCopyModeViewportRowFromVisibleAnchor(surface: surface)