fix: add cross-window deduplication and restore SSH error tests

Author: datlechin

TablePro/Core/Services/Infrastructure/WindowLifecycleMonitor.swift

@@ -22,6 +22,7 @@ internal final class WindowLifecycleMonitor {
     }
 
     private var entries: [UUID: Entry] = [:]
+    private var sourceFileWindows: [URL: UUID] = [:]
 
     private init() {}
 
@@ -66,6 +67,7 @@ internal final class WindowLifecycleMonitor {
 
     /// Remove the UUID mapping for a window.
     internal func unregisterWindow(for windowId: UUID) {
+        unregisterSourceFiles(for: windowId)
         guard let entry = entries.removeValue(forKey: windowId) else { return }
 
         if let observer = entry.observer {
@@ -147,6 +149,29 @@ internal final class WindowLifecycleMonitor {
         entries[windowId]?.isPreview = isPreview
     }
 
+    // MARK: - Source File Tracking
+
+    internal func registerSourceFile(_ url: URL, windowId: UUID) {
+        sourceFileWindows[url] = windowId
+    }
+
+    internal func unregisterSourceFile(_ url: URL) {
+        sourceFileWindows.removeValue(forKey: url)
+    }
+
+    internal func unregisterSourceFiles(for windowId: UUID) {
+        sourceFileWindows = sourceFileWindows.filter { $0.value != windowId }
+    }
+
+    internal func window(forSourceFile url: URL) -> NSWindow? {
+        guard let windowId = sourceFileWindows[url] else { return nil }
+        guard let window = entries[windowId]?.window else {
+            sourceFileWindows.removeValue(forKey: url)
+            return nil
+        }
+        return window
+    }
+
     // MARK: - Private
 
     /// Remove entries whose window has already been deallocated.
@@ -172,6 +197,7 @@ internal final class WindowLifecycleMonitor {
         if let observer = entry.observer {
             NotificationCenter.default.removeObserver(observer)
         }
+        unregisterSourceFiles(for: windowId)
         entries.removeValue(forKey: windowId)
 
         let hasRemainingWindows = entries.values.contains {

TablePro/Views/Main/MainContentCommandActions.swift

@@ -574,6 +574,11 @@ final class MainContentCommandActions {
 
         Task { @MainActor in
             for url in urls {
+                if let existingWindow = WindowLifecycleMonitor.shared.window(forSourceFile: url) {
+                    existingWindow.makeKeyAndOrderFront(nil)
+                    continue
+                }
+
                 let content = await Task.detached(priority: .userInitiated) { () -> String? in
                     do {
                         return try String(contentsOf: url, encoding: .utf8)

TablePro/Views/Main/MainContentView.swift

@@ -511,6 +511,9 @@ struct MainContentView: View {
                     coordinator.needsLazyLoad = true
                 }
             }
+            if let sourceURL = payload.sourceFileURL {
+                WindowLifecycleMonitor.shared.registerSourceFile(sourceURL, windowId: windowId)
+            }
             return
         }
 

TableProTests/Core/SSH/SSHTunnelErrorTests.swift

@@ -0,0 +1,61 @@
+//
+//  SSHTunnelErrorTests.swift
+//  TableProTests
+//
+//  Tests for SSHTunnelError descriptions and isLocalPortBindFailure classification.
+//
+
+import Foundation
+@testable import TablePro
+import Testing
+
+@Suite("SSHTunnelError")
+struct SSHTunnelErrorTests {
+    // MARK: - Port Bind Failure Classification
+
+    @Test("isLocalPortBindFailure detects 'already in use' pattern")
+    func bindFailureAlreadyInUse() {
+        #expect(SSHTunnelManager.isLocalPortBindFailure("Address already in use"))
+    }
+
+    @Test("isLocalPortBindFailure is case-insensitive")
+    func bindFailureCaseInsensitive() {
+        #expect(SSHTunnelManager.isLocalPortBindFailure("ADDRESS ALREADY IN USE"))
+    }
+
+    @Test("isLocalPortBindFailure returns false for unrelated SSH errors")
+    func nonBindFailures() {
+        #expect(!SSHTunnelManager.isLocalPortBindFailure("Permission denied"))
+        #expect(!SSHTunnelManager.isLocalPortBindFailure("Connection refused"))
+        #expect(!SSHTunnelManager.isLocalPortBindFailure("Host key verification failed"))
+        #expect(!SSHTunnelManager.isLocalPortBindFailure(""))
+    }
+
+    // MARK: - Error Descriptions
+
+    @Test("SSHTunnelError.noAvailablePort has a localized description")
+    func noAvailablePortDescription() {
+        let error = SSHTunnelError.noAvailablePort
+        #expect(error.errorDescription != nil)
+        #expect(error.errorDescription?.isEmpty == false)
+    }
+
+    @Test("SSHTunnelError.authenticationFailed has a localized description")
+    func authenticationFailedDescription() {
+        let error = SSHTunnelError.authenticationFailed
+        #expect(error.errorDescription != nil)
+    }
+
+    @Test("SSHTunnelError.tunnelAlreadyExists includes connection ID in description")
+    func tunnelAlreadyExistsDescription() {
+        let id = UUID()
+        let error = SSHTunnelError.tunnelAlreadyExists(id)
+        #expect(error.errorDescription?.contains(id.uuidString) == true)
+    }
+
+    @Test("SSHTunnelError.connectionTimeout has a localized description")
+    func connectionTimeoutDescription() {
+        let error = SSHTunnelError.connectionTimeout
+        #expect(error.errorDescription != nil)
+    }
+}

TableProTests/Models/SQLFileDeduplicationTests.swift

@@ -7,6 +7,7 @@
 //  and deduplication logic in QueryTabManager.
 //
 
+import AppKit
 import Foundation
 @testable import TablePro
 import Testing
@@ -190,3 +191,74 @@ struct PersistedTabSourceFileURLTests {
         #expect(decoded.sourceFileURL == nil)
     }
 }
+
+// MARK: - WindowLifecycleMonitor Source File Tracking Tests
+
+@Suite("WindowLifecycleMonitor source file tracking")
+@MainActor
+struct WindowLifecycleMonitorSourceFileTests {
+    @Test("window(forSourceFile:) returns nil for unregistered URL")
+    func unregisteredURLReturnsNil() {
+        let url = URL(fileURLWithPath: "/tmp/unknown.sql")
+        #expect(WindowLifecycleMonitor.shared.window(forSourceFile: url) == nil)
+    }
+
+    @Test("registerSourceFile and window(forSourceFile:) round-trip when window is alive")
+    func registerAndFindSourceFile() {
+        let url = URL(fileURLWithPath: "/tmp/registered.sql")
+        let windowId = UUID()
+        let window = NSWindow()
+
+        WindowLifecycleMonitor.shared.register(
+            window: window,
+            connectionId: UUID(),
+            windowId: windowId
+        )
+        WindowLifecycleMonitor.shared.registerSourceFile(url, windowId: windowId)
+
+        #expect(WindowLifecycleMonitor.shared.window(forSourceFile: url) === window)
+
+        WindowLifecycleMonitor.shared.unregisterSourceFile(url)
+        WindowLifecycleMonitor.shared.unregisterWindow(for: windowId)
+    }
+
+    @Test("unregisterSourceFiles(for:) removes all files for a window")
+    func unregisterAllFilesForWindow() {
+        let url1 = URL(fileURLWithPath: "/tmp/file1.sql")
+        let url2 = URL(fileURLWithPath: "/tmp/file2.sql")
+        let windowId = UUID()
+        let window = NSWindow()
+
+        WindowLifecycleMonitor.shared.register(
+            window: window,
+            connectionId: UUID(),
+            windowId: windowId
+        )
+        WindowLifecycleMonitor.shared.registerSourceFile(url1, windowId: windowId)
+        WindowLifecycleMonitor.shared.registerSourceFile(url2, windowId: windowId)
+
+        WindowLifecycleMonitor.shared.unregisterSourceFiles(for: windowId)
+
+        #expect(WindowLifecycleMonitor.shared.window(forSourceFile: url1) == nil)
+        #expect(WindowLifecycleMonitor.shared.window(forSourceFile: url2) == nil)
+
+        WindowLifecycleMonitor.shared.unregisterWindow(for: windowId)
+    }
+
+    @Test("window(forSourceFile:) returns nil after window is unregistered")
+    func returnsNilAfterWindowUnregistered() {
+        let url = URL(fileURLWithPath: "/tmp/closed.sql")
+        let windowId = UUID()
+        let window = NSWindow()
+
+        WindowLifecycleMonitor.shared.register(
+            window: window,
+            connectionId: UUID(),
+            windowId: windowId
+        )
+        WindowLifecycleMonitor.shared.registerSourceFile(url, windowId: windowId)
+        WindowLifecycleMonitor.shared.unregisterWindow(for: windowId)
+
+        #expect(WindowLifecycleMonitor.shared.window(forSourceFile: url) == nil)
+    }
+}