Merge pull request #208 from dsarno/feature/claude-cli-detection-ui

UX and Fix: Claude Code detection + UV gating (Cursor/Windsurf) + VSCode mcp.json schema

Author: dsarno

UnityMcpBridge/Editor/Data/McpClients.cs

@@ -87,15 +87,15 @@ public class McpClients
                     Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
                     "Code",
                     "User",
-                    "settings.json"
+                    "mcp.json"
                 ),
                 linuxConfigPath = Path.Combine(
                     Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
                     "Library",
                     "Application Support",
                     "Code",
                     "User",
-                    "settings.json"
+                    "mcp.json"
                 ),
                 mcpType = McpTypes.VSCode,
                 configStatus = "Not Configured",

UnityMcpBridge/Editor/Helpers/ExecPath.cs

@@ -35,6 +35,9 @@ internal static string ResolveClaude()
                     Path.Combine(home, ".local", "bin", "claude"),
                 };
                 foreach (string c in candidates) { if (File.Exists(c)) return c; }
+                // Try NVM-installed claude under ~/.nvm/versions/node/*/bin/claude
+                string nvmClaude = ResolveClaudeFromNvm(home);
+                if (!string.IsNullOrEmpty(nvmClaude)) return nvmClaude;
 #if UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX
                 return Which("claude", "/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin");
 #else
@@ -70,6 +73,9 @@ internal static string ResolveClaude()
                     Path.Combine(home, ".local", "bin", "claude"),
                 };
                 foreach (string c in candidates) { if (File.Exists(c)) return c; }
+                // Try NVM-installed claude under ~/.nvm/versions/node/*/bin/claude
+                string nvmClaude = ResolveClaudeFromNvm(home);
+                if (!string.IsNullOrEmpty(nvmClaude)) return nvmClaude;
 #if UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX
                 return Which("claude", "/usr/local/bin:/usr/bin:/bin");
 #else
@@ -78,6 +84,75 @@ internal static string ResolveClaude()
             }
         }
 
+        // Attempt to resolve claude from NVM-managed Node installations, choosing the newest version
+        private static string ResolveClaudeFromNvm(string home)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(home)) return null;
+                string nvmNodeDir = Path.Combine(home, ".nvm", "versions", "node");
+                if (!Directory.Exists(nvmNodeDir)) return null;
+
+                string bestPath = null;
+                Version bestVersion = null;
+                foreach (string versionDir in Directory.EnumerateDirectories(nvmNodeDir))
+                {
+                    string name = Path.GetFileName(versionDir);
+                    if (string.IsNullOrEmpty(name)) continue;
+                    if (name.StartsWith("v", StringComparison.OrdinalIgnoreCase))
+                    {
+                        // Extract numeric portion: e.g., v18.19.0-nightly -> 18.19.0
+                        string versionStr = name.Substring(1);
+                        int dashIndex = versionStr.IndexOf('-');
+                        if (dashIndex > 0)
+                        {
+                            versionStr = versionStr.Substring(0, dashIndex);
+                        }
+                        if (Version.TryParse(versionStr, out Version parsed))
+                        {
+                            string candidate = Path.Combine(versionDir, "bin", "claude");
+                            if (File.Exists(candidate))
+                            {
+                                if (bestVersion == null || parsed > bestVersion)
+                                {
+                                    bestVersion = parsed;
+                                    bestPath = candidate;
+                                }
+                            }
+                        }
+                    }
+                }
+                return bestPath;
+            }
+            catch { return null; }
+        }
+
+        // Explicitly set the Claude CLI absolute path override in EditorPrefs
+        internal static void SetClaudeCliPath(string absolutePath)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(absolutePath) && File.Exists(absolutePath))
+                {
+                    EditorPrefs.SetString(PrefClaude, absolutePath);
+                }
+            }
+            catch { }
+        }
+
+        // Clear any previously set Claude CLI override path
+        internal static void ClearClaudeCliPath()
+        {
+            try
+            {
+                if (EditorPrefs.HasKey(PrefClaude))
+                {
+                    EditorPrefs.DeleteKey(PrefClaude);
+                }
+            }
+            catch { }
+        }
+
         // Use existing UV resolver; returns absolute path or null.
         internal static string ResolveUv()
         {

UnityMcpBridge/Editor/Models/MCPConfigServer.cs

@@ -11,5 +11,9 @@ public class McpConfigServer
 
         [JsonProperty("args")]
         public string[] args;
+
+        // VSCode expects a transport type; include only when explicitly set
+        [JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
+        public string type;
     }
 }