fix: eliminate new tab flicker, fix tab ordering, add unified toolbar style

Author: datlechin

TablePro/AppDelegate+WindowConfig.swift

@@ -277,7 +277,8 @@ extension AppDelegate {
                 $0 !== window && isMainWindow($0) && $0.isVisible
                     && $0.tabbingIdentifier == resolvedIdentifier
             }) {
-                existingWindow.addTabbedWindow(window, ordered: .above)
+                let targetWindow = existingWindow.tabbedWindows?.last ?? existingWindow
+                targetWindow.addTabbedWindow(window, ordered: .above)
                 window.makeKeyAndOrderFront(nil)
             }
         }

TablePro/ContentView.swift

@@ -48,6 +48,24 @@ struct ContentView: View {
             defaultTitle = "SQL Query"
         }
         _windowTitle = State(initialValue: defaultTitle)
+
+        // For Cmd+T (new tab), the session already exists. Resolve synchronously
+        // to avoid the "Connecting..." flash while waiting for async onChange.
+        var resolvedSession: ConnectionSession?
+        if let connectionId = payload?.connectionId {
+            resolvedSession = DatabaseManager.shared.activeSessions[connectionId]
+        }
+        _currentSession = State(initialValue: resolvedSession)
+
+        if let session = resolvedSession {
+            _rightPanelState = State(initialValue: RightPanelState())
+            _sessionState = State(initialValue: SessionStateFactory.create(
+                connection: session.connection, payload: payload
+            ))
+        } else {
+            _rightPanelState = State(initialValue: nil)
+            _sessionState = State(initialValue: nil)
+        }
     }
 
     var body: some View {

TablePro/Core/Services/Infrastructure/SessionStateFactory.swift

@@ -48,7 +48,9 @@ enum SessionStateFactory {
             toolbarSt.databaseName = String(dbIndex)
         }
 
-        // Initialize single tab based on payload
+        // Initialize single tab based on payload.
+        // For isConnectionOnly (Cmd+T new tab), create a default query tab eagerly
+        // so MainContentView doesn't flash "No tabs open" before initializeAndRestoreTabs runs.
         if let payload, !payload.isConnectionOnly {
             switch payload.tabType {
             case .table:
@@ -87,6 +89,8 @@ enum SessionStateFactory {
                     sourceFileURL: payload.sourceFileURL
                 )
             }
+        } else if payload?.isNewTab == true {
+            tabMgr.addTab(databaseName: payload?.databaseName ?? connection.database)
         }
 
         let coord = MainContentCoordinator(

TablePro/Models/Query/EditorTabPayload.swift

@@ -35,6 +35,8 @@ internal struct EditorTabPayload: Codable, Hashable {
     internal let initialFilterState: TabFilterState?
     /// Source file URL for .sql files opened from disk (used for deduplication)
     internal let sourceFileURL: URL?
+    /// Whether this is a Cmd+T new tab (creates default tab eagerly, skips disk restoration)
+    internal let isNewTab: Bool
 
     internal init(
         id: UUID = UUID(),
@@ -48,7 +50,8 @@ internal struct EditorTabPayload: Codable, Hashable {
         skipAutoExecute: Bool = false,
         isPreview: Bool = false,
         initialFilterState: TabFilterState? = nil,
-        sourceFileURL: URL? = nil
+        sourceFileURL: URL? = nil,
+        isNewTab: Bool = false
     ) {
         self.id = id
         self.connectionId = connectionId
@@ -62,6 +65,7 @@ internal struct EditorTabPayload: Codable, Hashable {
         self.isPreview = isPreview
         self.initialFilterState = initialFilterState
         self.sourceFileURL = sourceFileURL
+        self.isNewTab = isNewTab
     }
 
     internal init(from decoder: Decoder) throws {
@@ -78,6 +82,7 @@ internal struct EditorTabPayload: Codable, Hashable {
         isPreview = try container.decodeIfPresent(Bool.self, forKey: .isPreview) ?? false
         initialFilterState = try container.decodeIfPresent(TabFilterState.self, forKey: .initialFilterState)
         sourceFileURL = try container.decodeIfPresent(URL.self, forKey: .sourceFileURL)
+        isNewTab = try container.decodeIfPresent(Bool.self, forKey: .isNewTab) ?? false
     }
 
     /// Whether this payload is a "connection-only" payload — just a connectionId
@@ -101,5 +106,6 @@ internal struct EditorTabPayload: Codable, Hashable {
         self.isPreview = false
         self.initialFilterState = nil
         self.sourceFileURL = tab.sourceFileURL
+        self.isNewTab = false
     }
 }

TablePro/Resources/Localizable.xcstrings

@@ -11305,6 +11305,9 @@
           }
         }
       }
+    },
+    "Enable AI Features" : {
+
     },
     "Enable inline suggestions" : {
       "localizations" : {
@@ -18097,6 +18100,9 @@
           }
         }
       }
