feat: sidebar width and visibility per workspace

Author: ph1p

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
     branches: [main]
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_16.3.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_26.3.app/Contents/Developer
 
 concurrency:
   group: ci-${{ github.ref }}
@@ -88,7 +88,7 @@ jobs:
       - name: Cache ironmark build
         uses: actions/cache@v5
         with:
-          path: Vendor/ironmark/target
+          path: Vendor/ironmark/target-macos15
           key: ironmark-macos15-${{ hashFiles('Vendor/ironmark/Cargo.lock', 'Vendor/ironmark/Cargo.toml') }}
           restore-keys: |
             ironmark-macos15-
@@ -153,7 +153,7 @@ jobs:
       - name: Cache ironmark build
         uses: actions/cache@v5
         with:
-          path: Vendor/ironmark/target
+          path: Vendor/ironmark/target-macos15
           key: ironmark-release-macos15-${{ hashFiles('Vendor/ironmark/Cargo.lock', 'Vendor/ironmark/Cargo.toml') }}
           restore-keys: |
             ironmark-release-macos15-

Boo/App/AppDelegate.swift

@@ -50,7 +50,7 @@ public enum BooMain {
 
         // Watch system appearance changes for auto-theme
         appearanceObserver = NSApp.observe(\.effectiveAppearance) { _, _ in
-            AppSettings.shared.applySystemAppearance()
+            Task { @MainActor in AppSettings.shared.applySystemAppearance() }
         }
         AppSettings.shared.applySystemAppearance()
 

Boo/App/MainWindowController+Workspace.swift

@@ -112,9 +112,13 @@ extension MainWindowController {
         appState.ensureUniquePaneIDsAcrossWorkspaces()
     }
 
-    func persistActiveWorkspaceSidebarState() {
-        activeWorkspace?.normalizePaneState()
-        sidebarController.persistLiveState()
+    func persistActiveWorkspaceSidebarState(for workspace: Workspace? = nil) {
+        let target = workspace ?? activeWorkspace
+        target?.normalizePaneState()
+        sidebarController.persistLiveState(for: target)
+        debugLog(
+            "[Sidebar] persistActiveWorkspaceSidebarState ws=\(target?.id.uuidString.prefix(8) ?? "nil") → sidebarState=\(String(describing: target?.sidebarState))"
+        )
     }
 
     /// Shared close-workspace logic used by both toolbar and workspace bar delegates.
@@ -203,12 +207,18 @@ extension MainWindowController {
     }
 
     func saveSession() {
+        cancelPendingSidebarStateSave()
         for paneView in paneViews.values {
             paneView.persistContentStateToModel()
         }
         normalizeWorkspaceState()
         persistActiveWorkspaceSidebarState()
         savePluginStateForActiveTab()
+        for (i, ws) in appState.workspaces.enumerated() {
+            debugLog(
+                "[Sidebar] saveSession ws[\(i)] id=\(ws.id.uuidString.prefix(8)) sidebarState=visible:\(String(describing: ws.sidebarState.isVisible)) width:\(ws.sidebarState.width ?? -1)"
+            )
+        }
         SessionStore.save(appState: appState)
     }
 
@@ -339,14 +349,15 @@ extension MainWindowController {
             }
         }
 
-        if activeWorkspace != nil {
-            persistActiveWorkspaceSidebarState()
+        appState.setActiveWorkspace(index)
+        guard let workspace = activeWorkspace else { return }
+
+        // Skip self-activation (startup restore): isVisible is uninitialized and would overwrite the loaded state.
+        if let prev = previousWorkspace, prev.id != workspace.id {
+            persistActiveWorkspaceSidebarState(for: prev)
         }
 
         savePluginStateForActiveTab()
-
-        appState.setActiveWorkspace(index)
-        guard let workspace = activeWorkspace else { return }
         workspace.normalizePaneState()
         debugLog(
             "[WorkspaceSwitch] activate fromWorkspace=\(previousWorkspace?.id.uuidString ?? "none") toWorkspace=\(workspace.id.uuidString) targetPane=\(workspace.activePaneID.uuidString)"
@@ -369,7 +380,13 @@ extension MainWindowController {
         let cwd = workspace.pane(for: workspace.activePaneID)?.activeTab?.workingDirectory ?? workspace.folderPath
         bridge.switchContext(paneID: workspace.activePaneID, workspaceID: workspace.id, workingDirectory: cwd)
 
-        sidebarController.applyRestoredState(sidebarController.resolveEffectiveSidebarState(for: workspace))
+        let restoredSidebarState = sidebarController.resolveEffectiveSidebarState(for: workspace)
+        debugLog(
+            "[Sidebar] activateWorkspace → resolvedState for ws=\(workspace.id.uuidString.prefix(8)) visible=\(String(describing: restoredSidebarState.isVisible)) width=\(restoredSidebarState.width ?? -1) storedState=\(String(describing: workspace.sidebarState))"
+        )
+        sidebarController.suppressSidebarStateSync += 1
+        let activationGen = sidebarController.beginActivation()
+        sidebarController.applyRestoredState(restoredSidebarState)
 
         refreshToolbar()
         // isRemoteSidebar/activeRemoteSession are now derived from bridge state,
@@ -379,15 +396,17 @@ extension MainWindowController {
         // Rebuild split container with the workspace's tree
         renderedWorkspaceID = workspace.id
         splitContainer.update(tree: workspace.splitTree)
+        sidebarController.suppressSidebarStateSync -= 1
 
         DispatchQueue.main.async { [weak self] in
             guard let self, let ws = self.activeWorkspace else { return }
+            // splitContainer.update can reset the divider; re-apply after layout settles.
+            debugLog(
+                "[Sidebar] async restoreActiveWorkspaceWidth for ws=\(ws.id.uuidString.prefix(8)) stored=\(String(describing: ws.sidebarState))"
+            )
+            self.sidebarController.restoreActiveWorkspaceWidth(ifGeneration: activationGen)
 
-            // Iterate over the WORKSPACE'S PANES (data model), not paneViews, to ensure all panes
-            // have PaneViews created even if they're not yet in the view cache.
             for (_, pane) in ws.panes {
-                // Get or create the PaneView for this pane - this triggers
-                // splitContainer(self:paneViewFor:) which creates and caches it.
                 if let pv = self.paneViews[pane.id] {
                     // Ensure every pane has a session
                     if pv.currentTerminalView == nil {

Boo/App/MainWindowController.swift

@@ -80,7 +80,8 @@ class ThemedSplitView: NSSplitView {
     }
 }
 
-@MainActor class MainWindowController: NSWindowController, SplitContainerDelegate, NSSplitViewDelegate, NSWindowDelegate {
+@MainActor class MainWindowController: NSWindowController, SplitContainerDelegate, NSSplitViewDelegate, NSWindowDelegate
+{
     let appState = AppState()
 
     let toolbar = ToolbarView(frame: .zero)
@@ -190,6 +191,11 @@ class ThemedSplitView: NSSplitView {
         set { coordinator?.sidebarSectionOrder = newValue }
     }
 
+    func cancelPendingSidebarStateSave() {
+        sidebarStateSaveTimer?.invalidate()
+        sidebarStateSaveTimer = nil
+    }
+
     func performWhileIgnoringSidebarLayoutSettingsRefresh<T>(_ body: () -> T) -> T {
         sidebarSettingsRefreshSuppressionDepth += 1
         defer { sidebarSettingsRefreshSuppressionDepth -= 1 }
@@ -466,108 +472,105 @@ class ThemedSplitView: NSSplitView {
         settingsObserver = NotificationCenter.default.addObserver(
             forName: .settingsChanged, object: nil, queue: .main
         ) { [weak self] notification in
-            guard let self, self.window?.isVisible == true else { return }
-            let topic = (notification.userInfo?["topic"] as? String).flatMap(SettingsTopic.init(rawValue:))
-
-            // Broadcast settings/theme changes to socket subscribers
-            if let t = topic {
-                BooSocketServer.shared.emitSettingsChanged(topic: t.rawValue)
-            }
-
-            // Theme changes: refresh chrome colors, pane backgrounds, sidebar, status bar
-            if topic == nil || topic == .theme {
-                MainActor.assumeIsolated { AppStore.shared.refreshTheme() }
-                let theme = AppSettings.shared.theme
-                BooSocketServer.shared.emitThemeChanged(name: theme.name, isDark: theme.isDark)
-                self.window?.backgroundColor = theme.chromeBg
-                self.window?.appearance = NSAppearance(named: theme.isDark ? .darkAqua : .aqua)
-                self.sidebarContainer.layer?.backgroundColor = theme.sidebarBg.cgColor
-                self.splitContainer.layer?.backgroundColor = theme.background.nsColor.cgColor
-                self.mainSplitView.needsDisplay = true
-                self.toolbar.needsDisplay = true
-                self.statusBar.needsDisplay = true
-                for (_, pv) in self.paneViews {
-                    pv.layer?.backgroundColor = theme.background.nsColor.cgColor
-                    pv.needsLayout = true
-                    pv.needsDisplay = true
-                }
-                // Rebuild plugin sidebar to pick up new theme
-                if let ctx = MainActor.assumeIsolated({ self.pluginRegistry.lastContext }) {
-                    self.cachedDetailViews.removeAll()
-                    self.rebuildSidebarTabs(context: ctx)
+            let topicString = notification.userInfo?["topic"] as? String
+            MainActor.assumeIsolated {
+                guard let self, self.window?.isVisible == true else { return }
+                let topic = topicString.flatMap(SettingsTopic.init(rawValue:))
+
+                // Broadcast settings/theme changes to socket subscribers
+                if let t = topic {
+                    BooSocketServer.shared.emitSettingsChanged(topic: t.rawValue)
                 }
-            }
-
-            // Status bar changes
-            if topic == nil || topic == .statusBar {
-                self.statusBar.needsDisplay = true
-            }
 
-            // Layout changes: sidebar/workspace bar position, density
-            if topic == nil || topic == .layout {
-                if self.isIgnoringSidebarLayoutSettingsRefresh {
-                    return
-                }
-                self.statusBarHeightConstraint?.constant = DensityMetrics.current.statusBarHeight
-                self.statusBar.needsDisplay = true
-                let newSidebarPos = AppSettings.shared.sidebarPosition
-                if newSidebarPos != self.currentSidebarPosition {
-                    self.currentSidebarPosition = newSidebarPos
-                    MainActor.assumeIsolated {
-                        self.sidebarController.position = newSidebarPos
-                    }
-                    self.rebuildSidebarLayout()
-                }
-                let newWsBarPos = AppSettings.shared.workspaceBarPosition
-                if newWsBarPos != self.currentWorkspaceBarPosition {
-                    self.currentWorkspaceBarPosition = newWsBarPos
-                    self.rebuildWorkspaceBarLayout()
-                }
-                let newTabOverflow = AppSettings.shared.tabOverflowMode
-                if newTabOverflow != self.currentTabOverflowMode {
-                    self.currentTabOverflowMode = newTabOverflow
+                // Theme changes: refresh chrome colors, pane backgrounds, sidebar, status bar
+                if topic == nil || topic == .theme {
+                    AppStore.shared.refreshTheme()
+                    let theme = AppSettings.shared.theme
+                    BooSocketServer.shared.emitThemeChanged(name: theme.name, isDark: theme.isDark)
+                    self.window?.backgroundColor = theme.chromeBg
+                    self.window?.appearance = NSAppearance(named: theme.isDark ? .darkAqua : .aqua)
+                    self.sidebarContainer.layer?.backgroundColor = theme.sidebarBg.cgColor
+                    self.splitContainer.layer?.backgroundColor = theme.background.nsColor.cgColor
+                    self.mainSplitView.needsDisplay = true
+                    self.toolbar.needsDisplay = true
+                    self.statusBar.needsDisplay = true
                     for (_, pv) in self.paneViews {
+                        pv.layer?.backgroundColor = theme.background.nsColor.cgColor
                         pv.needsLayout = true
                         pv.needsDisplay = true
                     }
+                    // Rebuild plugin sidebar to pick up new theme
+                    if let ctx = self.pluginRegistry.lastContext {
+                        self.cachedDetailViews.removeAll()
+                        self.rebuildSidebarTabs(context: ctx)
+                    }
                 }
-                // Tab bar position changed — swap constraints and re-install content views
-                self.applySidebarTabBarPositionConstraints()
-                if let ctx = MainActor.assumeIsolated({ self.pluginRegistry.lastContext }) {
-                    self.cachedDetailViews.removeAll()
-                    self.removeAllPluginContent()
-                    self.rebuildSidebarTabs(context: ctx)
+
+                // Status bar changes
+                if topic == nil || topic == .statusBar {
+                    self.statusBar.needsDisplay = true
                 }
-                MainActor.assumeIsolated {
+
+                // Layout changes: sidebar/workspace bar position, density
+                if topic == nil || topic == .layout {
+                    if self.isIgnoringSidebarLayoutSettingsRefresh {
+                        return
+                    }
+                    self.statusBarHeightConstraint?.constant = DensityMetrics.current.statusBarHeight
+                    self.statusBar.needsDisplay = true
+                    let newSidebarPos = AppSettings.shared.sidebarPosition
+                    if newSidebarPos != self.currentSidebarPosition {
+                        self.currentSidebarPosition = newSidebarPos
+                        self.sidebarController.position = newSidebarPos
+                        self.rebuildSidebarLayout()
+                    }
+                    let newWsBarPos = AppSettings.shared.workspaceBarPosition
+                    if newWsBarPos != self.currentWorkspaceBarPosition {
+                        self.currentWorkspaceBarPosition = newWsBarPos
+                        self.rebuildWorkspaceBarLayout()
+                    }
+                    let newTabOverflow = AppSettings.shared.tabOverflowMode
+                    if newTabOverflow != self.currentTabOverflowMode {
+                        self.currentTabOverflowMode = newTabOverflow
+                        for (_, pv) in self.paneViews {
+                            pv.needsLayout = true
+                            pv.needsDisplay = true
+                        }
+                    }
+                    // Tab bar position changed — swap constraints and re-install content views
+                    self.applySidebarTabBarPositionConstraints()
+                    if let ctx = self.pluginRegistry.lastContext {
+                        self.cachedDetailViews.removeAll()
+                        self.removeAllPluginContent()
+                        self.rebuildSidebarTabs(context: ctx)
+                    }
                     self.sidebarController.persistLiveState()
                     self.sidebarController.applyRestoredState(self.sidebarController.resolveEffectiveSidebarState())
                 }
-            }
 
-            // Plugin changes: deactivate any now-disabled plugins and run a fresh cycle.
-            if topic == .plugins {
-                let disabled = AppSettings.shared.disabledPluginIDsSet
-                // Deactivate plugins that just got disabled
-                MainActor.assumeIsolated {
+                // Plugin changes: deactivate any now-disabled plugins and run a fresh cycle.
+                if topic == .plugins {
+                    let disabled = AppSettings.shared.disabledPluginIDsSet
+                    // Deactivate plugins that just got disabled
                     for plugin in self.pluginRegistry.plugins where disabled.contains(plugin.pluginID) {
                         self.pluginRegistry.deactivatePlugin(plugin.pluginID)
                         self.cachedDetailViews.removeValue(forKey: plugin.pluginID)
                     }
                     self.pluginRegistry.clearChangeDetection()
                 }
-            }
 
-            // Explorer/plugin/font changes: refresh sidebar
-            if topic == nil || topic == .explorer || topic == .sidebarFont || topic == .plugins {
-                if topic == .sidebarFont, let ctx = MainActor.assumeIsolated({ self.pluginRegistry.lastContext }) {
-                    if self.sidebarVisible {
-                        self.cachedDetailViews.removeAll()
-                        self.rebuildSidebarTabs(context: ctx)
+                // Explorer/plugin/font changes: refresh sidebar
+                if topic == nil || topic == .explorer || topic == .sidebarFont || topic == .plugins {
+                    if topic == .sidebarFont, let ctx = self.pluginRegistry.lastContext {
+                        if self.sidebarVisible {
+                            self.cachedDetailViews.removeAll()
+                            self.rebuildSidebarTabs(context: ctx)
+                        }
+                    } else {
+                        self.runPluginCycle(reason: .focusChanged)
                     }
-                } else {
-                    self.runPluginCycle(reason: .focusChanged)
                 }
-            }
+            }  // end MainActor.assumeIsolated
         }
 
         ghosttyActionObserver = NotificationCenter.default.addObserver(
@@ -588,7 +591,7 @@ class ThemedSplitView: NSSplitView {
             guard let self,
                 let url = notification.userInfo?["url"] as? URL
             else { return }
-            self.handleOpenTab(.browser(url: url))
+            MainActor.assumeIsolated { self.handleOpenTab(.browser(url: url)) }
         }
     }
 
@@ -680,7 +683,7 @@ class ThemedSplitView: NSSplitView {
             }
             self.splitRatioSaveTimer?.invalidate()
             self.splitRatioSaveTimer = Timer.scheduledTimer(withTimeInterval: 0.5, repeats: false) { [weak self] _ in
-                self?.saveSession()
+                MainActor.assumeIsolated { self?.saveSession() }
             }
         }
 
@@ -1164,7 +1167,7 @@ class ThemedSplitView: NSSplitView {
 
         sidebarStateSaveTimer?.invalidate()
         sidebarStateSaveTimer = Timer.scheduledTimer(withTimeInterval: 0.2, repeats: false) { [weak self] _ in
-            self?.saveSession()
+            MainActor.assumeIsolated { self?.saveSession() }
         }
     }