Fix/instance discovery cache consistency

.github/workflows/bump-version.yml

@@ -67,11 +67,11 @@ jobs:
           jq ".version = \"${NEW_VERSION}\"" MCPForUnity/package.json > MCPForUnity/package.json.tmp
           mv MCPForUnity/package.json.tmp MCPForUnity/package.json
 
-          echo "Updating MCPForUnity/UnityMcpServer~/src/pyproject.toml to $NEW_VERSION"
-          sed -i '0,/^version = ".*"/s//version = "'"$NEW_VERSION"'"/' "MCPForUnity/UnityMcpServer~/src/pyproject.toml"
+          echo "Updating Server/pyproject.toml to $NEW_VERSION"
+          sed -i '0,/^version = ".*"/s//version = "'"$NEW_VERSION"'"/' "Server/pyproject.toml"
 
-          echo "Updating MCPForUnity/UnityMcpServer~/src/server_version.txt to $NEW_VERSION"
-          echo "$NEW_VERSION" > "MCPForUnity/UnityMcpServer~/src/server_version.txt"
+          echo "Updating Server/server_version.txt to $NEW_VERSION"
+          echo "$NEW_VERSION" > "Server/server_version.txt"
 
       - name: Commit and push changes
         env:
@@ -81,7 +81,7 @@ jobs:
           set -euo pipefail
           git config user.name "GitHub Actions"
           git config user.email "[email protected]"
-          git add MCPForUnity/package.json "MCPForUnity/UnityMcpServer~/src/pyproject.toml" "MCPForUnity/UnityMcpServer~/src/server_version.txt"
+          git add MCPForUnity/package.json "Server/pyproject.toml" "Server/server_version.txt"
           if git diff --cached --quiet; then
             echo "No version changes to commit."
           else

.gitignore

@@ -16,8 +16,6 @@ build/
 dist/
 wheels/
 *.egg-info
-UnityMcpServer/**/*.meta
-UnityMcpServer.meta
 
 # Virtual environments
 .venv

MCPForUnity/Editor/Dependencies/DependencyManager.cs

@@ -60,10 +60,6 @@ public static DependencyCheckResult CheckAllDependencies()
                 var uvStatus = detector.DetectUV();
                 result.Dependencies.Add(uvStatus);
 
-                // Check MCP Server
-                var serverStatus = detector.DetectMCPServer();
-                result.Dependencies.Add(serverStatus);
-
                 // Generate summary and recommendations
                 result.GenerateSummary();
                 GenerateRecommendations(result, detector);

MCPForUnity/Editor/Dependencies/PlatformDetectors/IPlatformDetector.cs

@@ -27,11 +27,6 @@ public interface IPlatformDetector
         /// </summary>
         DependencyStatus DetectUV();
 
-        /// <summary>
-        /// Detect MCP server installation on this platform
-        /// </summary>
-        DependencyStatus DetectMCPServer();
-
         /// <summary>
         /// Get platform-specific installation recommendations
         /// </summary>

MCPForUnity/Editor/Dependencies/PlatformDetectors/PlatformDetectorBase.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using MCPForUnity.Editor.Dependencies.Models;
 using MCPForUnity.Editor.Helpers;
