refactor(sidebar): connection-scoped favorites + multi-window tab persistence fix (#1000)

* refactor(sidebar): connection-scoped favorites cache and per-window search

* fix(tabs): aggregate persistence saves to prevent multi-window tab loss

* chore(sidebar): drop dead APIs and fix indentation per review

* test(tabs): cover sourceFileURL persistence round-trip

Author: datlechin

CHANGELOG.md

@@ -13,11 +13,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Multi-window tab persistence dropped all but one tab on relaunch. Three save paths each wrote only the current window's tabs, racing the `willTerminate` aggregate save: `handleTabSelectionChange` (every time you switched tabs), the `mainWindowWillClose` notification observer, and the per-window `handleWindowWillClose` close path. On Cmd+Q, AppKit closes windows LIFO so the last writer left only the first-opened window's tab in the file. The tab-selection path now writes aggregated tabs from all windows of the connection. Per-window close-time saves no-op when the app is terminating, leaving the canonical `willTerminate` aggregate save intact. The `mainWindowWillClose` observer also routes through the aggregated save path.
 - Filter value autocomplete popover stole keyboard focus from the text field after the first keystroke when Full Keyboard Access was enabled (System Settings → Keyboard → Keyboard Navigation). The popover content used SwiftUI `Button` rows, which become focus targets under FKA, so SwiftUI auto-focused the first row when the popover appeared. Replaced the rows with `Text` + `.onTapGesture` (non-focusable) and marked the dropdown as `.focusable(false)`.
 - Toolbar database name was empty after relaunching with a connection that had no database configured but a last-used database restored via `selectDatabaseFromLastSession`. The window opened (and the toolbar resolved its initial name) before the post-connect actions populated `session.currentDatabase`, so the toolbar fell back to the empty `connection.database`. Sidebar and Cmd+K both worked because they read the session directly. The toolbar now re-syncs its database name on every `connectionStatusDidChange`, picking up the restored value once the session settles.
 
 ### Changed
 
+- Favorites sidebar state is now connection-scoped, not window-scoped. Opening a second native tab for the same connection no longer reloads the favorites tree from SQLite or flashes a spinner. The folders/favorites/linked-files cache (`ConnectionDataCache`) is shared across windows of the same connection and refreshes on `.sqlFavoritesDidUpdate` and `.linkedSQLFoldersDidUpdate`. Favorite selection (`ConnectionSidebarState.selectedFavoriteNodeId`) is also shared, so highlighting a favorite in window A reflects in window B and persists across launches via UserDefaults. Favorites search text remains per-window (`WindowSidebarState.favoritesSearchText`), matching Mail/Notes patterns where each window can search independently. The single sidebar `NSSearchField` routes to the connection-shared text on Tables and to the window-local text on Favorites based on the active tab.
 - Connection Form rebuilt around macOS HIG sidebar navigation. The old segmented-tab form (~2200 lines across five files) is replaced by a `NavigationSplitView` with five sidebar panes (General, SSH Tunnel, SSL/TLS, Customization, Advanced). State previously held in 30+ flat `@State` vars is now split across six `@Observable` per-pane view models behind a `ConnectionFormCoordinator`. Plugin-driven additional fields auto-route to the right pane by their declared `FieldSection`. The toolbar exposes Cancel, Save, and Save & Connect natively; Test Connection lives inline in the General pane as a Status row. Each sidebar item shows a red warning triangle when its pane has missing required fields.
 - Import from URL flow moved to the database type chooser. Picking "Import from URL..." in the chooser footer opens a dedicated sheet; pasting a connection URL detects the type, previews host/user/database, and pre-fills the form. The form itself no longer has a URL import button — users decide before opening the form.
 - Native HIG polish across the form. General pane authentication rows reorder to Username → Password → Prompt for password → Use Password File. SSL/TLS mode caption renders as a Section footer instead of a stray row; CA Cert / Client Cert labels expand to full names. SSH Tunnel collapses "Profile" and "Profile Settings" into a single section with a "Profile Details" `DisclosureGroup`. Customization section "Safety" renames to "Query Behavior". Advanced pane's Startup Commands and Pre-Connect Script editors switch from a custom `RoundedRectangle.stroke` border to native `NSScrollView.borderType = .bezelBorder` (Terminal / Mail signature pattern); body captions move to Section footers. Connection form WindowGroup gains the standard three traffic lights.

TablePro/Core/Services/Infrastructure/MainSplitViewController.swift

@@ -139,9 +139,10 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
 
         if currentSession == nil {
             sidebarSplitItem.isCollapsed = true
-        } else {
+        } else if let session = currentSession, let coordinator = sessionState?.coordinator {
             sidebarContainer.updateSidebarState(
-                SharedSidebarState.forConnection(currentSession!.connection.id) // swiftlint:disable:this force_unwrapping
+                SharedSidebarState.forConnection(session.connection.id),
+                windowState: coordinator.windowSidebarState
             )
         }
         inspectorSplitItem.isCollapsed = !UserDefaults.standard.bool(forKey: Self.inspectorPresentedKey)
@@ -171,12 +172,16 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
             installToolbar(coordinator: sessionState.coordinator)
         }
 
