TableProApp
diff --git a/‎CHANGELOG.md‎
Lines changed: 12 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎TablePro/AppDelegate+ConnectionHandler.swift‎
Lines changed: 13 additions & 13 deletions b/‎TablePro/AppDelegate+ConnectionHandler.swift‎
Lines changed: 13 additions & 13 deletions
diff --git a/‎TablePro/AppDelegate+FileOpen.swift‎
Lines changed: 87 additions & 26 deletions b/‎TablePro/AppDelegate+FileOpen.swift‎
Lines changed: 87 additions & 26 deletions
@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- In-app tab bar with instant switching, drag reorder, pinned tabs, and dirty indicators
+- Reopen closed tab (Cmd+Shift+T), MRU tab selection on close
+- Deeplinks and Handoff route to in-app tabs instead of creating duplicate windows
+
+### Changed
+
+- Replace native macOS window tabs with in-app tab bar (600ms+ → instant)
+- Tab content preserved across switches (no view destruction/recreation)
+- Connection state persisted incrementally (survives force quit)
+
 ### Fixed
 
 - Raw SQL injection via external URL scheme deeplinks — now requires user confirmation
 
@@ -92,9 +92,7 @@ extension AppDelegate {
             do {
                 try await DatabaseManager.shared.connectToSession(connection)
                 self.openNewConnectionWindow(for: connection)
-                for window in NSApp.windows where self.isWelcomeWindow(window) {
-                    window.close()
-                }
+                self.closeAllWelcomeWindows()
                 self.handlePostConnectionActions(parsed, connectionId: connection.id)
             } catch {
                 connectionLogger.error("Database URL connect failed: \(error.localizedDescription)")
@@ -143,9 +141,7 @@ extension AppDelegate {
             do {
                 try await DatabaseManager.shared.connectToSession(connection)
                 self.openNewConnectionWindow(for: connection)
-                for window in NSApp.windows where self.isWelcomeWindow(window) {
-                    window.close()
-                }
+                self.closeAllWelcomeWindows()
             } catch {
                 connectionLogger.error("SQLite file open failed for '\(filePath, privacy: .public)': \(error.localizedDescription)")
                 await self.handleConnectionFailure(error)
@@ -193,9 +189,7 @@ extension AppDelegate {
             do {
                 try await DatabaseManager.shared.connectToSession(connection)
                 self.openNewConnectionWindow(for: connection)
-                for window in NSApp.windows where self.isWelcomeWindow(window) {
-                    window.close()
-                }
+                self.closeAllWelcomeWindows()
             } catch {
                 connectionLogger.error("DuckDB file open failed for '\(filePath, privacy: .public)': \(error.localizedDescription)")
                 await self.handleConnectionFailure(error)
@@ -243,9 +237,7 @@ extension AppDelegate {
             do {
                 try await DatabaseManager.shared.connectToSession(connection)
                 self.openNewConnectionWindow(for: connection)
-                for window in NSApp.windows where self.isWelcomeWindow(window) {
-                    window.close()
-                }
+                self.closeAllWelcomeWindows()
             } catch {
                 connectionLogger.error("File open failed for '\(filePath, privacy: .public)' (\(dbType.rawValue)): \(error.localizedDescription)")
                 await self.handleConnectionFailure(error)
@@ -350,7 +342,9 @@ extension AppDelegate {
                     tableName: tableName,
                     isView: parsed.isView
                 )
-                WindowOpener.shared.openNativeTab(payload)
+                if !routeToExistingWindow(connectionId: connectionId, payload: payload) {
+                    WindowOpener.shared.openNativeTab(payload)
+                }
 
                 if parsed.filterColumn != nil || parsed.filterCondition != nil {
                     await waitForNotification(.refreshData, timeout: .seconds(3))
@@ -475,6 +469,12 @@ extension AppDelegate {
         return "\(parsed.type.rawValue):\(parsed.username)@\(parsed.host):\(parsed.port ?? 0)/\(parsed.database)\(rdb)"
     }
 
+    func closeAllWelcomeWindows() {
+        for window in NSApp.windows where isWelcomeWindow(window) {
+            window.close()
+        }
+    }
+
     func bringConnectionWindowToFront(_ connectionId: UUID) {
         let windows = WindowLifecycleMonitor.shared.windows(for: connectionId)
         if let window = windows.first {
 
@@ -32,31 +32,39 @@ extension AppDelegate {
 
         let tableName = activity.userInfo?["tableName"] as? String
 
+        // Already connected — route to existing window's in-app tab bar
         if DatabaseManager.shared.activeSessions[connectionId]?.driver != nil {
             if let tableName {
                 let payload = EditorTabPayload(connectionId: connectionId, tabType: .table, tableName: tableName)
-                WindowOpener.shared.openNativeTab(payload)
-            } else {
-                for window in NSApp.windows where isMainWindow(window) {
-                    window.makeKeyAndOrderFront(nil)
-                    return
+                if !routeToExistingWindow(connectionId: connectionId, payload: payload) {
+                    WindowOpener.shared.openNativeTab(payload)
                 }
+            } else {
+                bringConnectionWindowToFront(connectionId)
             }
             return
         }
 
-        let initialPayload = EditorTabPayload(connectionId: connectionId)
+        // Window already pending (e.g., auto-reconnect in progress) — just bring to front
+        let hasPending = WindowOpener.shared.pendingPayloads.contains { $0.connectionId == connectionId }
+        if hasPending {
+            bringConnectionWindowToFront(connectionId)
+            return
+        }
+
+        // Not connected — create window, connect, then route content as in-app tab
+        let initialPayload = EditorTabPayload(connectionId: connectionId, intent: .restoreOrDefault)
         WindowOpener.shared.openNativeTab(initialPayload)
 
         Task { @MainActor in
             do {
                 try await DatabaseManager.shared.connectToSession(connection)
-                for window in NSApp.windows where self.isWelcomeWindow(window) {
-                    window.close()
-                }
+                self.closeAllWelcomeWindows()
                 if let tableName {
                     let payload = EditorTabPayload(connectionId: connectionId, tabType: .table, tableName: tableName)
-                    WindowOpener.shared.openNativeTab(payload)
+                    if !routeToExistingWindow(connectionId: connectionId, payload: payload) {
+                        WindowOpener.shared.openNativeTab(payload)
+                    }
                 }
             } catch {
                 fileOpenLogger.error("Handoff connect failed: \(error.localizedDescription)")
@@ -86,6 +94,11 @@ extension AppDelegate {
     // MARK: - Main Dispatch
 
     func handleOpenURLs(_ urls: [URL]) {
+        // application(_:open:) fires in the same run loop pass as applicationDidFinishLaunching
+        // on cold launch from URL. The deferred auto-reconnect Task yields to the next run loop,
+        // so this flag is guaranteed to be set before the Task checks it.
+        suppressAutoReconnect = true
+
         let deeplinks = urls.filter { $0.scheme == "tablepro" }
         if !deeplinks.isEmpty {
             Task { @MainActor in
@@ -143,9 +156,7 @@ extension AppDelegate {
                 for window in NSApp.windows where isMainWindow(window) {
                     window.makeKeyAndOrderFront(nil)
                 }
-                for window in NSApp.windows where isWelcomeWindow(window) {
-                    window.close()
-                }
+                closeAllWelcomeWindows()
                 NotificationCenter.default.post(name: .openSQLFiles, object: sqlFiles)
                 endFileOpenSuppression()
             } else {
@@ -155,6 +166,36 @@ extension AppDelegate {
         }
     }
 
+    // MARK: - In-App Tab Routing
+
+    /// Route content to an existing connection window's in-app tab bar when possible.
+    /// Returns true if the content was routed to an existing window.
+    /// Falls back gracefully (returns false) when no coordinator exists for the connection.
+    @discardableResult
+    func routeToExistingWindow(
+        connectionId: UUID,
+        payload: EditorTabPayload
+    ) -> Bool {
+        guard let coordinator = MainContentCoordinator.firstCoordinator(for: connectionId) else {
+            return false
+        }
+        switch payload.tabType {
+        case .table:
+            if let tableName = payload.tableName {
+                coordinator.openTableTab(tableName, showStructure: payload.showStructure, isView: payload.isView)
+            }
+        case .query:
+            coordinator.tabManager.addTab(
+                initialQuery: payload.initialQuery,
+                databaseName: payload.databaseName ?? coordinator.connection.database
+            )
+        default:
+            coordinator.addNewQueryTab()
+        }
+        coordinator.contentWindow?.makeKeyAndOrderFront(nil)
+        return true
+    }
+
     // MARK: - Welcome Window Suppression
 
     func suppressWelcomeWindow() {
@@ -216,7 +257,7 @@ extension AppDelegate {
         makePayload: (@Sendable (UUID) -> EditorTabPayload)? = nil
     ) {
         guard let connection = DeeplinkHandler.resolveConnection(named: connectionName) else {
-            fileOpenLogger.error("Deep link: no connection named '\(connectionName, privacy: .public)'")
+            fileOpenLogger.error("No connection named '\(connectionName, privacy: .public)'")
             AlertHelper.showErrorSheet(
                 title: String(localized: "Connection Not Found"),
                 message: String(format: String(localized: "No saved connection named \"%@\"."), connectionName),
@@ -225,27 +266,47 @@ extension AppDelegate {
             return
         }
 
-        if DatabaseManager.shared.activeSessions[connection.id]?.driver != nil {
+        let hasDriver = DatabaseManager.shared.activeSessions[connection.id]?.driver != nil
+        let hasCoordinator = MainContentCoordinator.firstCoordinator(for: connection.id) != nil
+
+        // Already connected — route to existing window's in-app tab bar
+        if hasDriver {
             if let payload = makePayload?(connection.id) {
-                WindowOpener.shared.openNativeTab(payload)
-            } else {
-                for window in NSApp.windows where isMainWindow(window) {
-                    window.makeKeyAndOrderFront(nil)
-                    return
+                if !routeToExistingWindow(connectionId: connection.id, payload: payload) {
+                    WindowOpener.shared.openNativeTab(payload)
                 }
+            } else {
+                bringConnectionWindowToFront(connection.id)
             }
             return
         }
 
+        // Prevent duplicate connections from rapid deeplink invocations
+        let hasPendingWindow = WindowOpener.shared.pendingPayloads.contains { $0.connectionId == connection.id }
+        let isAlreadyConnecting = connectingURLConnectionIds.contains(connection.id)
+        guard !isAlreadyConnecting, !hasPendingWindow else {
+            bringConnectionWindowToFront(connection.id)
+            return
+        }
+
+        // Has coordinator but no driver — window exists, connection may be in progress
+        if hasCoordinator {
+            bringConnectionWindowToFront(connection.id)
+            return
+        }
+
         let hadExistingMain = NSApp.windows.contains { isMainWindow($0) && $0.isVisible }
         if hadExistingMain && !AppSettingsManager.shared.tabs.groupAllConnectionTabs {
             NSWindow.allowsAutomaticWindowTabbing = false
         }
 
-        let deeplinkPayload = EditorTabPayload(connectionId: connection.id)
+        connectingURLConnectionIds.insert(connection.id)
+
+        let deeplinkPayload = EditorTabPayload(connectionId: connection.id, intent: .restoreOrDefault)
         WindowOpener.shared.openNativeTab(deeplinkPayload)
 
         Task { @MainActor in
+            defer { self.connectingURLConnectionIds.remove(connection.id) }
             do {
                 // Confirm pre-connect script if present (deep links are external, so always confirm)
                 if let script = connection.preConnectScript,
@@ -262,14 +323,14 @@ extension AppDelegate {
                 }
 
                 try await DatabaseManager.shared.connectToSession(connection)
-                for window in NSApp.windows where self.isWelcomeWindow(window) {
-                    window.close()
-                }
+                self.closeAllWelcomeWindows()
                 if let payload = makePayload?(connection.id) {
-                    WindowOpener.shared.openNativeTab(payload)
+                    if !self.routeToExistingWindow(connectionId: connection.id, payload: payload) {
+                        WindowOpener.shared.openNativeTab(payload)
+                    }
                 }
             } catch {
-                fileOpenLogger.error("Deep link connect failed: \(error.localizedDescription)")
+                fileOpenLogger.error("Deeplink connect failed for \"\(connectionName, privacy: .public)\": \(error.localizedDescription, privacy: .public)")
                 await self.handleConnectionFailure(error)
             }
         }