Refactor and fix issues from CodeRabbit review / CodeRabbit 리뷰 반영: 리팩토링 및 버그 수정

- Prevent process deadlocks in WindowsPlatformDetector and ServerEnvironmentSetup

- Fix logic inversion and cleanup in ServerEnvironmentSetup

- Add file existence check for Python path override

- Ensure thread safety in MCPForUnityEditorWindow status check

- Refactor Python closure in utils.py

- Add missing TryParseVersion in PlatformDetectorBase

Author: choej2303

MCPForUnity/Editor/Dependencies/PlatformDetectors/WindowsPlatformDetector.cs

@@ -233,83 +233,37 @@ private bool TryValidatePython(string pythonPath, out string version, out string
         {
             version = null;
             fullPath = null;
-
-            try
+            
+            // 5 second timeout for validation
+            if (TryExecuteProcess(pythonPath, "--version", 5000, out string output) && output.StartsWith("Python "))
             {
-                var psi = new ProcessStartInfo
-                {
-                    FileName = pythonPath,
-                    Arguments = "--version",
-                    UseShellExecute = false,
-                    RedirectStandardOutput = true,
-                    RedirectStandardError = true,
-                    CreateNoWindow = true
-                };
+                version = output.Substring(7); // Remove "Python " prefix
+                fullPath = pythonPath;
 
-                using var process = Process.Start(psi);
-                if (process == null) return false;
-
-                process.WaitForExit(5000);
-                string output = process.StandardOutput.ReadToEnd().Trim();
-
-                if (process.ExitCode == 0 && output.StartsWith("Python "))
+                // Validate minimum version (Python 4+ or python 3.11+)
+                if (TryParseVersion(version, out var major, out var minor))
                 {
-                    version = output.Substring(7); // Remove "Python " prefix
-                    fullPath = pythonPath;
-
-                    // Validate minimum version (Python 4+ or python 3.11+)
-                    if (TryParseVersion(version, out var major, out var minor))
-                    {
-                        return major > 3 || (major == 3 && minor >= 11);
-                    }
+                    return major > 3 || (major == 3 && minor >= 11);
                 }
             }
-            catch
-            {
-                // Ignore validation errors
-            }
-
             return false;
         }
 
         private bool TryFindInPath(string executable, out string fullPath)
         {
             fullPath = null;
-
-            try
+            
+            // 3 second timeout for 'where'
+            if (TryExecuteProcess("where", executable, 3000, out string output) && !string.IsNullOrEmpty(output))
             {
-                var psi = new ProcessStartInfo
-                {
-                    FileName = "where",
-                    Arguments = executable,
-                    UseShellExecute = false,
-                    RedirectStandardOutput = true,
-                    RedirectStandardError = true,
-                    CreateNoWindow = true
-                };
-
-                using var process = Process.Start(psi);
-                if (process == null) return false;
-
-                process.WaitForExit(3000);
-                string output = process.StandardOutput.ReadToEnd().Trim();
-
-                if (process.ExitCode == 0 && !string.IsNullOrEmpty(output))
-                {
                     // Take the first result
                     var lines = output.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
                     if (lines.Length > 0)
                     {
                         fullPath = lines[0].Trim();
                         return File.Exists(fullPath);
                     }
-                }
             }
-            catch
-            {
-                // Ignore errors
-            }
-
             return false;
         }
     }

MCPForUnity/Editor/Helpers/AssetPathUtility.cs

@@ -139,7 +139,6 @@ public static string GetWrapperJsPath()
                 return wrapperPath;
             }
 
-            // Also check without the ~ just in case
             // Also check without the ~ just in case
             string wrapperPathNoTilde = Path.Combine(Path.GetDirectoryName(wrapperPath), "..", "Server", "wrapper.js");
             if (File.Exists(wrapperPathNoTilde))

MCPForUnity/Editor/Services/PathResolverService.cs

@@ -100,7 +100,7 @@ public string GetPythonPath()
             try
             {
                 string overridePath = EditorPrefs.GetString(EditorPrefKeys.PythonPathOverride, string.Empty);
-                if (!string.IsNullOrEmpty(overridePath))
+                if (!string.IsNullOrEmpty(overridePath) && File.Exists(overridePath))
                 {
                     return overridePath;
                 }
@@ -143,7 +143,11 @@ public bool IsPythonDetected()
                     CreateNoWindow = true
                 };
                 using var p = Process.Start(psi);
-                p.WaitForExit(2000);
+                if (!p.WaitForExit(2000))
+                {
+                    try { p.Kill(); } catch { /* ignore */ }
+                    return false;
+                }
                 return p.ExitCode == 0;
             }
             catch

MCPForUnity/Editor/Services/Transport/Transports/StdioBridgeHost.cs

@@ -520,7 +520,9 @@ private static async Task ListenerLoopAsync(CancellationToken token)
 
                     client.ReceiveTimeout = 60000;
 
