refactor: replace SSH tunnel and window lifecycle notifications with direct calls (#289)

* refactor: replace editor and AI notifications with direct calls

* refactor: replace SSH tunnel and window lifecycle notifications with direct calls

Author: datlechin

TablePro/Core/Database/DatabaseManager.swift

@@ -66,46 +66,7 @@ final class DatabaseManager {
         currentSession?.status ?? .disconnected
     }
 
-    @ObservationIgnored nonisolated(unsafe) private var sshTunnelObserver: NSObjectProtocol?
-    @ObservationIgnored nonisolated(unsafe) private var lastWindowCloseObserver: NSObjectProtocol?
-
-    private init() {
-        // Observe SSH tunnel failures
-        sshTunnelObserver = NotificationCenter.default.addObserver(
-            forName: .sshTunnelDied,
-            object: nil,
-            queue: .main
-        ) { [weak self] notification in
-            guard let connectionId = notification.userInfo?["connectionId"] as? UUID else { return }
-            guard let self else { return }
-
-            Task { @MainActor in
-                await self.handleSSHTunnelDied(connectionId: connectionId)
-            }
-        }
-
-        lastWindowCloseObserver = NotificationCenter.default.addObserver(
-            forName: .lastWindowDidClose,
-            object: nil,
-            queue: .main
-        ) { [weak self] notification in
-            guard let connectionId = notification.userInfo?["connectionId"] as? UUID else { return }
-            guard let self else { return }
-
-            Task { @MainActor in
-                await self.disconnectSession(connectionId)
-            }
-        }
-    }
-
-    deinit {
-        if let sshTunnelObserver {
-            NotificationCenter.default.removeObserver(sshTunnelObserver)
-        }
-        if let lastWindowCloseObserver {
-            NotificationCenter.default.removeObserver(lastWindowCloseObserver)
-        }
-    }
+    private init() {}
 
     // MARK: - Session Management
 
@@ -622,7 +583,7 @@ final class DatabaseManager {
     // MARK: - SSH Tunnel Recovery
 
     /// Handle SSH tunnel death by attempting reconnection with exponential backoff
-    private func handleSSHTunnelDied(connectionId: UUID) async {
+    func handleSSHTunnelDied(connectionId: UUID) async {
         guard let session = activeSessions[connectionId] else { return }
 
         Self.logger.warning("SSH tunnel died for connection: \(session.connection.name)")

TablePro/Core/SSH/SSHTunnelManager.swift

@@ -90,18 +90,7 @@ actor SSHTunnelManager {
     private func handleTunnelDeath(connectionId: UUID) async {
         guard tunnels.removeValue(forKey: connectionId) != nil else { return }
         Self.processRegistry.withLock { $0[connectionId] = nil }
-        await notifyTunnelDied(connectionId: connectionId)
-    }
-
-    /// Notify that a tunnel has died (DatabaseManager should handle reconnection)
-    private func notifyTunnelDied(connectionId: UUID) async {
-        await MainActor.run {
-            NotificationCenter.default.post(
-                name: .sshTunnelDied,
-                object: nil,
-                userInfo: ["connectionId": connectionId]
-            )
-        }
+        await DatabaseManager.shared.handleSSHTunnelDied(connectionId: connectionId)
     }
 
     /// Create an SSH tunnel for a database connection

TablePro/Core/Services/Infrastructure/AppNotifications.swift

@@ -19,8 +19,4 @@ extension Notification.Name {
     static let connectionUpdated = Notification.Name("connectionUpdated")
     static let databaseDidConnect = Notification.Name("databaseDidConnect")
 
-    // MARK: - SSH
-
-    static let sshTunnelDied = Notification.Name("sshTunnelDied")
-    static let lastWindowDidClose = Notification.Name("lastWindowDidClose")
 }

TablePro/Core/Services/Infrastructure/WindowLifecycleMonitor.swift

@@ -149,11 +149,9 @@ internal final class WindowLifecycleMonitor {
 
         let hasRemainingWindows = entries.values.contains { $0.connectionId == closedConnectionId }
         if !hasRemainingWindows {
-            NotificationCenter.default.post(
-                name: .lastWindowDidClose,
-                object: nil,
-                userInfo: ["connectionId": closedConnectionId]
-            )
+            Task {
+                await DatabaseManager.shared.disconnectSession(closedConnectionId)
+            }
         }
     }
 }

docs/development/notification-refactor.md

@@ -194,20 +194,20 @@ Replaced 7 notifications with direct calls. Editor notifications use `@FocusedVa
 
 ## Phase 7: Replace Window Lifecycle Notifications
 
-**Status:** Not started
+**Status:** Done
+
+Replaced 2 singleton-to-singleton notifications with direct method calls. `SSHTunnelManager` calls `DatabaseManager.shared.handleSSHTunnelDied(connectionId:)` directly. `WindowLifecycleMonitor` calls `DatabaseManager.shared.disconnectSession(_:)` directly. Removed notification observers and cleanup from `DatabaseManager`.
 
-### Keep (AppKit → SwiftUI bridge, no alternative):
+### Replaced:
 
-- `openMainWindow` — `AppDelegate` → SwiftUI `openWindow`
-- `openWelcomeWindow` — same
-- `mainWindowWillClose` — `NSWindowDelegate` → tab persistence
+- [x] `lastWindowDidClose` — `WindowLifecycleMonitor` calls `DatabaseManager.shared.disconnectSession(_:)` directly
+- [x] `sshTunnelDied` — `SSHTunnelManager` calls `DatabaseManager.shared.handleSSHTunnelDied(connectionId:)` directly
 
-### Replace:
+### Kept (cross-scene broadcasts, no shared reference):
 
-- [ ] `lastWindowDidClose` — `WindowLifecycleMonitor` → `DatabaseManager`. Use a direct callback/delegate.
-- [ ] `sshTunnelDied` — `SSHTunnelManager` → `DatabaseManager`. Use a closure callback set at tunnel creation.
-- [ ] `connectionUpdated` — `ConnectionFormView` → `WelcomeWindowView`. Use `@Observable ConnectionStorage`.
-- [ ] `newConnection` — menu → welcome/content view. Use `@FocusedValue` or `@Environment(\.openWindow)`.
+- `connectionUpdated` — `ConnectionFormView`/`AppDelegate` → `WelcomeWindowView`
+- `newConnection` — `TableProApp` → `WelcomeWindowView`/`ContentView`
+- `databaseDidConnect` — `DatabaseManager` → `MainContentCommandActions`
 
 ---