+using MCPForUnity.Editor.Services;
 
 namespace MCPForUnity.Editor.Dependencies.PlatformDetectors
 {
@@ -29,15 +30,15 @@ public virtual DependencyStatus DetectUV()
             try
             {
                 // Use existing UV detection from ServerInstaller
-                string uvPath = ServerInstaller.FindUvPath();
-                if (!string.IsNullOrEmpty(uvPath))
+                string uvxPath = MCPServiceLocator.Paths.GetUvxPath(verifyPath: false);
+                if (!string.IsNullOrEmpty(uvxPath))
                 {
-                    if (TryValidateUV(uvPath, out string version))
+                    if (TryValidateUvx(uvxPath, out string version))
                     {
                         status.IsAvailable = true;
                         status.Version = version;
-                        status.Path = uvPath;
-                        status.Details = $"Found UV {version} at {uvPath}";
+                        status.Path = uvxPath;
+                        status.Details = $"Found UV {version} at {uvxPath}";
                         return status;
                     }
                 }
@@ -53,63 +54,15 @@ public virtual DependencyStatus DetectUV()
             return status;
         }
 
-        public virtual DependencyStatus DetectMCPServer()
-        {
-            var status = new DependencyStatus("MCP Server", isRequired: false);
-
-            try
-            {
-                // Check if server is installed
-                string serverPath = ServerInstaller.GetServerPath();
-                string serverPy = Path.Combine(serverPath, "server.py");
-
-                if (File.Exists(serverPy))
-                {
-                    status.IsAvailable = true;
-                    status.Path = serverPath;
-
-                    // Try to get version
-                    string versionFile = Path.Combine(serverPath, "server_version.txt");
-                    if (File.Exists(versionFile))
-                    {
-                        status.Version = File.ReadAllText(versionFile).Trim();
-                    }
-
-                    status.Details = $"MCP Server found at {serverPath}";
-                }
-                else
-                {
-                    // Check for embedded server
-                    if (ServerPathResolver.TryFindEmbeddedServerSource(out string embeddedPath))
-                    {
-                        status.IsAvailable = true;
-                        status.Path = embeddedPath;
-                        status.Details = "MCP Server available (embedded in package)";
-                    }
-                    else
-                    {
-                        status.ErrorMessage = "MCP Server not found";
-                        status.Details = "Server will be installed automatically when needed";
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                status.ErrorMessage = $"Error detecting MCP Server: {ex.Message}";
-            }
-
-            return status;
-        }
-
-        protected bool TryValidateUV(string uvPath, out string version)
+        protected bool TryValidateUvx(string uvxPath, out string version)
         {
             version = null;
 
             try
             {
                 var psi = new ProcessStartInfo
                 {
-                    FileName = uvPath,
+                    FileName = uvxPath,
                     Arguments = "--version",
                     UseShellExecute = false,
                     RedirectStandardOutput = true,

MCPForUnity/Editor/Helpers/AssetPathUtility.cs

@@ -4,6 +4,7 @@
 using UnityEditor;
 using UnityEngine;
 using PackageInfo = UnityEditor.PackageManager.PackageInfo;
+using MCPForUnity.Editor.Services;
 
 namespace MCPForUnity.Editor.Helpers
 {
@@ -136,7 +137,50 @@ public static JObject GetPackageJson()
         }
 
         /// <summary>
-        /// Gets the version string from the package.json file.
+        /// Gets the uvx command with the correct package version for running the MCP server
+        /// </summary>
+        /// <returns>Uvx command string, or "uvx" if version is unknown</returns>
+        public static string GetUvxCommand()
+        {
+            string version = GetPackageVersion();
+            if (version == "unknown")
+            {
+                return "uvx";
+            }
+
+            return $"uvx --from git+https://github.com/CoplayDev/unity-mcp@v{version}#subdirectory=Server";
+        }
+
+        /// <summary>
+        /// Gets just the git URL part for the MCP server package
+        /// </summary>
+        /// <returns>Git URL string, or empty string if version is unknown</returns>
+        public static string GetMcpServerGitUrl()
+        {
+            string version = GetPackageVersion();
+            if (version == "unknown")
+            {
+                return "";
+            }
+
+            return $"git+https://github.com/CoplayDev/unity-mcp@v{version}#subdirectory=Server";
+        }
+
+        /// <summary>
+        /// Gets structured uvx command parts for different client configurations
+        /// </summary>
+        /// <returns>Tuple containing (uvxPath, fromUrl, packageName)</returns>
+        public static (string uvxPath, string fromUrl, string packageName) GetUvxCommandParts()
+        {
+            string uvxPath = MCPServiceLocator.Paths.GetUvxPath() ?? "uvx";
+            string fromUrl = GetMcpServerGitUrl();
+            string packageName = "mcp-for-unity";
+
+            return (uvxPath, fromUrl, packageName);
+        }
+
+        /// <summary>
+        /// Gets the package version from package.json
         /// </summary>
         /// <returns>Version string, or "unknown" if not found</returns>
         public static string GetPackageVersion()