+    },
+    "Location" : {
+
     },
     "Maintenance" : {
       "localizations" : {
@@ -18296,6 +18302,9 @@
           }
         }
       }
+    },
+    "Max Bytes Billed" : {
+
     },
     "Max schema tables: %lld" : {
       "localizations" : {
@@ -21411,6 +21420,12 @@
           }
         }
       }
+    },
+    "OAuth Client ID" : {
+
+    },
+    "OAuth Client Secret" : {
+
     },
     "Offset" : {
       "localizations" : {
@@ -23887,6 +23902,9 @@
           }
         }
       }
+    },
+    "Project ID" : {
+
     },
     "Prompt at Connect" : {
       "localizations" : {
@@ -27409,6 +27427,9 @@
           }
         }
       }
+    },
+    "Service Account Key" : {
+
     },
     "Service Name" : {
       "extractionState" : "stale",

TablePro/TableProApp.swift

@@ -468,6 +468,7 @@ struct TableProApp: App {
                 .background(OpenWindowHandler())
         }
         .windowStyle(.automatic)
+        .windowToolbarStyle(.unified)
         .defaultSize(width: 1_200, height: 800)
 
         // Settings Window - opens with Cmd+,

TablePro/Views/Main/MainContentCommandActions.swift

@@ -295,7 +295,8 @@ final class MainContentCommandActions {
         let payload = EditorTabPayload(
             connectionId: connection.id,
             tabType: .query,
-            initialQuery: initialQuery
+            initialQuery: initialQuery,
+            isNewTab: true
         )
         WindowOpener.shared.openNativeTab(payload)
     }

TablePro/Views/Main/MainContentView.swift

@@ -497,7 +497,9 @@ struct MainContentView: View {
         // If other windows already exist for this connection, this is a "new tab"
         // from the native macOS "+" button -- just add a single empty query tab.
         if WindowLifecycleMonitor.shared.hasOtherWindows(for: connection.id, excluding: windowId) {
-            tabManager.addTab(databaseName: connection.database)
+            if tabManager.tabs.isEmpty {
+                tabManager.addTab(databaseName: connection.database)
+            }
             return
         }
 

TableProTests/Views/Main/SessionStateFactoryTests.swift

@@ -122,16 +122,17 @@ struct SessionStateFactoryTests {
         #expect(state.tabManager.tabs.isEmpty)
     }
 
-    @Test("Connection-only payload creates empty tab manager")
+    @Test("Connection-only payload creates a default query tab eagerly")
     @MainActor
-    func connectionOnlyPayload_createsEmptyTabManager() {
+    func connectionOnlyPayload_createsDefaultTab() {
         let conn = TestFixtures.makeConnection()
         // isConnectionOnly is true when tabType == .query, tableName == nil, initialQuery == nil
         let payload = makePayload(connectionId: conn.id, tabType: .query)
 
         let state = SessionStateFactory.create(connection: conn, payload: payload)
 
-        #expect(state.tabManager.tabs.isEmpty)
+        #expect(state.tabManager.tabs.count == 1)
+        #expect(state.tabManager.tabs.first?.tabType == .query)
     }
 
     @Test("Factory is idempotent: two calls produce fresh but equivalent instances")