docs: update README with new client configurations and build instructions

refactor: simplify connection state management in McpUnityBridge
chore: remove outdated restructuring plan document

Author: CoderGamester

.gitignore

@@ -4,8 +4,6 @@
 #
 **/[Ll]ibrary/
 **/[Tt]emp/
-**/[Bb]uild/
-**/[Bb]uilds/
 **/[Ll]ogs/
 **/[Mm]emoryCaptures/
 **/[Uu]ser[Ss]ettings/
@@ -71,8 +69,6 @@ sysinfo.txt
 **/.utmp/
 **/BuildReports/
 **/BuildReports.meta
-**/Build/
-**/Build.meta
 **/Editor Default Resources/
 **/Editor Default Resources.meta
 **/WebGL Builds/

Editor.meta

@@ -12,6 +12,16 @@
 
 namespace McpUnity.Unity
 {
+    /// <summary>
+    /// Connection state for the MCP Unity Bridge
+    /// </summary>
+    public enum ConnectionState
+    {
+        Disconnected,
+        Connecting,
+        Connected
+    }
+
     /// <summary>
     /// Bridge between Unity and Node.js MCP server.
     /// Handles WebSocket communication and request processing.
@@ -22,7 +32,6 @@ public class McpUnityBridge
         private static McpUnityBridge _instance;
         private ClientWebSocket _webSocket;
         private CancellationTokenSource _cts;
-        private bool _isConnected = false;
         private Dictionary<string, TaskCompletionSource<JObject>> _pendingRequests = new Dictionary<string, TaskCompletionSource<JObject>>();
 
         // Dictionary to store tool instances
@@ -31,6 +40,7 @@ public class McpUnityBridge
         // Events
         public static event Action OnConnected;
         public static event Action OnDisconnected;
+        public static event Action OnConnecting;
         public static event Action<string> OnError;
 
         /// <summary>
@@ -63,9 +73,31 @@ public static McpUnityBridge Instance
         }
 
         /// <summary>
-        /// Whether the bridge is currently connected
+        /// Current connection state mapped from WebSocket state
         /// </summary>
-        public bool IsConnected => _isConnected;
+        public ConnectionState ConnectionState
+        {
+            get
+            {
+                if (_webSocket == null)
+                    return ConnectionState.Disconnected;
+                    
+                switch (_webSocket.State)
+                {
+                    case WebSocketState.Open:
+                        return ConnectionState.Connected;
+                    case WebSocketState.Connecting:
+                        return ConnectionState.Connecting;
+                    case WebSocketState.CloseSent:  // Still finalizing connection
+                    case WebSocketState.CloseReceived:  // Still finalizing connection
+                    case WebSocketState.None:
+                    case WebSocketState.Closed:
+                    case WebSocketState.Aborted:
+                    default:
+                        return ConnectionState.Disconnected;
+                }
+            }
+        }
 
         /// <summary>
         /// Private constructor to enforce singleton pattern
