fix: port change race condition — only restart on enabled/port change, await listener release

Author: datlechin

TablePro/Core/MCP/MCPServer.swift

@@ -92,23 +92,30 @@ actor MCPServer {
         startCleanupTimer()
     }
 
-    func stop() {
+    func stop() async {
         Self.logger.info("Stopping MCP server")
 
         cleanupTask?.cancel()
         cleanupTask = nil
 
         for (_, session) in sessions {
-            Task {
-                await session.cancelAllTasks()
-                await session.cancelSSEConnection()
-            }
+            await session.cancelAllTasks()
+            await session.cancelSSEConnection()
         }
         sessions.removeAll()
 
-        let currentListener = listener
-        listener = nil
-        currentListener?.cancel()
+        if let currentListener = listener {
+            listener = nil
+            currentListener.cancel()
+            // Wait for the listener to fully release the port
+            await withCheckedContinuation { (continuation: CheckedContinuation<Void, Never>) in
+                currentListener.stateUpdateHandler = { state in
+                    if case .cancelled = state {
+                        continuation.resume()
+                    }
+                }
+            }
+        }
 
         stateCallback(.stopped)
     }

TablePro/Core/Storage/AppSettingsManager.swift

@@ -146,12 +146,16 @@ final class AppSettingsManager {
         didSet {
             storage.saveMCP(mcp)
             SyncChangeTracker.shared.markDirty(.settings, id: "mcp")
-            let settings = mcp
-            Task {
-                if settings.enabled {
-                    await MCPServerManager.shared.restart(port: UInt16(clamping: settings.port))
-                } else {
-                    await MCPServerManager.shared.stop()
+            let enabledChanged = mcp.enabled != oldValue.enabled
+            let portChanged = mcp.port != oldValue.port
+            if enabledChanged || portChanged {
+                let settings = mcp
+                Task {
+                    if settings.enabled {
+                        await MCPServerManager.shared.restart(port: UInt16(clamping: settings.port))
+                    } else {
+                        await MCPServerManager.shared.stop()
+                    }
                 }
             }
         }