fix: move suppression flag to connection handlers, fix sidebar width, add tests

Author: datlechin

TablePro/AppDelegate+ConnectionHandler.swift

@@ -70,6 +70,7 @@ extension AppDelegate {
         openNewConnectionWindow(for: connection)
 
         Task { @MainActor in
+            defer { self.endFileOpenSuppression() }
             do {
                 try await DatabaseManager.shared.connectToSession(connection)
                 for window in NSApp.windows where self.isWelcomeWindow(window) {
@@ -116,6 +117,7 @@ extension AppDelegate {
         openNewConnectionWindow(for: connection)
 
         Task { @MainActor in
+            defer { self.endFileOpenSuppression() }
             do {
                 try await DatabaseManager.shared.connectToSession(connection)
                 for window in NSApp.windows where self.isWelcomeWindow(window) {
@@ -161,6 +163,7 @@ extension AppDelegate {
         openNewConnectionWindow(for: connection)
 
         Task { @MainActor in
+            defer { self.endFileOpenSuppression() }
             do {
                 try await DatabaseManager.shared.connectToSession(connection)
                 for window in NSApp.windows where self.isWelcomeWindow(window) {
@@ -206,6 +209,7 @@ extension AppDelegate {
         openNewConnectionWindow(for: connection)
 
         Task { @MainActor in
+            defer { self.endFileOpenSuppression() }
             do {
                 try await DatabaseManager.shared.connectToSession(connection)
                 for window in NSApp.windows where self.isWelcomeWindow(window) {
@@ -252,7 +256,7 @@ extension AppDelegate {
                 case .genericDatabaseFile(let url, let dbType): self.handleGenericDatabaseFile(url, type: dbType)
                 }
             }
-            self.scheduleWelcomeWindowSuppression()
+            // Flag management is handled by endFileOpenSuppression() in each handler
         }
     }
 

TablePro/AppDelegate+FileOpen.swift

@@ -53,7 +53,7 @@ extension AppDelegate {
             suppressWelcomeWindow()
             Task { @MainActor in
                 for url in databaseURLs { self.handleDatabaseURL(url) }
-                self.scheduleWelcomeWindowSuppression()
+                // Flag management is handled by endFileOpenSuppression() in each handler
             }
         }
 
@@ -72,7 +72,7 @@ extension AppDelegate {
                         self.handleGenericDatabaseFile(url, type: dbType)
                     }
                 }
-                self.scheduleWelcomeWindowSuppression()
+                // Flag management is handled by endFileOpenSuppression() in each handler
             }
         }
 
@@ -87,7 +87,7 @@ extension AppDelegate {
                     window.close()
                 }
                 NotificationCenter.default.post(name: .openSQLFiles, object: sqlFiles)
-                scheduleWelcomeWindowSuppression()
+                endFileOpenSuppression()
             } else {
                 queuedFileURLs.append(contentsOf: sqlFiles)
                 openWelcomeWindow()

TablePro/AppDelegate+WindowConfig.swift

@@ -190,20 +190,13 @@ extension AppDelegate {
 
     // MARK: - Welcome Window Suppression
 
-    func scheduleWelcomeWindowSuppression() {
-        // The actual welcome window closing is event-driven:
-        // - windowDidBecomeKey closes welcome when a main window appears
-        // - Connection handlers close welcome on success, reopen on failure
-        // This method just manages the suppression counter after a brief delay
-        // to allow those event-driven handlers to fire.
-        Task { @MainActor [weak self] in
-            try? await Task.sleep(for: .milliseconds(500))
-            guard let self else { return }
-            self.closeWelcomeWindowIfMainExists()
-            self.fileOpenSuppressionCount = max(0, self.fileOpenSuppressionCount - 1)
-            if self.fileOpenSuppressionCount == 0 {
-                self.isHandlingFileOpen = false
-            }
+    /// Called by connection handlers when the file-open connection attempt finishes
+    /// (success or failure). Decrements the suppression counter and resets the flag
+    /// when all outstanding file opens have completed.
+    func endFileOpenSuppression() {
+        fileOpenSuppressionCount = max(0, fileOpenSuppressionCount - 1)
+        if fileOpenSuppressionCount == 0 {
+            isHandlingFileOpen = false
         }
     }
 

TablePro/ContentView.swift

@@ -197,8 +197,10 @@ struct ContentView: View {
                     placement: .sidebar,
                     prompt: sidebarSearchPrompt(for: currentSession.connection.id)
                 )
+                .navigationSplitViewColumnWidth(min: 200, ideal: 250, max: 600)
             } else {
                 Color.clear
+                    .navigationSplitViewColumnWidth(min: 200, ideal: 250, max: 600)
             }
         } detail: {
             // MARK: - Detail (Main workspace with optional right sidebar)
@@ -250,7 +252,6 @@ struct ContentView: View {
                 .frame(maxWidth: .infinity, maxHeight: .infinity)
             }
         }
-        .navigationSplitViewColumnWidth(min: 200, ideal: 250, max: 600)
         .navigationTitle(windowTitle)
         .navigationSubtitle(currentSession?.connection.name ?? "")
     }

TableProTests/Core/Services/WelcomeWindowSuppressionTests.swift

@@ -218,35 +218,69 @@ struct WelcomeWindowSuppressionTests {
         #expect(delegate.isHandlingFileOpen == true)
     }
 
-    @Test("fileOpenSuppressionCount decrement to zero resets isHandlingFileOpen")
-    func countZeroResetsFlag() {
+    @Test("endFileOpenSuppression — decrement to zero resets isHandlingFileOpen")
+    func endSuppressionResetsFlag() {
         let delegate = makeAppDelegate()
         delegate.isHandlingFileOpen = true
         delegate.fileOpenSuppressionCount = 1
 
-        // Simulate what scheduleWelcomeWindowSuppression does at the end
-        delegate.fileOpenSuppressionCount = max(0, delegate.fileOpenSuppressionCount - 1)
-        if delegate.fileOpenSuppressionCount == 0 {
-            delegate.isHandlingFileOpen = false
-        }
+        delegate.endFileOpenSuppression()
 
         #expect(delegate.fileOpenSuppressionCount == 0)
         #expect(delegate.isHandlingFileOpen == false)
     }
 
-    @Test("fileOpenSuppressionCount decrement keeps flag true while count > 0")
-    func countPositiveKeepsFlag() {
+    @Test("endFileOpenSuppression — keeps flag true while count > 0")
+    func endSuppressionKeepsFlagWhilePositive() {
         let delegate = makeAppDelegate()
         delegate.isHandlingFileOpen = true
         delegate.fileOpenSuppressionCount = 2
 
-        // Simulate one decrement
-        delegate.fileOpenSuppressionCount = max(0, delegate.fileOpenSuppressionCount - 1)
-        if delegate.fileOpenSuppressionCount == 0 {
-            delegate.isHandlingFileOpen = false
-        }
+        delegate.endFileOpenSuppression()
 
         #expect(delegate.fileOpenSuppressionCount == 1)
         #expect(delegate.isHandlingFileOpen == true)
     }
+
+    // MARK: - Main Window Becomes Key
+
+    @Test("windowDidBecomeKey — main window appearing closes welcome during file open")
+    func windowDidBecomeKeyMainWindowClosesWelcome() {
+        let delegate = makeAppDelegate()
+        delegate.isHandlingFileOpen = true
+
+        let welcome = makeWindow(identifier: "welcome")
+        welcome.orderFront(nil)
+        defer { welcome.close() }
+
+        let mainWin = makeWindow(identifier: "main")
+        mainWin.orderFront(nil)
+        defer { mainWin.close() }
+
+        // Simulate main window becoming key — should close welcome
+        let notification = Notification(name: NSWindow.didBecomeKeyNotification, object: mainWin)
+        delegate.windowDidBecomeKey(notification)
+
+        #expect(!welcome.isVisible)
+    }
+
+    @Test("windowDidBecomeKey — main window does not close welcome when not handling file open")
+    func windowDidBecomeKeyMainWindowNoEffectWhenNotHandling() {
+        let delegate = makeAppDelegate()
+        delegate.isHandlingFileOpen = false
+
+        let welcome = makeWindow(identifier: "welcome")
+        welcome.orderFront(nil)
+        defer { welcome.close() }
+
+        let mainWin = makeWindow(identifier: "main")
+        mainWin.orderFront(nil)
+        defer { mainWin.close() }
+
+        let notification = Notification(name: NSWindow.didBecomeKeyNotification, object: mainWin)
+        delegate.windowDidBecomeKey(notification)
+
+        // Welcome should remain visible — no suppression active
+        #expect(welcome.isVisible)
+    }
 }