fix(macos): keep settings sidebar visible

steipete · steipete · commit d1fa0f96287a · 2026-05-18T12:53:18.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -71,9 +71,10 @@ Docs: https://docs.openclaw.ai
 - Core/plugins: harden clawpatch-reported edge cases across gateway auth cleanup, Claude session id paths, plugin activation policy, apply-patch hunk handling, diagnostic redaction, and plugin metadata validation.
 - UI: show reasoning choices as plain labels instead of leaking internal override wording in session and chat pickers.
 - Mac app: avoid repeating the Configuration heading inside channel quick settings.
+- Mac app: keep the Settings sidebar always visible and remove the redundant titlebar hide/show control.
 - Mac app: prefer explicit private/Tailscale/LAN Gateway endpoints over SSH tunnels, preserve legacy loopback tunnel configs, persist transport choices, and show captured SSH stderr when tunneling really fails.
 - Gateway/sessions: keep ACP/acpx and runtime child sessions visible in configured-only session lists when their owner or parent session belongs to a configured agent.
-- Mac app: keep app-level menu commands and Dashboard failure states reachable when the remote Gateway is disconnected, and keep the Settings sidebar toggle in the leading titlebar area.
+- Mac app: keep app-level menu commands and Dashboard failure states reachable when the remote Gateway is disconnected.
 - Mac app: allow longer Gateway and Context errors to wrap in the menu instead of truncating the useful failure detail.
 - Mac app: tighten remote Gateway fields in Settings so the Connection pane keeps readable labels and full action button text.
 - Mac app: keep custom Settings card rows left-aligned and full-width so Discovery and status sections no longer appear centered or detached.
diff --git a/apps/macos/Sources/OpenClaw/SettingsRootView.swift b/apps/macos/Sources/OpenClaw/SettingsRootView.swift
@@ -8,7 +8,6 @@ struct SettingsRootView: View {
     @State private var monitoringPermissions = false
     @State private var selectedTab: SettingsTab = .general
     @State private var cachedTabs: Set<SettingsTab>
-    @State private var sidebarVisible = true
     @State private var snapshotPaths: (configPath: String?, stateDir: String?) = (nil, nil)
     let updater: UpdaterProviding?
     private let isPreview = ProcessInfo.processInfo.isPreview
@@ -24,36 +23,20 @@ struct SettingsRootView: View {
 
     var body: some View {
         HStack(spacing: 0) {
-            if self.sidebarVisible {
-                SettingsSidebar(
-                    groups: self.visibleGroups,
-                    selectedTab: self.$selectedTab)
-                    .frame(width: SettingsLayout.sidebarWidth)
-                    .transition(.move(edge: .leading).combined(with: .opacity))
-            }
+            SettingsSidebar(
+                groups: self.visibleGroups,
+                selectedTab: self.$selectedTab)
+                .frame(width: SettingsLayout.sidebarWidth)
 
             self.detailContainer
         }
         .frame(width: SettingsTab.windowWidth, height: SettingsTab.windowHeight, alignment: .topLeading)
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
         .background(SettingsWindowChromeConfigurator())
-        .toolbar {
-            ToolbarItem(placement: .navigation) {
-                Button {
-                    withAnimation(.spring(response: 0.28, dampingFraction: 0.86)) {
-                        self.sidebarVisible.toggle()
-                    }
-                } label: {
-                    Image(systemName: "sidebar.leading")
-                }
-                .help(self.sidebarVisible ? "Hide Sidebar" : "Show Sidebar")
-            }
-        }
         .onReceive(NotificationCenter.default.publisher(for: .openclawSelectSettingsTab)) { note in
             if let tab = note.object as? SettingsTab {
                 withAnimation(.spring(response: 0.32, dampingFraction: 0.85)) {
                     self.selectedTab = self.validTab(for: tab)
-                    self.sidebarVisible = true
                 }
             }
         }