-                    // Create and track the client handler task
+                    // Use TaskCompletionSource to ensure the task is tracked in activeClientTasks
+                    // before the handler starts, preventing a race where the handler could complete
+                    // and remove itself before being added to the dictionary.
                     var tcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
                     activeClientTasks.TryAdd(client, tcs.Task);
 

MCPForUnity/Editor/Setup/ServerEnvironmentSetup.cs

@@ -76,7 +76,7 @@ public static void InstallServerEnvironment()
                 if (string.IsNullOrEmpty(uvPath))
                 {
                     EditorUtility.DisplayProgressBar("MCP Setup", "Creating virtual environment...", 0.5f);
-                    if (!CreateVenv(uvPath))
+                    if (!CreateVenv())
                     {
                         EditorUtility.ClearProgressBar();
                         EditorUtility.DisplayDialog("Error", "Failed to create virtual environment.", "OK");
@@ -188,23 +188,17 @@ private static string GetOrInstallUv()
             return null;
         }
 
-        private static bool CreateVenv(string uvPath)
+        /// <summary>
+        /// Creates a Python virtual environment manually. No-op if UV is available (UV handles venv creation).
+        /// </summary>
+        private static bool CreateVenv()
         {
             if (Directory.Exists(VenvPath))
             {
                 McpLog.Info("[MCP Setup] Cleaning existing .venv...");
                 try { Directory.Delete(VenvPath, true); } catch { /* ignore */ }
             }
 
-            // If uv is available, let uv sync handle venv creation automatically.
-            // But if called explicitly, use python venv as fallback.
-            if (!string.IsNullOrEmpty(uvPath))
-            {
-                 // We can skip manual venv creation if using uv sync later, 
-                 // but returning true here keeps the flow consistent.
-                 return true; 
-            }
-
             McpLog.Info($"[MCP Setup] Creating virtual environment at: {VenvPath}");
             return RunCommand(GetPythonCommand(), $"-m venv \"{VenvPath}\"", out string output, workingDirectory: ServerRoot);
         }
@@ -264,8 +258,21 @@ private static bool RunCommand(string fileName, string arguments, out string out
                         return false;
                     }
 
-                    output = p.StandardOutput.ReadToEnd();
-                    string error = p.StandardError.ReadToEnd();
+                    // Read streams asynchronously to prevent deadlock on buffer fill
+                    // Note: ReadToEndAsync is not available in .NET Standard 2.0 (Unity's default profile), using wrapper or async delegate
+                    var outputTask = Task.Run(() => p.StandardOutput.ReadToEnd());
+                    var errorTask = Task.Run(() => p.StandardError.ReadToEnd());
+                    
+                    // 2 minute timeout to prevent hanging indefinitely
+                    if (!p.WaitForExit(120000)) 
+                    {
+                        try { p.Kill(); } catch {}
+                        McpLog.Error($"[MCP Setup] Command timed out: {fileName} {arguments}");
+                        return false;
+                    }
+
+                    output = outputTask.Result;
+                    string error = errorTask.Result;
 
                     // 2 minute timeout to prevent hanging indefinitely
                     if (!p.WaitForExit(120000)) 

MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs

@@ -312,13 +312,12 @@ private void ToggleSetup()
             setupContainer.style.display = isSetupOpen ? DisplayStyle.Flex : DisplayStyle.None;
         }
 
-        private bool isChecking = false;
+        private int _isChecking = 0;
 
         private void CheckSystemStatus()
         {
-            if (isChecking) return;
-            isChecking = true;
-
+            if (System.Threading.Interlocked.CompareExchange(ref _isChecking, 1, 0) != 0) return;
+            
             // Show checking state
             statusText.text = "Checking...";
             statusIndicator.RemoveFromClassList("ready");
@@ -370,7 +369,7 @@ private void CheckSystemStatus()
             }
             finally
             {
-                isChecking = false;
+                System.Threading.Interlocked.Exchange(ref _isChecking, 0);
             }
         }
 

MCPForUnity/Server~/src/services/tools/utils.py

@@ -242,10 +242,10 @@ def apply_edits_locally(original_text: str, edits: list[dict[str, Any]]) -> str:
                     or start_col < 1 or end_col < 1):
                 raise RuntimeError("replace_range out of bounds")
 
-            def index_of(line: int, col: int) -> int:
-                if line <= len(lines):
-                    return sum(len(ln) for ln in lines[: line - 1]) + (col - 1)
-                return sum(len(ln) for ln in lines)
+            def index_of(line: int, col: int, lines_ref: list[str] = lines) -> int:
+                if line <= len(lines_ref):
+                    return sum(len(ln) for ln in lines_ref[: line - 1]) + (col - 1)
+                return sum(len(ln) for ln in lines_ref)
             a = index_of(start_line, start_col)
             b = index_of(end_line, end_col)
             text = text[:a] + replacement + text[b:]