fix(cmux-next): unify glass surface backgrounds

Packages/Shared/CmuxTheme/Sources/CmuxTheme/ThemeTokens.swift

@@ -24,16 +24,15 @@ public struct ThemeTokens: Hashable, Sendable {
     public var chromeBackground: ThemeRGB
     /// Floating cards (palette, hover card, editors) under or instead of glass.
     public var elevatedBackground: ThemeRGB
-    /// Every pane's tab strip: a shade darker than the window in light
-    /// themes too, so the strips read as quiet bands (a pure black window
-    /// has no darker shade; there the strip matches it).
+    /// Every pane's tab strip: the same ground as the window. Focus and
+    /// selection fills provide hierarchy without introducing a second
+    /// background token.
     public var stripBackground: ThemeRGB
     /// The sidebar's tonal step: a translucent layer over the window's one
     /// backdrop (the solid background, or the material and its tint), the
     /// foreground at the same 4% the agent pane's sidebar uses.
     public var sidebarStep: ThemeRGB
-    /// The tab strip's tonal step over the window's backdrop: black, so
-    /// over the opaque background it composites to `stripBackground`.
+    /// Reserved for the sidebar rules; tab strips do not add a tonal step.
     public var stripStep: ThemeRGB
 
     // Text
@@ -151,9 +150,9 @@ public struct ThemeTokens: Hashable, Sendable {
             contentBackground: surface,
             chromeBackground: bg.mixed(toward: fg, isDark ? 0.05 : 0.035),
             elevatedBackground: bg.mixed(toward: fg, isDark ? 0.07 : 0.02),
-            stripBackground: bg.mixed(toward: .black, isDark ? 0.22 : 0.05).withAlpha(input.backgroundOpacity),
+            stripBackground: surface,
             sidebarStep: fg.withAlpha(0.04),
-            stripStep: ThemeRGB.black.withAlpha(isDark ? 0.22 : 0.05),
+            stripStep: ThemeRGB.black.withAlpha(0),
             textPrimary: primary,
             textSecondary: secondary,
             textTertiary: tertiary,

Packages/macOS/CmuxNext/Sources/CmuxNextApps/Render/AppSceneAppearance.swift

@@ -9,11 +9,12 @@ public import SwiftUI
 @Observable
 public final class AppSceneAppearance {
     public var colors: AppSceneColors = .fallback
+    public var useSidebarBackground = false
 
-    public init() {}
+    public init(useSidebarBackground: Bool = false) { self.useSidebarBackground = useSidebarBackground }
 
     public func update(from view: NSView) {
-        let resolved = AppSceneColors.resolve(in: view)
+        let resolved = AppSceneColors.resolve(in: view, useSidebarBackground: useSidebarBackground)
         if resolved != colors { colors = resolved }
     }
 }

Packages/macOS/CmuxNext/Sources/CmuxNextApps/Render/AppSceneColors.swift

@@ -43,10 +43,11 @@ public nonisolated struct AppSceneColors: Sendable, Equatable {
 
     /// Resolves the palette for `view`'s theme scope.
     @MainActor
-    public static func resolve(in view: NSView) -> AppSceneColors {
+    public static func resolve(in view: NSView, useSidebarBackground: Bool = false) -> AppSceneColors {
         view.performWithTheme {
             AppSceneColors(
-                background: c(Palette.sidebarBackground), elevated: c(Palette.elevatedBackground), primary: c(Palette.textPrimary),
+                background: c(useSidebarBackground ? (Palette.surfaceOverride(.sidebar) ?? Palette.sidebarBackground)
+                    : (Palette.surfaceOverride(.internalPage) ?? Palette.sidebarBackground)), elevated: c(Palette.elevatedBackground), primary: c(Palette.textPrimary),
                 secondary: c(Palette.textSecondary), tertiary: c(Palette.textTertiary), separator: c(Palette.separator),
                 hover: c(Palette.hoverFill), selection: c(Palette.selectionFill), badge: c(Palette.badgeFill),
                 success: c(Palette.success), attention: c(Palette.attention), danger: c(Palette.danger))

Packages/macOS/CmuxNext/Sources/CmuxNextApps/Render/AppSceneHostingView.swift

@@ -5,7 +5,7 @@ public import SwiftUI
 /// section provider wants an `NSView` plus a height for a width).
 public final class AppSceneHostingView: NSHostingView<AnyView> {
     public let model: AppSceneModel
-    private let sceneAppearance = AppSceneAppearance()
+    private let sceneAppearance = AppSceneAppearance(useSidebarBackground: true)
     /// Measures heights for a width without laying out this view.
     private let measurer: NSHostingController<AnyView>
 

Packages/macOS/CmuxNext/Sources/CmuxNextApps/Store/Views/AppStoreRootView.swift

@@ -24,6 +24,7 @@ public struct AppStoreRootView: View {
             case .installed: AppInstalledView(model: model)
             }
         }
+        .background(colors.background)
         .onAppear { if model.listings.isEmpty { model.refresh() } }
     }
 

Packages/macOS/CmuxNext/Sources/CmuxNextBookmarks/UI/BookmarkPageColors.swift

@@ -18,7 +18,7 @@ struct BookmarkPageColors: Equatable {
     /// Call inside `performWithTheme`. theme-scoped
     static func resolve() -> BookmarkPageColors {
         BookmarkPageColors(
-            background: fixed(Palette.paneFill), primary: fixed(Palette.textPrimary), secondary: fixed(Palette.textSecondary),
+            background: fixed(Palette.surfaceOverride(.internalPage) ?? Palette.paneFill), primary: fixed(Palette.textPrimary), secondary: fixed(Palette.textSecondary),
             tertiary: fixed(Palette.textTertiary), hover: fixed(Palette.hoverFill), selection: fixed(Palette.selectionFill),
             separator: fixed(Palette.separator), danger: fixed(Palette.danger))
     }

Packages/macOS/CmuxNext/Sources/CmuxNextBookmarks/UI/BookmarksBarView.swift

@@ -127,7 +127,7 @@ public final class BookmarksBarView: NSView {
 
     public override func updateLayer() {
         performWithTheme {
-            layer?.backgroundColor = Palette.windowBackground.cgColor
+            layer?.backgroundColor = Palette.paneFill.cgColor
             emptyLabel.textColor = Palette.textTertiary
             otherButton.contentTintColor = Palette.textSecondary
             overflow.contentTintColor = Palette.textSecondary

Packages/macOS/CmuxNext/Sources/CmuxNextBrowser/CEF/CEFHostView.swift

@@ -31,11 +31,12 @@ final class CEFHostView: NSView {
         updateBackground()
     }
 
-    /// Until Chromium's page window shows its first frame, the page area is
-    /// the theme color, never white (`PageBackground`).
+    /// Until Chromium's page window shows its first frame, the page area
+    /// follows the shared pane ground. It stays clear over Liquid Glass so
+    /// the window backdrop remains visible.
     private func updateBackground() {
         performWithTheme {
-            layer?.backgroundColor = Palette.pageBackground.cgColor
+            layer?.backgroundColor = Palette.paneFill.cgColor
         }
     }
 

Packages/macOS/CmuxNext/Sources/CmuxNextBrowser/CEF/CEFTab.swift

@@ -182,7 +182,8 @@ public final class CEFTab: BrowserTab, BrowserOcclusionHosting, BrowserExtension
     private func applyPageBackground() {
         guard let browser = browserID, let shim = runtime.shim else { return }
         _ = shim.browserSetBackgroundColor(browser, PageBackground.chromiumARGB(pastFirstRealPage: pastFirstRealPage,
-                                                                                 theme: PageBackground.themeARGB(in: container)))
+                                                                                 theme: PageBackground.themeARGB(in: container,
+                                                                                                                 surface: pastFirstRealPage ? nil : .newTabPage)))
     }
 
     func creationFailed() {

Packages/macOS/CmuxNext/Sources/CmuxNextBrowser/Core/PageBackground.swift

@@ -39,8 +39,11 @@ nonisolated enum PageBackground {
     /// `Palette.pageBackground` of `view`'s theme scope (its room,
     /// workspace or terminal theme) as opaque 0xAARRGGBB, the form
     /// `CefBrowserSettings.background_color` takes.
-    @MainActor static func themeARGB(in view: NSView) -> UInt32 {
-        argb(view.performWithTheme { Palette.pageBackground })
+    @MainActor static func themeARGB(in view: NSView, surface: SurfaceKind? = nil) -> UInt32 {
+        argb(view.performWithTheme {
+            if let surface, let override = Palette.surfaceOverride(surface) { return override.withAlphaComponent(1) }
+            return Palette.pageBackground
+        })
     }
 
     /// The app theme's (Ghostty config) page background: Chromium's

Packages/macOS/CmuxNext/Sources/CmuxNextDesign/Windows/SurfaceBackgrounds.swift

@@ -3,7 +3,7 @@ public import CmuxTheme
 /// A part of the window whose background the user may change
 /// (`appearance.surfaces.<surface>` in cmux.json, Lawrence R55;
 /// plans/cmux-next/surface-backgrounds.md). Its raw value is the cmux.json
-/// key. A Chromium page is not a surface: a page paints itself.
+/// key. A real web page is not a surface; cmux-owned internal pages are.
 public nonisolated enum SurfaceKind: String, CaseIterable, Sendable, Hashable {
     case sidebar
     case tabBar
@@ -14,8 +14,11 @@ public nonisolated enum SurfaceKind: String, CaseIterable, Sendable, Hashable {
     case home
     case browserChrome
     case docks
-    /// The diff viewer page (`--cmux-surface-background` in webviews); it
-    /// has its own override instead of its host surface's.
+    /// Native and bundled internal pages such as History, Bookmarks, Tasks and App Store.
+    case internalPage
+    /// The draggable and visible split divider line.
+    case splitDivider
+    /// The diff viewer page (`--cmux-surface-background` in webviews).
     case diff
 }
 

Packages/macOS/CmuxNext/Sources/CmuxNextFeed/FeedHostView.swift

@@ -51,7 +51,7 @@ public final class FeedHostView: NSView {
 
     private func resolveColors() {
         let colors = performWithTheme {
-            let background = floating ? Palette.contentBackground : Palette.paneFill
+            let background = floating ? Palette.contentBackground : (Palette.surfaceOverride(.internalPage) ?? Palette.paneFill)
             layer?.backgroundColor = floating ? background.cgColor : nil
             return FeedColors.resolved(background: background)
         }

Packages/macOS/CmuxNext/Sources/CmuxNextHistory/HistoryPageHostView.swift

@@ -47,7 +47,7 @@ public final class HistoryPageHostView: NSView {
 
     private func resolveColors() {
         let colors = performWithTheme {
-            let background = Palette.paneFill
+            let background = Palette.surfaceOverride(.internalPage) ?? Palette.paneFill
             layer?.backgroundColor = nil
             return HistoryPageColors(
                 background: Color(nsColor: Self.fixed(background)), primary: Color(nsColor: Self.fixed(Palette.textPrimary)),

Packages/macOS/CmuxNext/Sources/CmuxNextHome/Views/HomeHeaderView.swift

@@ -25,7 +25,7 @@ final class HomeHeaderView: NSView {
 
     override func draw(_ dirtyRect: NSRect) {
         performWithTheme {
-            Palette.windowBackground.setFill()
+            Palette.paneFill.setFill()
             bounds.fill()
             let paragraph = NSMutableParagraphStyle()
             paragraph.alignment = .center

Packages/macOS/CmuxNext/Sources/CmuxNextHome/Views/HomeView.swift

@@ -121,7 +121,7 @@ public final class HomeView: NSView {
 
     private func applyTheme() {
         performWithTheme {
-            layer?.backgroundColor = Palette.windowBackground.cgColor
+            layer?.backgroundColor = Palette.paneFill.cgColor
             separator.backgroundColor = Palette.separator.cgColor
             emptyLabel.font = Typography.body
             emptyLabel.textColor = Palette.textTertiary

Packages/macOS/CmuxNext/Sources/CmuxNextLayout/Views/DividerHandleView.swift

@@ -156,7 +156,7 @@ final class DividerHandleView: NSView {
             if isEdge {
                 color = active ? Palette.focusRing.withAlphaComponent(0.45) : .clear
             } else {
-                color = active ? Palette.focusRing.withAlphaComponent(0.6) : (showsIdleLine ? Palette.separator : .clear)
+                color = active ? Palette.focusRing.withAlphaComponent(0.6) : ((showsIdleLine || Palette.surfaceOverride(.splitDivider) != nil) ? (Palette.surfaceOverride(.splitDivider) ?? Palette.separator) : .clear)
             }
             Motion.transaction(.hover) {
                 line.backgroundColor = color.cgColor

Packages/macOS/CmuxNext/Sources/CmuxNextLayout/Views/PaneOverlayView.swift

@@ -227,7 +227,10 @@ final class PaneOverlayView: NSView {
             let attentionColor = attentionMark?.color?.nsColor ?? attentionSettings.color?.nsColor ?? Palette.attention
             attention.borderColor = attentionColor.cgColor
             border.borderColor = (borderStyle.color?.nsColor ?? Palette.paneBorder).cgColor
-            dimLayer.backgroundColor = Palette.contentBackground.withAlphaComponent(1).cgColor
+            // In glass windows the root backdrop owns the ground. An opaque
+            // inactive-pane veil would hide the painting and reintroduce the
+            // History/terminal mismatch; paneFill is clear in that mode.
+            dimLayer.backgroundColor = Palette.paneFill.cgColor
         }
     }
 }

Packages/macOS/CmuxNext/Sources/CmuxNextPages/PageWebView.swift

@@ -254,7 +254,7 @@ public final class PageWebView: NSView, PageSurface, WKNavigationDelegate {
     /// `backgrounds`, the app's) replaces the page background; nil keeps the scope's own.
     func currentTheme(backgrounds: SurfaceBackgrounds = ThemeScope.app.surfaceBackgrounds) -> WebTheme {
         WebTheme(themeTokens, reduceTransparency: NSWorkspace.shared.accessibilityDisplayShouldReduceTransparency,
-                 surface: themeSurface, backgrounds: backgrounds)
+                 surface: themeSurface ?? .internalPage, backgrounds: backgrounds)
     }
 
     // MARK: WKNavigationDelegate