Merge branch 'main' into feat/bridge-stability

Author: dsarno

.github/FUNDING.yml

@@ -53,6 +53,7 @@ X:\UnityProject\Library\PackageCache\com.coplaydev.unity-mcp@<version-or-hash>
 Example (hash):
 ```
 X:\UnityProject\Library\PackageCache\com.coplaydev.unity-mcp@272123cfd97e
+
 ```
 
 To find it reliably:

README-DEV.md

@@ -126,6 +126,7 @@ Connect your MCP Client (Claude, Cursor, etc.) to the Python server you installe
 2.  Click `Auto-Setup`.
 3.  Look for a green status indicator 🟢 and "Connected ✓". *(This attempts to modify the MCP Client\'s config file automatically)*.
 
+
 **Option B: Manual Configuration**
 
 If Auto-Setup fails or you use a different client:

README.md

@@ -10,6 +10,7 @@ public static class ServerInstaller
     {
         private const string RootFolder = "UnityMCP";
         private const string ServerFolder = "UnityMcpServer";
+
         /// <summary>
         /// Ensures the unity-mcp-server is installed locally by copying from the embedded package source.
         /// No network calls or Git operations are performed.
@@ -135,45 +136,58 @@ private static bool TryGetEmbeddedServerSource(out string srcPath)
             catch { /* ignore */ }
 
             // 2) Installed package: resolve via Package Manager
-            try
+            // 2) Installed package: resolve via Package Manager (support new + legacy IDs, warn on legacy)
+try
+{
+    var list = UnityEditor.PackageManager.Client.List();
+    while (!list.IsCompleted) { }
+    if (list.Status == UnityEditor.PackageManager.StatusCode.Success)
+    {
+        const string CurrentId = "com.coplaydev.unity-mcp";
+        const string LegacyId  = "com.justinpbarnett.unity-mcp";
+
+        foreach (var pkg in list.Result)
+        {
+            if (pkg.name == CurrentId || pkg.name == LegacyId)
             {
-                var list = UnityEditor.PackageManager.Client.List();
-                while (!list.IsCompleted) { }
-                if (list.Status == UnityEditor.PackageManager.StatusCode.Success)
+                if (pkg.name == LegacyId)
                 {
-                    foreach (var pkg in list.Result)
-                    {
-                        if (pkg.name == "com.justinpbarnett.unity-mcp")
-                        {
-                            string packagePath = pkg.resolvedPath; // e.g., Library/PackageCache/... or local path
-
-                            // Preferred: UnityMcpServer~ embedded alongside Editor/Runtime within the package (ignored by Unity import)
-                            string embeddedTilde = Path.Combine(packagePath, "UnityMcpServer~", "src");
-                            if (Directory.Exists(embeddedTilde) && File.Exists(Path.Combine(embeddedTilde, "server.py")))
-                            {
-                                srcPath = embeddedTilde;
-                                return true;
-                            }
-
-                            // Fallback: legacy non-tilde folder name inside the package
-                            string embedded = Path.Combine(packagePath, "UnityMcpServer", "src");
-                            if (Directory.Exists(embedded) && File.Exists(Path.Combine(embedded, "server.py")))
-                            {
-                                srcPath = embedded;
-                                return true;
-                            }
-
-                            // Legacy: sibling of the package folder (dev-linked). Only valid when present on disk.
-                            string sibling = Path.Combine(Path.GetDirectoryName(packagePath) ?? string.Empty, "UnityMcpServer", "src");
-                            if (Directory.Exists(sibling) && File.Exists(Path.Combine(sibling, "server.py")))
-                            {
-                                srcPath = sibling;
-                                return true;
-                            }
-                        }
-                    }
+                    Debug.LogWarning(
+                        "UnityMCP: Detected legacy package id 'com.justinpbarnett.unity-mcp'. " +
+                        "Please update Packages/manifest.json to 'com.coplaydev.unity-mcp' to avoid future breakage."
+                    );
+                }
+
+                string packagePath = pkg.resolvedPath; // e.g., Library/PackageCache/... or local path
+
+                // Preferred: tilde folder embedded alongside Editor/Runtime within the package
+                string embeddedTilde = Path.Combine(packagePath, "UnityMcpServer~", "src");
+                if (Directory.Exists(embeddedTilde) && File.Exists(Path.Combine(embeddedTilde, "server.py")))
+                {
+                    srcPath = embeddedTilde;
+                    return true;
+                }
+
+                // Fallback: legacy non-tilde folder name inside the package
+                string embedded = Path.Combine(packagePath, "UnityMcpServer", "src");
+                if (Directory.Exists(embedded) && File.Exists(Path.Combine(embedded, "server.py")))
+                {
+                    srcPath = embedded;
+                    return true;
+                }
+
+                // Legacy: sibling of the package folder (dev-linked). Only valid when present on disk.
+                string sibling = Path.Combine(Path.GetDirectoryName(packagePath) ?? string.Empty, "UnityMcpServer", "src");
+                if (Directory.Exists(sibling) && File.Exists(Path.Combine(sibling, "server.py")))
+                {
+                    srcPath = sibling;
+                    return true;
                 }
             }
+        }
+    }
+}
+
             catch { /* ignore */ }
 
             // 3) Fallback to previous common install locations

UnityMcpBridge/Editor/Helpers/ServerInstaller.cs

@@ -996,7 +996,7 @@ private string FindPackagePythonDirectory()
                 {
                     foreach (UnityEditor.PackageManager.PackageInfo package in request.Result)
                     {
-                        if (package.name == "com.justinpbarnett.unity-mcp")
+                        if (package.name == "com.coplaydev.unity-mcp")
                         {
                             string packagePath = package.resolvedPath;