Merge pull request #1077 from chenkunqing/codex-fix-mcp-window-open-and-warning

Fix MCP main window reopening logic and remove profiler warning

Author: Scriptwonder

MCPForUnity/Editor/MenuItems/MCPForUnityMenu.cs

@@ -10,14 +10,7 @@ public static class MCPForUnityMenu
         [MenuItem("Window/MCP For Unity/Toggle MCP Window %#m", priority = 1)]
         public static void ToggleMCPWindow()
         {
-            if (MCPForUnityEditorWindow.HasAnyOpenWindow())
-            {
-                MCPForUnityEditorWindow.CloseAllOpenWindows();
-            }
-            else
-            {
-                MCPForUnityEditorWindow.ShowWindow();
-            }
+            MCPForUnityEditorWindow.ShowWindow();
         }
 
         [MenuItem("Window/MCP For Unity/Local Setup Window", priority = 2)]

MCPForUnity/Editor/Tools/Profiler/Operations/SessionOps.cs

@@ -21,7 +21,6 @@ internal static object Start(JObject @params)
 
             UProfiler.enabled = true;
 
-            bool recording = false;
             if (!string.IsNullOrEmpty(logFile))
             {
                 string dir = Path.GetDirectoryName(logFile);
@@ -30,7 +29,6 @@ internal static object Start(JObject @params)
 
                 UProfiler.logFile = logFile;
                 UProfiler.enableBinaryLog = true;
-                recording = true;
             }
 
             if (enableCallstacks)

MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs

@@ -71,11 +71,45 @@ internal static void CloseAllWindows()
             }
         }
 
-        public static void ShowWindow()
-        {
-            var window = GetWindow<MCPForUnityEditorWindow>("MCP For Unity");
-            window.minSize = new Vector2(500, 340);
-        }
+        public static void ShowWindow()
+        {
+            var existingWindows = UnityEngine.Resources.FindObjectsOfTypeAll<MCPForUnityEditorWindow>();
+            MCPForUnityEditorWindow window = null;
+
+            if (existingWindows.Length > 0)
+            {
+                window = existingWindows[0];
+
+                // If multiple instances exist, keep one and close the extras to avoid stale hidden tabs.
+                for (int i = 1; i < existingWindows.Length; i++)
+                {
+                    try
+                    {
+                        existingWindows[i].Close();
+                    }
+                    catch (Exception ex)
+                    {
+                        McpLog.Warn($"Error closing duplicate MCP window: {ex.Message}");
+                    }
+                }
+            }
+            else
+            {
+                window = GetWindow<MCPForUnityEditorWindow>("MCP For Unity");
+            }
+
+            window.titleContent = new GUIContent("MCP For Unity");
+            window.minSize = new Vector2(500, 340);
+
+            if (window.position.width < 100 || window.position.height < 100)
+            {
+                window.position = new Rect(120, 120, 900, 700);
+            }
+
+            window.Show();
+            window.ShowTab();
+            window.Focus();
+        }
 
         // Helper to check and manage open windows from other classes
         public static bool HasAnyOpenWindow()
@@ -125,7 +159,8 @@ public void CreateGUI()
                 return;
             }
 
-            visualTree.CloneTree(rootVisualElement);
+            rootVisualElement.Clear();
+            visualTree.CloneTree(rootVisualElement);
 
             // Load main window USS
             var mainStyleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>(