@@ -102,15 +134,19 @@ private void RegisterTools()
         /// </summary>
         public async Task Connect(string url)
         {
-            if (_isConnected) return;
+            // Don't try to connect if already connected or connecting
+            if (ConnectionState != ConnectionState.Disconnected) return;
 
             try
             {
+                // Notify that we're connecting
+                OnConnecting?.Invoke();
+                Debug.Log($"[MCP Unity] Connecting to server at {url}...");
+                
                 _cts = new CancellationTokenSource();
                 _webSocket = new ClientWebSocket();
 
                 await _webSocket.ConnectAsync(new Uri(url), _cts.Token);
-                _isConnected = true;
 
                 Debug.Log($"[MCP Unity] Connected to server at {url}");
                 OnConnected?.Invoke();
@@ -130,13 +166,14 @@ public async Task Connect(string url)
         /// </summary>
         public async Task Disconnect()
         {
-            if (!_isConnected) return;
+            // Only disconnect if connected
+            if (ConnectionState != ConnectionState.Connected) return;
 
             try
             {
-                _cts.Cancel();
+                _cts = null;
+                
                 await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "Closing", CancellationToken.None);
-                _isConnected = false;
 
                 Debug.Log("[MCP Unity] Disconnected from server");
                 OnDisconnected?.Invoke();
@@ -153,7 +190,7 @@ public async Task Disconnect()
         /// </summary>
         public async Task<JObject> SendRequest(string method, JObject parameters)
         {
-            if (!_isConnected)
+            if (ConnectionState != ConnectionState.Connected)
             {
                 throw new InvalidOperationException("Not connected to server");
             }
@@ -206,9 +243,9 @@ public JArray GetToolsMetadata()
         /// </summary>
         private async Task SendMessage(string message)
         {
-            if (!_isConnected || _webSocket.State != WebSocketState.Open)
+            if (ConnectionState != ConnectionState.Connected)
             {
-                throw new InvalidOperationException("WebSocket is not connected");
+                throw new InvalidOperationException("Not connected to server");
             }
 
             byte[] buffer = Encoding.UTF8.GetBytes(message);
@@ -225,7 +262,7 @@ private async Task ReceiveLoop()
 
             try
             {
-                while (_isConnected && !_cts.Token.IsCancellationRequested)
+                while (ConnectionState == ConnectionState.Connected && !_cts.Token.IsCancellationRequested)
                 {
                     StringBuilder messageBuilder = new StringBuilder();
                     WebSocketReceiveResult result;
@@ -259,10 +296,9 @@ private async Task ReceiveLoop()
                 Debug.LogError($"[MCP Unity] WebSocket error: {ex.Message}");
                 OnError?.Invoke(ex.Message);
 
-                if (_isConnected)
+                if (ConnectionState == ConnectionState.Connected)
                 {
-                    _isConnected = false;
-                    OnDisconnected?.Invoke();
+                    await Disconnect();
                 }
             }
         }

Editor/Unity/McpUnityBridge.cs

@@ -14,8 +14,6 @@ namespace McpUnity.Unity
     public class McpUnityEditorWindow : EditorWindow
     {
         private string _statusMessage = "";
-        private MessageType _statusMessageType = MessageType.Info;
-        private double _statusMessageExpireTime = 0;
         private GUIStyle _headerStyle;
         private GUIStyle _subHeaderStyle;
         private GUIStyle _boxStyle;
@@ -35,52 +33,53 @@ public static void ShowWindow()
 
         private void OnEnable()
         {
+            titleContent = new GUIContent("MCP Unity");
+            _statusMessage = "Ready";
+            
             // Subscribe to McpUnityBridge events
             McpUnityBridge.OnConnected += HandleConnected;
             McpUnityBridge.OnDisconnected += HandleDisconnected;
+            McpUnityBridge.OnConnecting += HandleConnecting;
             McpUnityBridge.OnError += HandleError;
 
-            // Set up regular UI updates
-            EditorApplication.update += OnEditorUpdate;
+            InitializeStyles();
         }
 
         private void OnDisable()
         {
             // Unsubscribe from McpUnityBridge events
             McpUnityBridge.OnConnected -= HandleConnected;
             McpUnityBridge.OnDisconnected -= HandleDisconnected;
+            McpUnityBridge.OnConnecting -= HandleConnecting;
             McpUnityBridge.OnError -= HandleError;
-            
-            // Remove editor update callback
-            EditorApplication.update -= OnEditorUpdate;
         }
 
         private void HandleConnected()
         {
-            SetStatusMessage("Connected to server", MessageType.Info);
+            _statusMessage = "Connected";
+            
             Repaint();
         }
 
         private void HandleDisconnected()
         {
-            SetStatusMessage("Disconnected from server", MessageType.Info);
+            _statusMessage = "Disconnected";
+            
             Repaint();
         }
 
-        private void HandleError(string errorMessage)
+        private void HandleConnecting()
         {
-            SetStatusMessage($"Error: {errorMessage}", MessageType.Error);
+            _statusMessage = "Connecting...";
+            
             Repaint();
         }
 
-        private void OnEditorUpdate()
+        private void HandleError(string errorMessage)
         {
-            // Check if status message has expired
-            if (!string.IsNullOrEmpty(_statusMessage) && EditorApplication.timeSinceStartup > _statusMessageExpireTime)
-            {
-                _statusMessage = "";
-                Repaint();
-            }
+            _statusMessage = $"Error: {errorMessage}";
+            
+            Repaint();
         }
 
         private void OnGUI()
@@ -111,7 +110,7 @@ private void OnGUI()
             // Bottom Status bar
             if (!string.IsNullOrEmpty(_statusMessage))
             {
-                EditorGUILayout.HelpBox(_statusMessage, _statusMessageType);
+                EditorGUILayout.HelpBox(_statusMessage, MessageType.Info);
             }
 
             // Version info at the bottom
@@ -131,8 +130,10 @@ private void DrawServerTab()
             EditorGUILayout.BeginHorizontal();
             EditorGUILayout.LabelField("Server Status:", GUILayout.Width(120));
 
-            string statusText = McpUnityBridge.Instance.IsConnected ? "Connected" : "Disconnected";
-            Color statusColor = McpUnityBridge.Instance.IsConnected ? Color.green : Color.red;
+            var connectionState = McpUnityBridge.Instance.ConnectionState;
+            var statusText = connectionState == ConnectionState.Connected ? "Connected" : "Disconnected";
+            var statusColor = connectionState == ConnectionState.Connected  ? Color.green : Color.red;
+            statusColor = connectionState == ConnectionState.Connecting  ? Color.yellow : statusColor;
 
             GUIStyle statusStyle = new GUIStyle(EditorStyles.boldLabel);
             statusStyle.normal.textColor = statusColor;
@@ -155,16 +156,21 @@ private void DrawServerTab()
             // Server control buttons
             EditorGUILayout.BeginHorizontal();
 
-            GUI.enabled = !McpUnityBridge.Instance.IsConnected;
+            // Determine button states based on connection state
+            ConnectionState currentState = McpUnityBridge.Instance.ConnectionState;
+            
+            // Connect button - enabled only when disconnected
+            GUI.enabled = currentState == ConnectionState.Disconnected;
             if (GUILayout.Button("Start Server", GUILayout.Height(30)))
             {
-                StartServer();
+                _ = McpUnityBridge.Instance.Connect(McpUnitySettings.Instance.WebSocketUrl);
             }
 
-            GUI.enabled = McpUnityBridge.Instance.IsConnected;
+            // Disconnect button - enabled only when connected
+            GUI.enabled = currentState == ConnectionState.Connected;
             if (GUILayout.Button("Stop Server", GUILayout.Height(30)))
             {
-                StopServer();
+                _ = McpUnityBridge.Instance.Disconnect();
             }
 
             GUI.enabled = true;
@@ -248,32 +254,6 @@ private void DrawHelpTab()
             EditorGUILayout.EndVertical();
         }
 
-        private async void StartServer()
-        {
-            try
-            {
-                await McpUnityBridge.Instance.Connect(McpUnitySettings.Instance.WebSocketUrl);
-            }
-            catch (Exception ex)
-            {
-                Debug.LogError($"[MCP Unity] Failed to start server: {ex.Message}");
-                EditorUtility.DisplayDialog("Error", $"Failed to start server: {ex.Message}", "OK");
-            }
-        }
-
-        private async void StopServer()
-        {
-            try
-            {
-                await McpUnityBridge.Instance.Disconnect();
-            }
-            catch (Exception ex)
-            {
-                Debug.LogError($"[MCP Unity] Failed to stop server: {ex.Message}");
-                EditorUtility.DisplayDialog("Error", $"Failed to stop server: {ex.Message}", "OK");
-            }
-        }
-
         private void GenerateMcpConfigJson()
         {
             var config = new Dictionary<string, object>
@@ -400,13 +380,6 @@ private void InitializeStyles()
 
             _isInitialized = true;
         }
-
-        private void SetStatusMessage(string message, MessageType type)
-        {
-            _statusMessage = message;
-            _statusMessageType = type;
-            _statusMessageExpireTime = EditorApplication.timeSinceStartup + 5;
-        }
 
         /// <summary>
         /// Creates a label with text that properly wraps based on available width