fix(macos): merge the WebChat window title band into the toolbar row (#109318)

steipete · web-flow · commit 8f74762f4dbb · 2026-07-16T13:12:24.000-07:00
The standalone chat window stacked a visible title bar (traffic lights +
"OpenClaw" title) above the SwiftUI toolbar row, wasting a full band of
vertical space. Apply the Dashboard window's merged chrome: hidden title,
transparent titlebar, no separator, movable-by-background — the unified
toolbar (sidebar toggle, search, pickers, session actions) now shares its row
with the traffic lights. A window subclass pins titleVisibility to hidden
because SwiftUI's toolbar bridge can restore visible title chrome, and scene
bridging is reset to toolbars-only after controller attachment (attaching an
NSHostingController resets it to .all).
diff --git a/apps/macos/Sources/OpenClaw/WebChatSwiftUI.swift b/apps/macos/Sources/OpenClaw/WebChatSwiftUI.swift
@@ -18,6 +18,18 @@ private enum WebChatSwiftUILayout {
     static let anchorPadding: CGFloat = 8
 }
 
+/// SwiftUI's native toolbar bridge may restore visible title chrome while it
+/// installs toolbar items. Keep the full-window chat's titlebar merged.
+private final class WebChatWindow: NSWindow {
+    override var titleVisibility: NSWindow.TitleVisibility {
+        didSet {
+            if self.titleVisibility != .hidden {
+                self.titleVisibility = .hidden
+            }
+        }
+    }
+}
+
 struct MacGatewayChatTransport: OpenClawChatTransport {
     /// Shared across transport value copies so the live view model and its
     /// snapshot observer cannot diverge on the owner of the bare global alias.
@@ -580,7 +592,6 @@ final class WebChatSwiftUIWindowController {
             let hosting = NSHostingController(rootView: OpenClawChatWindowShell(
                 viewModel: vm,
                 userAccent: accent))
-            hosting.sceneBridgingOptions = [.toolbars, .title]
             self.contentController = hosting
         case .panel:
             // Anchored quick-chat panel: compact single-column chat.
@@ -705,16 +716,25 @@ final class WebChatSwiftUIWindowController {
     {
         switch presentation {
         case .window:
-            let window = NSWindow(
+            let window = WebChatWindow(
                 contentRect: NSRect(origin: .zero, size: WebChatSwiftUILayout.windowSize),
                 styleMask: [.titled, .closable, .resizable, .miniaturizable, .fullSizeContentView],
                 backing: .buffered,
                 defer: false)
             window.title = "OpenClaw Chat"
             window.contentViewController = contentViewController
+            // Attaching an NSHostingController resets scene bridging to `.all`;
+            // opt back into toolbar items only so SwiftUI cannot restore the title.
+            (contentViewController as? NSHostingController<OpenClawChatWindowShell>)?
+                .sceneBridgingOptions = [.toolbars]
             window.isReleasedWhenClosed = false
-            window.titleVisibility = .visible
+            // Keep the SwiftUI toolbar controls, but merge their unified row
+            // with the traffic lights instead of stacking it below a title band.
+            window.titleVisibility = .hidden
+            window.titlebarAppearsTransparent = true
             window.toolbarStyle = .unified
+            window.titlebarSeparatorStyle = .none
+            window.isMovableByWindowBackground = true
             window.center()
             window.setFrameAutosaveName(WebChatSwiftUILayout.windowFrameAutosaveName)
             WindowPlacement.ensureOnScreen(window: window, defaultSize: WebChatSwiftUILayout.windowSize)
@@ -801,4 +821,14 @@ final class WebChatSwiftUIWindowController {
     private static func color(fromHex raw: String?) -> Color? {
         ColorHexSupport.color(fromHex: raw)
     }
+
+    #if DEBUG
+    var _testWindow: NSWindow? {
+        self.window
+    }
+
+    var _testSceneBridgingOptions: NSHostingSceneBridgingOptions? {
+        (self.contentController as? NSHostingController<OpenClawChatWindowShell>)?.sceneBridgingOptions
+    }
+    #endif
 }
diff --git a/apps/macos/Tests/OpenClawIPCTests/WebChatSwiftUISmokeTests.swift b/apps/macos/Tests/OpenClawIPCTests/WebChatSwiftUISmokeTests.swift
@@ -41,12 +41,25 @@ struct WebChatSwiftUISmokeTests {
         func setActiveSessionKey(_: String) async throws {}
     }
 
-    @Test func `window controller show and close`() {
+    @Test func `window controller merges titlebar and keeps toolbar controls`() throws {
         let controller = WebChatSwiftUIWindowController(
             sessionKey: "main",
             presentation: .window,
             transport: TestTransport())
+        let window = try #require(controller._testWindow)
+
+        #expect(window.styleMask.contains(.fullSizeContentView))
+        #expect(window.titleVisibility == .hidden)
+        #expect(window.titlebarAppearsTransparent)
+        #expect(window.toolbarStyle == .unified)
+        #expect(window.titlebarSeparatorStyle == .none)
+        #expect(window.isMovableByWindowBackground)
+        #expect(controller._testSceneBridgingOptions?.contains(.toolbars) == true)
+        #expect(controller._testSceneBridgingOptions?.contains(.title) == false)
+
         controller.show()
+        #expect(window.titleVisibility == .hidden)
+        #expect(window.toolbar != nil)
         controller.close()
     }
 
