feat(editor): improve configuration UI and dependency management

- Consolidate settings into Setup and Client Config sections
- Remove redundant 'Advanced Settings' from main settings view
- Implement robust Node.js path fallback logic
- Restore official repository URL as default source
- Enhance dependency status checks and error handling

---

feat(editor): 설정 UI 및 의존성 관리 개선

- 설정을 Setup 및 Client Config 섹션으로 통합
- 메인 설정 뷰에서 중복된 'Advanced Settings' 제거
- 견고한 Node.js 경로 폴백 로직 구현
- 공식 레포지토리 URL을 기본 소스로 복구
- 의존성 상태 확인 및 에러 처리 강화

Author: choej2303

MCPForUnity/Editor/Clients/McpClientConfiguratorBase.cs

@@ -102,6 +102,8 @@ public override McpStatus CheckStatus(bool attemptAutoRewrite = true)
                 string configuredUrl = null;
                 bool configExists = false;
 
+                string command = null;
+
                 if (client.IsVsCodeLayout)
                 {
                     var vsConfig = JsonConvert.DeserializeObject<JToken>(configJson) as JObject;
@@ -115,6 +117,12 @@ public override McpStatus CheckStatus(bool attemptAutoRewrite = true)
                         {
                             configExists = true;
 
+                            var commandToken = unityObj["command"];
+                            if (commandToken != null && commandToken.Type == JTokenType.String)
+                            {
+                                command = commandToken.ToString();
+                            }
+
                             var argsToken = unityObj["args"];
                             if (argsToken is JArray)
                             {
@@ -131,10 +139,31 @@ public override McpStatus CheckStatus(bool attemptAutoRewrite = true)
                 }
                 else
                 {
-                    McpConfig standardConfig = JsonConvert.DeserializeObject<McpConfig>(configJson);
-                    if (standardConfig?.mcpServers?.unityMCP != null)
+                    // Use JObject parsing for flexibility (handling both url and serverUrl without strict model dependency)
+                    var rootObj = JsonConvert.DeserializeObject<JToken>(configJson) as JObject;
+                    var unityToken = rootObj?["mcpServers"]?["unityMCP"];
+                    
+                    if (unityToken is JObject unityObj)
                     {
-                        args = standardConfig.mcpServers.unityMCP.args;
+                        var commandToken = unityObj["command"];
+                        if (commandToken != null && commandToken.Type == JTokenType.String)
+                        {
+                            command = commandToken.ToString();
+                        }
+
+                        var argsToken = unityObj["args"];
+                        if (argsToken is JArray)
+                        {
+                            args = argsToken.ToObject<string[]>();
+                        }
+
+                        // Check for both 'url' (standard) and 'serverUrl' (Antigravity)
+                        var urlToken = unityObj["url"] ?? unityObj["serverUrl"];
+                        if (urlToken != null && urlToken.Type != JTokenType.Null)
+                        {
+                            configuredUrl = urlToken.ToString();
+                        }
+
                         configExists = true;
                     }
                 }
@@ -146,17 +175,39 @@ public override McpStatus CheckStatus(bool attemptAutoRewrite = true)
                 }
 
                 bool matches = false;
-                if (args != null && args.Length > 0)
+                bool useHttpTransport = EditorPrefs.GetBool(EditorPrefKeys.UseHttpTransport, true);
+                
+                if (useHttpTransport)
                 {
-                    string expectedUvxUrl = AssetPathUtility.GetMcpServerGitUrl();
-                    string configuredUvxUrl = McpConfigurationHelper.ExtractUvxUrl(args);
-                    matches = !string.IsNullOrEmpty(configuredUvxUrl) &&
-                              McpConfigurationHelper.PathsEqual(configuredUvxUrl, expectedUvxUrl);
+                    // Check 3: HTTP (Only check this if we are in HTTP mode)
+                    if (!string.IsNullOrEmpty(configuredUrl))
+                    {
+                        string expectedUrl = HttpEndpointUtility.GetMcpRpcUrl();
+                        matches = UrlsEqual(configuredUrl, expectedUrl);
+                    }
                 }
-                else if (!string.IsNullOrEmpty(configuredUrl))
+                else
                 {
-                    string expectedUrl = HttpEndpointUtility.GetMcpRpcUrl();
-                    matches = UrlsEqual(configuredUrl, expectedUrl);
+                    // Check 1: Node.js Wrapper (Stdio) (Only check this if we are in Stdio mode)
+                    string expectedWrapper = AssetPathUtility.GetWrapperJsPath();
+                    if (!string.IsNullOrEmpty(command) && 
+                        Path.GetFileNameWithoutExtension(command).Equals("node", StringComparison.OrdinalIgnoreCase) &&
+                        args != null && args.Length > 0 &&
+                        !string.IsNullOrEmpty(expectedWrapper))
+                    {
+                        if (McpConfigurationHelper.PathsEqual(args[0], expectedWrapper))
+                        {
+                            matches = true;
+                        }
+                    }
+                    // Check 2: UVX (Stdio - Legacy/Fallback)
+                    else if (args != null && args.Length > 0)
+                    {
+                        string expectedUvxUrl = AssetPathUtility.GetMcpServerGitUrl();
+                        string configuredUvxUrl = McpConfigurationHelper.ExtractUvxUrl(args);
+                        matches = !string.IsNullOrEmpty(configuredUvxUrl) &&
+                                  McpConfigurationHelper.PathsEqual(configuredUvxUrl, expectedUvxUrl);
+                    }
                 }
 
                 if (matches)
@@ -327,6 +378,9 @@ public override string GetManualSnippet()
     /// <summary>CLI-based configurator (Claude Code).</summary>
     public abstract class ClaudeCliMcpConfigurator : McpClientConfiguratorBase
     {
+        private static readonly object _claudeCliLock = new object();
+        private static bool _isClaudeCliRunning = false;
+        
         public ClaudeCliMcpConfigurator(McpClient client) : base(client) { }
 
         public override bool SupportsAutoConfigure => true;
@@ -405,114 +459,152 @@ public override void Configure()
 
         private void Register()
         {
-            var pathService = MCPServiceLocator.Paths;
-            string claudePath = pathService.GetClaudeCliPath();
-            if (string.IsNullOrEmpty(claudePath))
+            lock (_claudeCliLock)
             {
-                throw new InvalidOperationException("Claude CLI not found. Please install Claude Code first.");
+                if (_isClaudeCliRunning)
+                {
+                    throw new InvalidOperationException("Claude CLI operation already in progress. Please wait.");
+                }
+                _isClaudeCliRunning = true;
             }
+            
+            try
+            {
+                var pathService = MCPServiceLocator.Paths;
+                string claudePath = pathService.GetClaudeCliPath();
+                if (string.IsNullOrEmpty(claudePath))
+                {
+                    throw new InvalidOperationException("Claude CLI not found. Please install Claude Code first.");
+                }
 
-            bool useHttpTransport = EditorPrefs.GetBool(EditorPrefKeys.UseHttpTransport, true);
+                bool useHttpTransport = EditorPrefs.GetBool(EditorPrefKeys.UseHttpTransport, true);
 
-            string args;
-            if (useHttpTransport)
-            {
-                string httpUrl = HttpEndpointUtility.GetMcpRpcUrl();
-                args = $"mcp add --transport http UnityMCP {httpUrl}";
-            }
-            else
-            {
-                var (uvxPath, gitUrl, packageName) = AssetPathUtility.GetUvxCommandParts();
-                args = $"mcp add --transport stdio UnityMCP -- \"{uvxPath}\" --from \"{gitUrl}\" {packageName}";
-            }
+                string args;
+                if (useHttpTransport)
+                {
+                    string httpUrl = HttpEndpointUtility.GetMcpRpcUrl();
+                    args = $"mcp add --transport http UnityMCP {httpUrl}";
+                }
+                else
+                {
+                    var (uvxPath, gitUrl, packageName) = AssetPathUtility.GetUvxCommandParts();
+                    args = $"mcp add --transport stdio UnityMCP -- \"{uvxPath}\" --from \"{gitUrl}\" {packageName}";
+                }
 
-            string projectDir = Path.GetDirectoryName(Application.dataPath);
+                string projectDir = Path.GetDirectoryName(Application.dataPath);
 
-            string pathPrepend = null;
-            if (Application.platform == RuntimePlatform.OSXEditor)
-            {
-                pathPrepend = "/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin";
-            }
-            else if (Application.platform == RuntimePlatform.LinuxEditor)
-            {
-                pathPrepend = "/usr/local/bin:/usr/bin:/bin";
-            }
+                string pathPrepend = null;
+                if (Application.platform == RuntimePlatform.OSXEditor)
+                {
+                    pathPrepend = "/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin";
+                }
+                else if (Application.platform == RuntimePlatform.LinuxEditor)
+                {
+                    pathPrepend = "/usr/local/bin:/usr/bin:/bin";
+                }
 
-            try
-            {
-                string claudeDir = Path.GetDirectoryName(claudePath);
-                if (!string.IsNullOrEmpty(claudeDir))
+                try
                 {
-                    pathPrepend = string.IsNullOrEmpty(pathPrepend)
-                        ? claudeDir
-                        : $"{claudeDir}:{pathPrepend}";
+                    string claudeDir = Path.GetDirectoryName(claudePath);
+                    if (!string.IsNullOrEmpty(claudeDir))
+                    {
+                        pathPrepend = string.IsNullOrEmpty(pathPrepend)
+                            ? claudeDir
+                            : $"{claudeDir}:{pathPrepend}";
+                    }
                 }
-            }
-            catch { }
+                catch { }
 
-            bool already = false;
-            if (!ExecPath.TryRun(claudePath, args, projectDir, out var stdout, out var stderr, 15000, pathPrepend))
-            {
-                string combined = ($"{stdout}\n{stderr}") ?? string.Empty;
-                if (combined.IndexOf("already exists", StringComparison.OrdinalIgnoreCase) >= 0)
+                bool already = false;
+                if (!ExecPath.TryRun(claudePath, args, projectDir, out var stdout, out var stderr, 15000, pathPrepend))
                 {
-                    already = true;
+                    string combined = ($"{stdout}\n{stderr}") ?? string.Empty;
+                    if (combined.IndexOf("already exists", StringComparison.OrdinalIgnoreCase) >= 0)
+                    {
+                        already = true;
+                    }
+                    else
+                    {
+                        throw new InvalidOperationException($"Failed to register with Claude Code:\n{stderr}\n{stdout}");
+                    }
                 }
-                else
+
+                if (!already)
                 {
-                    throw new InvalidOperationException($"Failed to register with Claude Code:\n{stderr}\n{stdout}");
+                    McpLog.Info("Successfully registered with Claude Code.");
                 }
-            }
 
-            if (!already)
+                CheckStatus();
+            }
+            finally
             {
-                McpLog.Info("Successfully registered with Claude Code.");
+                lock (_claudeCliLock)
+                {
+                    _isClaudeCliRunning = false;
+                }
             }
-
-            CheckStatus();
         }
 
         private void Unregister()
         {
-            var pathService = MCPServiceLocator.Paths;
-            string claudePath = pathService.GetClaudeCliPath();
-
-            if (string.IsNullOrEmpty(claudePath))
-            {
-                throw new InvalidOperationException("Claude CLI not found. Please install Claude Code first.");
-            }
-
-            string projectDir = Path.GetDirectoryName(Application.dataPath);
-            string pathPrepend = null;
-            if (Application.platform == RuntimePlatform.OSXEditor)
+            lock (_claudeCliLock)
             {
-                pathPrepend = "/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin";
+                if (_isClaudeCliRunning)
+                {
+                    throw new InvalidOperationException("Claude CLI operation already in progress. Please wait.");
+                }
+                _isClaudeCliRunning = true;
             }
-            else if (Application.platform == RuntimePlatform.LinuxEditor)
+            
+            try
             {
-                pathPrepend = "/usr/local/bin:/usr/bin:/bin";
-            }
+                var pathService = MCPServiceLocator.Paths;
+                string claudePath = pathService.GetClaudeCliPath();
 
-            bool serverExists = ExecPath.TryRun(claudePath, "mcp get UnityMCP", projectDir, out _, out _, 7000, pathPrepend);
+                if (string.IsNullOrEmpty(claudePath))
+                {
+                    throw new InvalidOperationException("Claude CLI not found. Please install Claude Code first.");
+                }
 
-            if (!serverExists)
-            {
-                client.SetStatus(McpStatus.NotConfigured);
-                McpLog.Info("No MCP for Unity server found - already unregistered.");
-                return;
-            }
+                string projectDir = Path.GetDirectoryName(Application.dataPath);
+                string pathPrepend = null;
+                if (Application.platform == RuntimePlatform.OSXEditor)
+                {
+                    pathPrepend = "/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin";
+                }
+                else if (Application.platform == RuntimePlatform.LinuxEditor)
+                {
+                    pathPrepend = "/usr/local/bin:/usr/bin:/bin";
+                }
 
-            if (ExecPath.TryRun(claudePath, "mcp remove UnityMCP", projectDir, out var stdout, out var stderr, 10000, pathPrepend))
-            {
-                McpLog.Info("MCP server successfully unregistered from Claude Code.");
+                bool serverExists = ExecPath.TryRun(claudePath, "mcp get UnityMCP", projectDir, out _, out _, 7000, pathPrepend);
+
+                if (!serverExists)
+                {
+                    client.SetStatus(McpStatus.NotConfigured);
+                    McpLog.Info("No MCP for Unity server found - already unregistered.");
+                    return;
+                }
+
+                if (ExecPath.TryRun(claudePath, "mcp remove UnityMCP", projectDir, out var stdout, out var stderr, 10000, pathPrepend))
+                {
+                    McpLog.Info("MCP server successfully unregistered from Claude Code.");
+                }
+                else
+                {
+                    throw new InvalidOperationException($"Failed to unregister: {stderr}");
+                }
+
+                client.SetStatus(McpStatus.NotConfigured);
+                CheckStatus();
             }
-            else
+            finally
             {
-                throw new InvalidOperationException($"Failed to unregister: {stderr}");
+                lock (_claudeCliLock)
+                {
+                    _isClaudeCliRunning = false;
+                }
             }
-
-            client.SetStatus(McpStatus.NotConfigured);
-            CheckStatus();
         }
 
         public override string GetManualSnippet()

MCPForUnity/Editor/Constants/EditorPrefKeys.cs

@@ -21,21 +21,15 @@ internal static class EditorPrefKeys
         internal const string WebSocketUrlOverride = "MCPForUnity.WebSocketUrl";
         internal const string GitUrlOverride = "MCPForUnity.GitUrlOverride";
 
-        internal const string PackageDeploySourcePath = "MCPForUnity.PackageDeploy.SourcePath";
-        internal const string PackageDeployLastBackupPath = "MCPForUnity.PackageDeploy.LastBackupPath";
-        internal const string PackageDeployLastTargetPath = "MCPForUnity.PackageDeploy.LastTargetPath";
-        internal const string PackageDeployLastSourcePath = "MCPForUnity.PackageDeploy.LastSourcePath";
-
         internal const string ServerSrc = "MCPForUnity.ServerSrc";
         internal const string UseEmbeddedServer = "MCPForUnity.UseEmbeddedServer";
         internal const string LockCursorConfig = "MCPForUnity.LockCursorConfig";
         internal const string AutoRegisterEnabled = "MCPForUnity.AutoRegisterEnabled";
-        internal const string ToolEnabledPrefix = "MCPForUnity.ToolEnabled.";
-        internal const string ToolFoldoutStatePrefix = "MCPForUnity.ToolFoldout.";
-        internal const string EditorWindowActivePanel = "MCPForUnity.EditorWindow.ActivePanel";
 
         internal const string SetupCompleted = "MCPForUnity.SetupCompleted";
         internal const string SetupDismissed = "MCPForUnity.SetupDismissed";
+        
+        internal const string EditorWindowActivePanel = "MCPForUnityEditorWindow.ActivePanel";
 
         internal const string CustomToolRegistrationEnabled = "MCPForUnity.CustomToolRegistrationEnabled";
 
@@ -45,5 +39,18 @@ internal static class EditorPrefKeys
 
         internal const string TelemetryDisabled = "MCPForUnity.TelemetryDisabled";
         internal const string CustomerUuid = "MCPForUnity.CustomerUUID";
+
+        // Path Overrides
+        internal const string PythonPathOverride = "MCPForUnity.PythonPathOverride";
+        internal const string NodePathOverride = "MCPForUnity.NodePathOverride";
+        internal const string UvPathOverride = "MCPForUnity.UvPathOverride";
+
+        // Deployment & Tool Config
+        internal const string PackageDeploySourcePath = "MCPForUnity.Deploy.SourcePath";
+        internal const string PackageDeployLastBackupPath = "MCPForUnity.Deploy.LastBackupPath";
+        internal const string PackageDeployLastTargetPath = "MCPForUnity.Deploy.LastTargetPath";
+        internal const string PackageDeployLastSourcePath = "MCPForUnity.Deploy.LastSourcePath";
+        internal const string ToolFoldoutStatePrefix = "MCPForUnity.Tool.Foldout.";
+        internal const string ToolEnabledPrefix = "MCPForUnity.Tool.Enabled.";
     }
 }