-        if let currentSession {
+        if let currentSession, let coordinator = sessionState?.coordinator {
             sidebarContainer.updateSidebarState(
-                SharedSidebarState.forConnection(currentSession.connection.id)
+                SharedSidebarState.forConnection(currentSession.connection.id),
+                windowState: coordinator.windowSidebarState
             )
         }
 
+        sidebarContainer.view.layoutSubtreeIfNeeded()
+        sidebarContainer.view.display()
+
         installObservers()
     }
 
@@ -249,7 +254,7 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
                 sessionState?.coordinator.teardown()
                 sessionState = nil
                 currentSession = nil
-                sidebarContainer.updateSidebarState(nil)
+                sidebarContainer.updateSidebarState(nil, windowState: nil)
                 if view.window?.isVisible == true {
                     sidebarSplitItem.animator().isCollapsed = true
                 } else {
@@ -293,9 +298,10 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
 
     private func rebuildPanes() {
         sidebarContainer.rootView = AnyView(buildSidebarView())
-        if let currentSession {
+        if let currentSession, let coordinator = sessionState?.coordinator {
             sidebarContainer.updateSidebarState(
-                SharedSidebarState.forConnection(currentSession.connection.id)
+                SharedSidebarState.forConnection(currentSession.connection.id),
+                windowState: coordinator.windowSidebarState
             )
         }
         detailHosting.rootView = AnyView(buildDetailView())
@@ -305,37 +311,46 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
     @ViewBuilder
     private func buildSidebarView() -> some View {
         if let currentSession, let sessionState {
-            SidebarView(
-                sidebarState: SharedSidebarState.forConnection(currentSession.connection.id),
-                onDoubleClick: { [weak self] table in
-                    guard let coordinator = self?.sessionState?.coordinator else { return }
-                    let connectionId = coordinator.connectionId
-                    let isView = table.type == .view
-                    if let preview = WindowLifecycleMonitor.shared.previewWindow(for: connectionId),
-                       let previewCoordinator = MainContentCoordinator.coordinator(for: preview.windowId) {
-                        if previewCoordinator.tabManager.selectedTab?.tableContext.tableName == table.name {
-                            previewCoordinator.promotePreviewTab()
-                        } else {
-                            previewCoordinator.promotePreviewTab()
-                            coordinator.openTableTab(table.name, isView: isView)
-                        }
-                    } else {
-                        coordinator.promotePreviewTab()
-                        coordinator.openTableTab(table.name, isView: isView)
-                    }
-                },
-                pendingTruncates: sessionPendingTruncatesBinding,
-                pendingDeletes: sessionPendingDeletesBinding,
-                tableOperationOptions: sessionTableOperationOptionsBinding,
-                databaseType: currentSession.connection.type,
-                connectionId: currentSession.connection.id,
-                coordinator: sessionState.coordinator
-            )
+            sidebarBody(currentSession: currentSession, sessionState: sessionState)
+                .transaction { $0.animation = nil }
         } else {
             Color.clear
         }
     }
 
+    @ViewBuilder
+    private func sidebarBody(
+        currentSession: ConnectionSession,
+        sessionState: SessionStateFactory.SessionState
+    ) -> some View {
+        SidebarView(
+            sidebarState: SharedSidebarState.forConnection(currentSession.connection.id),
+            onDoubleClick: { [weak self] table in
+                guard let coordinator = self?.sessionState?.coordinator else { return }
+                let connectionId = coordinator.connectionId
+                let isView = table.type == .view
+                if let preview = WindowLifecycleMonitor.shared.previewWindow(for: connectionId),
+                   let previewCoordinator = MainContentCoordinator.coordinator(for: preview.windowId) {
+                    if previewCoordinator.tabManager.selectedTab?.tableContext.tableName == table.name {
+                        previewCoordinator.promotePreviewTab()
+                    } else {
+                        previewCoordinator.promotePreviewTab()
+                        coordinator.openTableTab(table.name, isView: isView)
+                    }
+                } else {
+                    coordinator.promotePreviewTab()
+                    coordinator.openTableTab(table.name, isView: isView)
+                }
+            },
+            pendingTruncates: sessionPendingTruncatesBinding,
+            pendingDeletes: sessionPendingDeletesBinding,
+            tableOperationOptions: sessionTableOperationOptionsBinding,
+            databaseType: currentSession.connection.type,
+            connectionId: currentSession.connection.id,
+            coordinator: sessionState.coordinator
+        )
+    }
+
     @ViewBuilder
     private func buildDetailView() -> some View {
         if let currentSession, let rightPanelState, let sessionState {

TablePro/Core/Services/Infrastructure/SidebarContainerViewController.swift

@@ -2,9 +2,6 @@
 //  SidebarContainerViewController.swift
 //  TablePro
 //
-//  AppKit container that places a native NSSearchField above the SwiftUI sidebar content.
-//  The search field inherits sidebar vibrancy from the NSSplitViewItem automatically.
-//
 
 import AppKit
 import SwiftUI
@@ -14,6 +11,7 @@ internal final class SidebarContainerViewController: NSViewController {
     private let searchField = NSSearchField()
     private var hostingController: NSHostingController<AnyView>
     private var sidebarState: SharedSidebarState?
+    private var windowState: WindowSidebarState?
     private var observationGeneration = 0
 
     var rootView: AnyView {
@@ -59,53 +57,76 @@ internal final class SidebarContainerViewController: NSViewController {
         ])
     }
 
-    // MARK: - State Management
-
-    func updateSidebarState(_ state: SharedSidebarState?) {
+    func updateSidebarState(_ state: SharedSidebarState?, windowState: WindowSidebarState?) {
         observationGeneration += 1
-        sidebarState = state
-        guard let state else {
+        self.sidebarState = state
+        self.windowState = windowState
+        guard let state, let windowState else {
             searchField.isHidden = true
             return
         }
         searchField.isHidden = false
-        syncFromState(state)
-        startObserving(state, generation: observationGeneration)
+        syncFromState(state, windowState: windowState)
+        startObserving(state, windowState: windowState, generation: observationGeneration)
     }
 
-    private func startObserving(_ state: SharedSidebarState, generation: Int) {
+    private func startObserving(
+        _ state: SharedSidebarState,
+        windowState: WindowSidebarState,
+        generation: Int
+    ) {
         withObservationTracking {
             _ = state.searchText
             _ = state.selectedSidebarTab
+            _ = windowState.favoritesSearchText
         } onChange: { [weak self] in
             Task { @MainActor [weak self] in
-                guard let self, generation == self.observationGeneration,
-                      let sidebarState = self.sidebarState else { return }
-                self.syncFromState(sidebarState)
-                self.startObserving(sidebarState, generation: generation)
+                guard let self,
+                      generation == self.observationGeneration,
+                      let sidebarState = self.sidebarState,
+                      let windowState = self.windowState else { return }
+                self.syncFromState(sidebarState, windowState: windowState)
+                self.startObserving(sidebarState, windowState: windowState, generation: generation)
             }
         }
     }
 
-    private func syncFromState(_ state: SharedSidebarState) {
-        if searchField.stringValue != state.searchText {
-            searchField.stringValue = state.searchText
+    private func syncFromState(_ state: SharedSidebarState, windowState: WindowSidebarState) {
+        let activeText: String
+        let placeholder: String
+        switch state.selectedSidebarTab {
+        case .tables:
+            activeText = state.searchText
+            placeholder = String(localized: "Filter")
+        case .favorites:
+            activeText = windowState.favoritesSearchText
+            placeholder = String(localized: "Filter favorites")
+        }
+
+        if searchField.stringValue != activeText {
+            searchField.stringValue = activeText
         }
-        searchField.placeholderString = state.selectedSidebarTab == .tables
-            ? String(localized: "Filter")
-            : String(localized: "Filter favorites")
+        searchField.placeholderString = placeholder
     }
 }
 
-// MARK: - NSSearchFieldDelegate
-
 extension SidebarContainerViewController: NSSearchFieldDelegate {
     func controlTextDidChange(_ obj: Notification) {
         guard let field = obj.object as? NSSearchField else { return }
-        sidebarState?.searchText = field.stringValue
+        writeSearchText(field.stringValue)
     }
 
     func searchFieldDidEndSearching(_ sender: NSSearchField) {
-        sidebarState?.searchText = ""
+        writeSearchText("")
+    }
+
+    private func writeSearchText(_ text: String) {
+        guard let sidebarState else { return }
+        switch sidebarState.selectedSidebarTab {
+        case .tables:
+            sidebarState.searchText = text
+        case .favorites:
+            windowState?.favoritesSearchText = text
+        }
     }
 }

TablePro/Models/UI/WindowSidebarState.swift

@@ -0,0 +1,13 @@
+//
+//  WindowSidebarState.swift
+//  TablePro
+//
+
+import Foundation
+import Observation
+
+@MainActor
+@Observable
+internal final class WindowSidebarState {
+    var favoritesSearchText: String = ""
+}