From 4fee827443aec12e332510920c82d6f4dc217511 Mon Sep 17 00:00:00 2001
From: dsarno <david@lighthaus.us>
Date: Wed, 11 Feb 2026 08:36:57 -0800
Subject: [PATCH 1/2] Add Cline configurator and auto-select server channel by
 package version

---
 .../Configurators/ClineConfigurator.cs        | 29 +++++++++
 .../Configurators/ClineConfigurator.cs.meta   | 11 ++++
 .../Clients/McpClientConfiguratorBase.cs      | 48 ++++-----------
 .../Editor/Constants/EditorPrefKeys.cs        |  1 -
 .../Editor/Helpers/AssetPathUtility.cs        | 59 ++++++++++++-------
 .../Editor/Helpers/ConfigJsonBuilder.cs       | 14 ++++-
 .../Services/EditorConfigurationCache.cs      | 41 -------------
 .../Components/Advanced/McpAdvancedSection.cs | 19 ------
 .../Advanced/McpAdvancedSection.uxml          |  5 --
 .../ClientConfig/McpClientConfigSection.cs    | 34 ++---------
 .../Windows/EditorPrefs/EditorPrefsWindow.cs  |  1 -
 .../Editor/Windows/MCPForUnityEditorWindow.cs | 37 ++++++------
 12 files changed, 121 insertions(+), 178 deletions(-)
 create mode 100644 MCPForUnity/Editor/Clients/Configurators/ClineConfigurator.cs
 create mode 100644 MCPForUnity/Editor/Clients/Configurators/ClineConfigurator.cs.meta

diff --git a/MCPForUnity/Editor/Clients/Configurators/ClineConfigurator.cs b/MCPForUnity/Editor/Clients/Configurators/ClineConfigurator.cs
new file mode 100644
index 000000000..4cce6cc8c
--- /dev/null
+++ b/MCPForUnity/Editor/Clients/Configurators/ClineConfigurator.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using MCPForUnity.Editor.Models;
+
+namespace MCPForUnity.Editor.Clients.Configurators
+{
+    public class ClineConfigurator : JsonFileMcpConfigurator
+    {
+        public ClineConfigurator() : base(new McpClient
+        {
+            name = "Cline",
+            windowsConfigPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json"),
+            macConfigPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Library", "Application Support", "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json"),
+            linuxConfigPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".config", "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json"),
+            DefaultUnityFields = { { "disabled", false }, { "autoApprove", new object[] { } } }
+        })
+        { }
+
+        public override IList<string> GetInstallationSteps() => new List<string>
+        {
+            "Open Cline in VS Code",
+            "Click the MCP Servers icon in the Cline pane",
+            "Go to Configure tab and click 'Configure MCP Servers'\nOR open the config file at the path above",
+            "Paste the configuration JSON into the mcpServers object",
+            "Save and restart VS Code"
+        };
+    }
+}
diff --git a/MCPForUnity/Editor/Clients/Configurators/ClineConfigurator.cs.meta b/MCPForUnity/Editor/Clients/Configurators/ClineConfigurator.cs.meta
new file mode 100644
index 000000000..77045ec75
--- /dev/null
+++ b/MCPForUnity/Editor/Clients/Configurators/ClineConfigurator.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6b8abf0951c7413d9ff97a053b0adf2d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/MCPForUnity/Editor/Clients/McpClientConfiguratorBase.cs b/MCPForUnity/Editor/Clients/McpClientConfiguratorBase.cs
index 42656958f..021c14ce4 100644
--- a/MCPForUnity/Editor/Clients/McpClientConfiguratorBase.cs
+++ b/MCPForUnity/Editor/Clients/McpClientConfiguratorBase.cs
@@ -80,39 +80,13 @@ protected bool UrlsEqual(string a, string b)
         }
 
         /// <summary>
-        /// Gets the expected package source for validation, accounting for beta mode.
+        /// Gets the expected package source for validation based on the installed package version.
         /// This should match what Configure() would actually use for the --from argument.
         /// MUST be called from the main thread due to EditorPrefs access.
         /// </summary>
         protected static string GetExpectedPackageSourceForValidation()
         {
-            // Check for explicit override first
-            string gitUrlOverride = EditorPrefs.GetString(EditorPrefKeys.GitUrlOverride, "");
-            if (!string.IsNullOrEmpty(gitUrlOverride))
-            {
-                return gitUrlOverride;
-            }
-
-            // Check beta mode using the same logic as GetUseBetaServerWithDynamicDefault
-            // (bypass cache to ensure fresh read)
-            bool useBetaServer;
-            bool hasPrefKey = EditorPrefs.HasKey(EditorPrefKeys.UseBetaServer);
-            if (hasPrefKey)
-            {
-                useBetaServer = EditorPrefs.GetBool(EditorPrefKeys.UseBetaServer, false);
-            }
-            else
-            {
-                // Dynamic default based on package version
-                useBetaServer = AssetPathUtility.IsPreReleaseVersion();
-            }
-
-            if (useBetaServer)
-            {
-                return "mcpforunityserver>=0.0.0a0";
-            }
-
-            // Standard mode uses exact version from package.json
+            // Includes explicit override, stable pin, or prerelease range depending on package version.
             return AssetPathUtility.GetMcpServerPackageSource();
         }
 
@@ -120,7 +94,7 @@ protected static string GetExpectedPackageSourceForValidation()
         /// Checks if a package source string represents a beta/prerelease version.
         /// Beta versions include:
         /// - PyPI beta: "mcpforunityserver==9.4.0b20250203..." (contains 'b' before timestamp)
-        /// - PyPI prerelease range: "mcpforunityserver>=0.0.0a0" (used when beta mode is enabled)
+        /// - PyPI prerelease range: "mcpforunityserver>=0.0.0a0" (used for prerelease package builds)
         /// - Git beta branch: contains "@beta" or "-beta"
         /// </summary>
         protected static bool IsBetaPackageSource(string packageSource)
@@ -133,7 +107,7 @@ protected static bool IsBetaPackageSource(string packageSource)
             if (System.Text.RegularExpressions.Regex.IsMatch(packageSource, @"==\d+\.\d+\.\d+b\d+"))
                 return true;
 
-            // PyPI prerelease range: >=0.0.0a0 (used when "Use Beta Server" is enabled in Unity settings)
+            // PyPI prerelease range: >=0.0.0a0 (used for prerelease package builds)
             if (packageSource.Contains(">=0.0.0a0", StringComparison.OrdinalIgnoreCase))
                 return true;
 
@@ -266,12 +240,12 @@ public override McpStatus CheckStatus(bool attemptAutoRewrite = true)
                             if (configuredIsBeta && !expectedIsBeta)
                             {
                                 hasVersionMismatch = true;
-                                mismatchReason = "Configured for beta server, but 'Use Beta Server' is disabled in Advanced settings.";
+                                mismatchReason = "Configured for prerelease server, but this package is stable. Re-configure to switch to stable.";
                             }
                             else if (!configuredIsBeta && expectedIsBeta)
                             {
                                 hasVersionMismatch = true;
-                                mismatchReason = "Configured for stable server, but 'Use Beta Server' is enabled in Advanced settings.";
+                                mismatchReason = "Configured for stable server, but this package is prerelease. Re-configure to switch to prerelease.";
                             }
                             else
                             {
@@ -449,12 +423,12 @@ public override McpStatus CheckStatus(bool attemptAutoRewrite = true)
                                 if (configuredIsBeta && !expectedIsBeta)
                                 {
                                     hasVersionMismatch = true;
-                                    mismatchReason = "Configured for beta server, but 'Use Beta Server' is disabled in Advanced settings.";
+                                    mismatchReason = "Configured for prerelease server, but this package is stable. Re-configure to switch to stable.";
                                 }
                                 else if (!configuredIsBeta && expectedIsBeta)
                                 {
                                     hasVersionMismatch = true;
-                                    mismatchReason = "Configured for stable server, but 'Use Beta Server' is enabled in Advanced settings.";
+                                    mismatchReason = "Configured for stable server, but this package is prerelease. Re-configure to switch to prerelease.";
                                 }
                                 else
                                 {
@@ -579,7 +553,7 @@ public override McpStatus CheckStatus(bool attemptAutoRewrite = true)
             string claudePath = MCPServiceLocator.Paths.GetClaudeCliPath();
             RuntimePlatform platform = Application.platform;
             bool isRemoteScope = HttpEndpointUtility.IsRemoteScope();
-            // Get expected package source considering beta mode (matches what Register() would use)
+            // Get expected package source for the installed package version (matches what Register() would use)
             string expectedPackageSource = GetExpectedPackageSourceForValidation();
             return CheckStatusWithProjectDir(projectDir, useHttpTransport, claudePath, platform, isRemoteScope, expectedPackageSource, attemptAutoRewrite);
         }
@@ -679,11 +653,11 @@ internal McpStatus CheckStatusWithProjectDir(
 
                             if (configuredIsBeta && !expectedIsBeta)
                             {
-                                mismatchReason = "Configured for beta server, but 'Use Beta Server' is disabled in Advanced settings.";
+                                mismatchReason = "Configured for prerelease server, but this package is stable. Re-configure to switch to stable.";
                             }
                             else if (!configuredIsBeta && expectedIsBeta)
                             {
-                                mismatchReason = "Configured for stable server, but 'Use Beta Server' is enabled in Advanced settings.";
+                                mismatchReason = "Configured for stable server, but this package is prerelease. Re-configure to switch to prerelease.";
                             }
                             else
                             {
diff --git a/MCPForUnity/Editor/Constants/EditorPrefKeys.cs b/MCPForUnity/Editor/Constants/EditorPrefKeys.cs
index 5f99d3e5a..5ef737fb3 100644
--- a/MCPForUnity/Editor/Constants/EditorPrefKeys.cs
+++ b/MCPForUnity/Editor/Constants/EditorPrefKeys.cs
@@ -29,7 +29,6 @@ internal static class EditorPrefKeys
         internal const string WebSocketUrlOverride = "MCPForUnity.WebSocketUrl";
         internal const string GitUrlOverride = "MCPForUnity.GitUrlOverride";
         internal const string DevModeForceServerRefresh = "MCPForUnity.DevModeForceServerRefresh";
-        internal const string UseBetaServer = "MCPForUnity.UseBetaServer";
         internal const string ProjectScopedToolsLocalHttp = "MCPForUnity.ProjectScopedTools.LocalHttp";
 
         internal const string PackageDeploySourcePath = "MCPForUnity.PackageDeploy.SourcePath";
diff --git a/MCPForUnity/Editor/Helpers/AssetPathUtility.cs b/MCPForUnity/Editor/Helpers/AssetPathUtility.cs
index fc450bada..517b1900b 100644
--- a/MCPForUnity/Editor/Helpers/AssetPathUtility.cs
+++ b/MCPForUnity/Editor/Helpers/AssetPathUtility.cs
@@ -220,6 +220,13 @@ public static string GetMcpServerPackageSource()
                 return "mcpforunityserver";
             }
 
+            // Package.json uses semver prerelease tags (e.g., 9.4.5-beta.1) that are not valid
+            // PEP 440 pins for uvx. Use the beta prerelease range instead of a pinned prerelease.
+            if (IsSemVerPreRelease(version))
+            {
+                return "mcpforunityserver>=0.0.0a0";
+            }
+
             return $"mcpforunityserver=={version}";
         }
 
@@ -245,9 +252,9 @@ public static (string uvxPath, string fromUrl, string packageName) GetUvxCommand
 
         /// <summary>
         /// Builds the uvx package source arguments for the MCP server.
-        /// Handles beta server mode (prerelease from PyPI) vs standard mode (pinned version or override).
+        /// Handles prerelease package mode (prerelease from PyPI) vs stable mode (pinned version or override).
         /// Centralizes the prerelease logic to avoid duplication between HTTP and stdio transports.
-        /// Priority: explicit fromUrl override > beta server mode > default package.
+        /// Priority: explicit fromUrl override > package-version-driven prerelease mode > stable pinned package.
         /// NOTE: This overload reads from EditorPrefs/cache and MUST be called from the main thread.
         /// For background threads, use the overload that accepts pre-captured parameters.
         /// </summary>
@@ -255,18 +262,16 @@ public static (string uvxPath, string fromUrl, string packageName) GetUvxCommand
         /// <returns>The package source arguments (e.g., "--prerelease explicit --from mcpforunityserver>=0.0.0a0")</returns>
         public static string GetBetaServerFromArgs(bool quoteFromPath = false)
         {
-            // Read values from cache/EditorPrefs on main thread
-            bool useBetaServer = Services.EditorConfigurationCache.Instance.UseBetaServer;
             string gitUrlOverride = EditorPrefs.GetString(EditorPrefKeys.GitUrlOverride, "");
             string packageSource = GetMcpServerPackageSource();
-            return GetBetaServerFromArgs(useBetaServer, gitUrlOverride, packageSource, quoteFromPath);
+            return GetBetaServerFromArgs(useBetaServer: false, gitUrlOverride, packageSource, quoteFromPath);
         }
 
         /// <summary>
         /// Thread-safe overload that accepts pre-captured values.
         /// Use this when calling from background threads.
         /// </summary>
-        /// <param name="useBetaServer">Pre-captured value from EditorConfigurationCache.Instance.UseBetaServer</param>
+        /// <param name="useBetaServer">Deprecated. Ignored; prerelease mode is determined from packageSource.</param>
         /// <param name="gitUrlOverride">Pre-captured value from EditorPrefs GitUrlOverride</param>
         /// <param name="packageSource">Pre-captured value from GetMcpServerPackageSource()</param>
         /// <param name="quoteFromPath">Whether to quote the --from path</param>
@@ -279,8 +284,10 @@ public static string GetBetaServerFromArgs(bool useBetaServer, string gitUrlOver
                 return $"--from {fromValue}";
             }
 
-            // Beta server mode: use prerelease from PyPI
-            if (useBetaServer)
+            bool usePrereleaseRange = string.Equals(packageSource, "mcpforunityserver>=0.0.0a0", StringComparison.OrdinalIgnoreCase);
+
+            // Prerelease package mode: use prerelease from PyPI.
+            if (usePrereleaseRange)
             {
                 // Use --prerelease explicit with version specifier to only get prereleases of our package,
                 // not of dependencies (which can be broken on PyPI).
@@ -300,25 +307,23 @@ public static string GetBetaServerFromArgs(bool useBetaServer, string gitUrlOver
 
         /// <summary>
         /// Builds the uvx package source arguments as a list (for JSON config builders).
-        /// Priority: explicit fromUrl override > beta server mode > default package.
+        /// Priority: explicit fromUrl override > package-version-driven prerelease mode > stable pinned package.
         /// NOTE: This overload reads from EditorPrefs/cache and MUST be called from the main thread.
         /// For background threads, use the overload that accepts pre-captured parameters.
         /// </summary>
         /// <returns>List of arguments to add to uvx command</returns>
         public static System.Collections.Generic.IList<string> GetBetaServerFromArgsList()
         {
-            // Read values from cache/EditorPrefs on main thread
-            bool useBetaServer = Services.EditorConfigurationCache.Instance.UseBetaServer;
             string gitUrlOverride = EditorPrefs.GetString(EditorPrefKeys.GitUrlOverride, "");
             string packageSource = GetMcpServerPackageSource();
-            return GetBetaServerFromArgsList(useBetaServer, gitUrlOverride, packageSource);
+            return GetBetaServerFromArgsList(useBetaServer: false, gitUrlOverride, packageSource);
         }
 
         /// <summary>
         /// Thread-safe overload that accepts pre-captured values.
         /// Use this when calling from background threads.
         /// </summary>
-        /// <param name="useBetaServer">Pre-captured value from EditorConfigurationCache.Instance.UseBetaServer</param>
+        /// <param name="useBetaServer">Deprecated. Ignored; prerelease mode is determined from packageSource.</param>
         /// <param name="gitUrlOverride">Pre-captured value from EditorPrefs GitUrlOverride</param>
         /// <param name="packageSource">Pre-captured value from GetMcpServerPackageSource()</param>
         public static System.Collections.Generic.IList<string> GetBetaServerFromArgsList(bool useBetaServer, string gitUrlOverride, string packageSource)
@@ -333,8 +338,10 @@ public static System.Collections.Generic.IList<string> GetBetaServerFromArgsList
                 return args;
             }
 
-            // Beta server mode: use prerelease from PyPI
-            if (useBetaServer)
+            bool usePrereleaseRange = string.Equals(packageSource, "mcpforunityserver>=0.0.0a0", StringComparison.OrdinalIgnoreCase);
+
+            // Prerelease package mode: use prerelease from PyPI.
+            if (usePrereleaseRange)
             {
                 args.Add("--prerelease");
                 args.Add("explicit");
@@ -472,18 +479,26 @@ public static bool IsPreReleaseVersion()
                 if (string.IsNullOrEmpty(version) || version == "unknown")
                     return false;
 
-                // Check for common prerelease indicators in semver format
-                // e.g., "9.3.0-beta.1", "9.3.0-alpha", "9.3.0-rc.2", "9.3.0-preview"
-                return version.Contains("-beta", StringComparison.OrdinalIgnoreCase) ||
-                       version.Contains("-alpha", StringComparison.OrdinalIgnoreCase) ||
-                       version.Contains("-rc", StringComparison.OrdinalIgnoreCase) ||
-                       version.Contains("-preview", StringComparison.OrdinalIgnoreCase) ||
-                       version.Contains("-pre", StringComparison.OrdinalIgnoreCase);
+                return IsSemVerPreRelease(version);
             }
             catch
             {
                 return false;
             }
         }
+
+        private static bool IsSemVerPreRelease(string version)
+        {
+            if (string.IsNullOrEmpty(version))
+                return false;
+
+            // Common semver prerelease indicators:
+            // e.g., "9.3.0-beta.1", "9.3.0-alpha", "9.3.0-rc.2", "9.3.0-preview"
+            return version.Contains("-beta", StringComparison.OrdinalIgnoreCase) ||
+                   version.Contains("-alpha", StringComparison.OrdinalIgnoreCase) ||
+                   version.Contains("-rc", StringComparison.OrdinalIgnoreCase) ||
+                   version.Contains("-preview", StringComparison.OrdinalIgnoreCase) ||
+                   version.Contains("-pre", StringComparison.OrdinalIgnoreCase);
+        }
     }
 }
diff --git a/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs b/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
index 938d33c26..815477232 100644
--- a/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
+++ b/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
@@ -52,6 +52,7 @@ private static void PopulateUnityNode(JObject unity, string uvPath, McpClient cl
             bool prefValue = EditorConfigurationCache.Instance.UseHttpTransport;
             bool clientSupportsHttp = client?.SupportsHttpTransport != false;
             bool useHttpTransport = clientSupportsHttp && prefValue;
+            bool isCline = client?.name == "Cline";
             string httpProperty = string.IsNullOrEmpty(client?.HttpUrlProperty) ? "url" : client.HttpUrlProperty;
             var urlPropsToRemove = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "url", "serverUrl" };
             urlPropsToRemove.Remove(httpProperty);
@@ -100,6 +101,11 @@ private static void PopulateUnityNode(JObject unity, string uvPath, McpClient cl
                 {
                     unity["type"] = "http";
                 }
+                // Cline expects streamableHttp for HTTP endpoints.
+                else if (isCline)
+                {
+                    unity["type"] = "streamableHttp";
+                }
             }
             else
             {
@@ -119,10 +125,14 @@ private static void PopulateUnityNode(JObject unity, string uvPath, McpClient cl
                 {
                     unity["type"] = "stdio";
                 }
+                else if (isCline)
+                {
+                    unity["type"] = "stdio";
+                }
             }
 
-            // Remove type for non-VSCode clients (except Claude Code which needs it)
-            if (!isVSCode && client?.name != "Claude Code" && unity["type"] != null)
+            // Remove type for non-VSCode clients (except clients that explicitly require it)
+            if (!isVSCode && client?.name != "Claude Code" && !isCline && unity["type"] != null)
             {
                 unity.Remove("type");
             }
diff --git a/MCPForUnity/Editor/Services/EditorConfigurationCache.cs b/MCPForUnity/Editor/Services/EditorConfigurationCache.cs
index 3f8f04a9f..94f6a397a 100644
--- a/MCPForUnity/Editor/Services/EditorConfigurationCache.cs
+++ b/MCPForUnity/Editor/Services/EditorConfigurationCache.cs
@@ -48,7 +48,6 @@ public static EditorConfigurationCache Instance
         // Cached values - most frequently read
         private bool _useHttpTransport;
         private bool _debugLogs;
-        private bool _useBetaServer;
         private bool _devModeForceServerRefresh;
         private string _uvxPathOverride;
         private string _gitUrlOverride;
@@ -70,12 +69,6 @@ public static EditorConfigurationCache Instance
         /// </summary>
         public bool DebugLogs => _debugLogs;
 
-        /// <summary>
-        /// Whether to use the beta server channel.
-        /// Default: true
-        /// </summary>
-        public bool UseBetaServer => _useBetaServer;
-
         /// <summary>
         /// Whether to force server refresh in dev mode (--no-cache --refresh).
         /// Default: false
@@ -124,23 +117,6 @@ public static EditorConfigurationCache Instance
         /// </summary>
         public int UnitySocketPort => _unitySocketPort;
 
-        /// <summary>
-        /// Gets UseBetaServer value with dynamic default based on package version.
-        /// If the pref hasn't been explicitly set, defaults to true for prerelease packages
-        /// (beta, alpha, rc, etc.) and false for stable releases.
-        /// </summary>
-        private static bool GetUseBetaServerWithDynamicDefault()
-        {
-            // If user has explicitly set the pref, use that value
-            if (EditorPrefs.HasKey(EditorPrefKeys.UseBetaServer))
-            {
-                return EditorPrefs.GetBool(EditorPrefKeys.UseBetaServer, false);
-            }
-
-            // Otherwise, default based on whether this is a prerelease package
-            return Helpers.AssetPathUtility.IsPreReleaseVersion();
-        }
-
         private EditorConfigurationCache()
         {
             Refresh();
@@ -154,7 +130,6 @@ public void Refresh()
         {
             _useHttpTransport = EditorPrefs.GetBool(EditorPrefKeys.UseHttpTransport, true);
             _debugLogs = EditorPrefs.GetBool(EditorPrefKeys.DebugLogs, false);
-            _useBetaServer = GetUseBetaServerWithDynamicDefault();
             _devModeForceServerRefresh = EditorPrefs.GetBool(EditorPrefKeys.DevModeForceServerRefresh, false);
             _uvxPathOverride = EditorPrefs.GetString(EditorPrefKeys.UvxPathOverride, string.Empty);
             _gitUrlOverride = EditorPrefs.GetString(EditorPrefKeys.GitUrlOverride, string.Empty);
@@ -191,19 +166,6 @@ public void SetDebugLogs(bool value)
             }
         }
 
-        /// <summary>
-        /// Set UseBetaServer and update cache + EditorPrefs atomically.
-        /// </summary>
-        public void SetUseBetaServer(bool value)
-        {
-            if (_useBetaServer != value)
-            {
-                _useBetaServer = value;
-                EditorPrefs.SetBool(EditorPrefKeys.UseBetaServer, value);
-                OnConfigurationChanged?.Invoke(nameof(UseBetaServer));
-            }
-        }
-
         /// <summary>
         /// Set DevModeForceServerRefresh and update cache + EditorPrefs atomically.
         /// </summary>
@@ -328,9 +290,6 @@ public void InvalidateKey(string keyName)
                 case nameof(DebugLogs):
                     _debugLogs = EditorPrefs.GetBool(EditorPrefKeys.DebugLogs, false);
                     break;
-                case nameof(UseBetaServer):
-                    _useBetaServer = GetUseBetaServerWithDynamicDefault();
-                    break;
                 case nameof(DevModeForceServerRefresh):
                     _devModeForceServerRefresh = EditorPrefs.GetBool(EditorPrefKeys.DevModeForceServerRefresh, false);
                     break;
diff --git a/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs b/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs
index 4957e7da8..26f610167 100644
--- a/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs
+++ b/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs
@@ -26,7 +26,6 @@ public class McpAdvancedSection
         private Button clearGitUrlButton;
         private Toggle debugLogsToggle;
         private Toggle devModeForceRefreshToggle;
-        private Toggle useBetaServerToggle;
         private TextField deploySourcePath;
         private Button browseDeploySourceButton;
         private Button clearDeploySourceButton;
@@ -43,7 +42,6 @@ public class McpAdvancedSection
         public event Action OnGitUrlChanged;
         public event Action OnHttpServerCommandUpdateRequested;
         public event Action OnTestConnectionRequested;
-        public event Action<bool> OnBetaModeChanged;
 
         public VisualElement Root { get; private set; }
 
@@ -66,7 +64,6 @@ private void CacheUIElements()
             clearGitUrlButton = Root.Q<Button>("clear-git-url-button");
             debugLogsToggle = Root.Q<Toggle>("debug-logs-toggle");
             devModeForceRefreshToggle = Root.Q<Toggle>("dev-mode-force-refresh-toggle");
-            useBetaServerToggle = Root.Q<Toggle>("use-beta-server-toggle");
             deploySourcePath = Root.Q<TextField>("deploy-source-path");
             browseDeploySourceButton = Root.Q<Button>("browse-deploy-source-button");
             clearDeploySourceButton = Root.Q<Button>("clear-deploy-source-button");
@@ -101,13 +98,6 @@ private void InitializeUI()
                 if (forceRefreshLabel != null)
                     forceRefreshLabel.tooltip = devModeForceRefreshToggle.tooltip;
             }
-            if (useBetaServerToggle != null)
-            {
-                useBetaServerToggle.tooltip = "When enabled, uvx will fetch the latest beta server version from PyPI. Enable this on the beta branch to get the matching server version.";
-                var betaServerLabel = useBetaServerToggle?.parent?.Q<Label>();
-                if (betaServerLabel != null)
-                    betaServerLabel.tooltip = useBetaServerToggle.tooltip;
-            }
             if (testConnectionButton != null)
                 testConnectionButton.tooltip = "Test the connection between Unity and the MCP server.";
             if (deploySourcePath != null)
@@ -138,7 +128,6 @@ private void InitializeUI()
             McpLog.SetDebugLoggingEnabled(debugEnabled);
 
             devModeForceRefreshToggle.value = EditorPrefs.GetBool(EditorPrefKeys.DevModeForceServerRefresh, false);
-            useBetaServerToggle.value = EditorConfigurationCache.Instance.UseBetaServer;
             UpdatePathOverrides();
             UpdateDeploymentSection();
         }
@@ -183,13 +172,6 @@ private void RegisterCallbacks()
                 OnHttpServerCommandUpdateRequested?.Invoke();
             });
 
-            useBetaServerToggle.RegisterValueChangedCallback(evt =>
-            {
-                EditorConfigurationCache.Instance.SetUseBetaServer(evt.newValue);
-                OnHttpServerCommandUpdateRequested?.Invoke();
-                OnBetaModeChanged?.Invoke(evt.newValue);
-            });
-
             deploySourcePath.RegisterValueChangedCallback(evt =>
             {
                 string path = evt.newValue?.Trim();
@@ -292,7 +274,6 @@ public void UpdatePathOverrides()
             gitUrlOverride.value = EditorPrefs.GetString(EditorPrefKeys.GitUrlOverride, "");
             debugLogsToggle.value = EditorPrefs.GetBool(EditorPrefKeys.DebugLogs, false);
             devModeForceRefreshToggle.value = EditorPrefs.GetBool(EditorPrefKeys.DevModeForceServerRefresh, false);
-            useBetaServerToggle.value = EditorConfigurationCache.Instance.UseBetaServer;
             UpdateDeploymentSection();
         }
 
diff --git a/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.uxml b/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.uxml
index ea5358aab..50b3412c0 100644
--- a/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.uxml
+++ b/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.uxml
@@ -41,11 +41,6 @@
                 <ui:Toggle name="dev-mode-force-refresh-toggle" class="setting-toggle" />
             </ui:VisualElement>
 
-            <ui:VisualElement class="setting-row">
-                <ui:Label text="Use Beta Server:" class="setting-label" />
-                <ui:Toggle name="use-beta-server-toggle" class="setting-toggle" />
-            </ui:VisualElement>
-
             <ui:VisualElement class="override-row" style="margin-top: 8px;">
                 <ui:Label text="Package Source:" class="override-label" />
             </ui:VisualElement>
diff --git a/MCPForUnity/Editor/Windows/Components/ClientConfig/McpClientConfigSection.cs b/MCPForUnity/Editor/Windows/Components/ClientConfig/McpClientConfigSection.cs
index f2f58155c..33ffc8a79 100644
--- a/MCPForUnity/Editor/Windows/Components/ClientConfig/McpClientConfigSection.cs
+++ b/MCPForUnity/Editor/Windows/Components/ClientConfig/McpClientConfigSection.cs
@@ -490,8 +490,8 @@ private void RefreshClaudeCliStatus(IMcpClientConfigurator client, bool forceImm
                 string claudePath = MCPServiceLocator.Paths.GetClaudeCliPath();
                 RuntimePlatform platform = Application.platform;
                 bool isRemoteScope = HttpEndpointUtility.IsRemoteScope();
-                // Get expected package source considering beta mode (bypass cache for fresh read)
-                string expectedPackageSource = GetExpectedPackageSourceForBetaMode();
+                // Get expected package source based on installed package version and overrides.
+                string expectedPackageSource = GetExpectedPackageSourceForCurrentPackage();
 
                 Task.Run(() =>
                 {
@@ -621,38 +621,12 @@ private void ApplyStatusToUi(IMcpClientConfigurator client, bool showChecking =
         }
 
         /// <summary>
-        /// Gets the expected package source for validation, accounting for beta mode.
+        /// Gets the expected package source for validation based on installed package version.
         /// Uses the same logic as registration to ensure validation matches what was registered.
         /// MUST be called from the main thread due to EditorPrefs access.
         /// </summary>
-        private static string GetExpectedPackageSourceForBetaMode()
+        private static string GetExpectedPackageSourceForCurrentPackage()
         {
-            // Check for explicit override first
-            string gitUrlOverride = EditorPrefs.GetString(EditorPrefKeys.GitUrlOverride, "");
-            if (!string.IsNullOrEmpty(gitUrlOverride))
-            {
-                return gitUrlOverride;
-            }
-
-            // Check beta mode using the same logic as GetUseBetaServerWithDynamicDefault
-            // (bypass cache to ensure fresh read)
-            bool useBetaServer;
-            if (EditorPrefs.HasKey(EditorPrefKeys.UseBetaServer))
-            {
-                useBetaServer = EditorPrefs.GetBool(EditorPrefKeys.UseBetaServer, false);
-            }
-            else
-            {
-                // Dynamic default based on package version
-                useBetaServer = AssetPathUtility.IsPreReleaseVersion();
-            }
-
-            if (useBetaServer)
-            {
-                return "mcpforunityserver>=0.0.0a0";
-            }
-
-            // Standard mode uses exact version from package.json
             return AssetPathUtility.GetMcpServerPackageSource();
         }
 
diff --git a/MCPForUnity/Editor/Windows/EditorPrefs/EditorPrefsWindow.cs b/MCPForUnity/Editor/Windows/EditorPrefs/EditorPrefsWindow.cs
index e01f7f029..17369bb1f 100644
--- a/MCPForUnity/Editor/Windows/EditorPrefs/EditorPrefsWindow.cs
+++ b/MCPForUnity/Editor/Windows/EditorPrefs/EditorPrefsWindow.cs
@@ -42,7 +42,6 @@ public class EditorPrefsWindow : EditorWindow
             { EditorPrefKeys.CustomToolRegistrationEnabled, EditorPrefType.Bool },
             { EditorPrefKeys.TelemetryDisabled, EditorPrefType.Bool },
             { EditorPrefKeys.DevModeForceServerRefresh, EditorPrefType.Bool },
-            { EditorPrefKeys.UseBetaServer, EditorPrefType.Bool },
             { EditorPrefKeys.ProjectScopedToolsLocalHttp, EditorPrefType.Bool },
             
             // Integer prefs
diff --git a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
index 85f5f3359..4f0904907 100644
--- a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
+++ b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
@@ -196,8 +196,8 @@ public void CreateGUI()
                 return;
             }
 
-            // Initialize version label
-            UpdateVersionLabel(EditorConfigurationCache.Instance.UseBetaServer);
+            // Initialize version label
+            UpdateVersionLabel();
 
             SetupTabs();
 
@@ -268,12 +268,9 @@ public void CreateGUI()
                     if (connectionSection != null)
                         await connectionSection.VerifyBridgeConnectionAsync();
                 };
-                advancedSection.OnBetaModeChanged += UpdateVersionLabel;
-                advancedSection.OnBetaModeChanged += _ => clientConfigSection?.RefreshSelectedClient(forceImmediate: true);
-
-                // Wire up health status updates from Connection to Advanced
-                connectionSection?.SetHealthStatusUpdateCallback((isHealthy, statusText) =>
-                    advancedSection?.UpdateHealthStatus(isHealthy, statusText));
+                // Wire up health status updates from Connection to Advanced
+                connectionSection?.SetHealthStatusUpdateCallback((isHealthy, statusText) =>
+                    advancedSection?.UpdateHealthStatus(isHealthy, statusText));
             }
 
             // Load and initialize Tools section
@@ -326,17 +323,17 @@ public void CreateGUI()
             RefreshAllData();
         }
 
-        private void UpdateVersionLabel(bool useBetaServer)
+        private void UpdateVersionLabel()
         {
             if (versionLabel == null)
             {
                 return;
-            }
-
-            string version = AssetPathUtility.GetPackageVersion();
-            versionLabel.text = $"v{version}";
-            versionLabel.tooltip = useBetaServer
-                ? "Beta server mode - fetching pre-release server versions from PyPI"
+            }
+
+            string version = AssetPathUtility.GetPackageVersion();
+            versionLabel.text = $"v{version}";
+            versionLabel.tooltip = AssetPathUtility.IsPreReleaseVersion()
+                ? $"MCP For Unity v{version} (pre-release package, using prerelease server channel)"
                 : $"MCP For Unity v{version}";
         }
 
@@ -605,11 +602,11 @@ private void SwitchPanel(ActivePanel panel)
             // Show selected panel
             switch (panel)
             {
-                case ActivePanel.Clients:
-                    if (clientsPanel != null) clientsPanel.style.display = DisplayStyle.Flex;
-                    // Refresh client status when switching to Connect tab (e.g., after changing beta mode in Advanced)
-                    clientConfigSection?.RefreshSelectedClient(forceImmediate: true);
-                    break;
+                case ActivePanel.Clients:
+                    if (clientsPanel != null) clientsPanel.style.display = DisplayStyle.Flex;
+                    // Refresh client status when switching to Connect tab (e.g., after package/version changes).
+                    clientConfigSection?.RefreshSelectedClient(forceImmediate: true);
+                    break;
                 case ActivePanel.Validation:
                     if (validationPanel != null) validationPanel.style.display = DisplayStyle.Flex;
                     break;

From 886c5b406c8d412185404c5c23e7041063cb6991 Mon Sep 17 00:00:00 2001
From: David Sarno <david@lighthaus.us>
Date: Thu, 12 Feb 2026 15:48:41 -0800
Subject: [PATCH 2/2] Clean up Cline configurator branch: remove useBetaServer
 param and whitespace noise

- Remove deprecated `useBetaServer` parameter from GetBetaServerFromArgs/List thread-safe overloads
- Strip whitespace-only reformatting from MCPForUnityEditorWindow.cs, keeping only real changes
- Remove stale EditorPrefKeys.UseBetaServer references from CodexConfigHelperTests

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../Editor/Helpers/AssetPathUtility.cs        |  10 +-
 .../Editor/Windows/MCPForUnityEditorWindow.cs | 164 +++++++++---------
 .../Helpers/CodexConfigHelperTests.cs         |  14 --
 3 files changed, 86 insertions(+), 102 deletions(-)

diff --git a/MCPForUnity/Editor/Helpers/AssetPathUtility.cs b/MCPForUnity/Editor/Helpers/AssetPathUtility.cs
index 517b1900b..1761885bc 100644
--- a/MCPForUnity/Editor/Helpers/AssetPathUtility.cs
+++ b/MCPForUnity/Editor/Helpers/AssetPathUtility.cs
@@ -264,18 +264,17 @@ public static string GetBetaServerFromArgs(bool quoteFromPath = false)
         {
             string gitUrlOverride = EditorPrefs.GetString(EditorPrefKeys.GitUrlOverride, "");
             string packageSource = GetMcpServerPackageSource();
-            return GetBetaServerFromArgs(useBetaServer: false, gitUrlOverride, packageSource, quoteFromPath);
+            return GetBetaServerFromArgs(gitUrlOverride, packageSource, quoteFromPath);
         }
 
         /// <summary>
         /// Thread-safe overload that accepts pre-captured values.
         /// Use this when calling from background threads.
         /// </summary>
-        /// <param name="useBetaServer">Deprecated. Ignored; prerelease mode is determined from packageSource.</param>
         /// <param name="gitUrlOverride">Pre-captured value from EditorPrefs GitUrlOverride</param>
         /// <param name="packageSource">Pre-captured value from GetMcpServerPackageSource()</param>
         /// <param name="quoteFromPath">Whether to quote the --from path</param>
-        public static string GetBetaServerFromArgs(bool useBetaServer, string gitUrlOverride, string packageSource, bool quoteFromPath = false)
+        public static string GetBetaServerFromArgs(string gitUrlOverride, string packageSource, bool quoteFromPath = false)
         {
             // Explicit override (local path, git URL, etc.) always wins
             if (!string.IsNullOrEmpty(gitUrlOverride))
@@ -316,17 +315,16 @@ public static System.Collections.Generic.IList<string> GetBetaServerFromArgsList
         {
             string gitUrlOverride = EditorPrefs.GetString(EditorPrefKeys.GitUrlOverride, "");
             string packageSource = GetMcpServerPackageSource();
-            return GetBetaServerFromArgsList(useBetaServer: false, gitUrlOverride, packageSource);
+            return GetBetaServerFromArgsList(gitUrlOverride, packageSource);
         }
 
         /// <summary>
         /// Thread-safe overload that accepts pre-captured values.
         /// Use this when calling from background threads.
         /// </summary>
-        /// <param name="useBetaServer">Deprecated. Ignored; prerelease mode is determined from packageSource.</param>
         /// <param name="gitUrlOverride">Pre-captured value from EditorPrefs GitUrlOverride</param>
         /// <param name="packageSource">Pre-captured value from GetMcpServerPackageSource()</param>
-        public static System.Collections.Generic.IList<string> GetBetaServerFromArgsList(bool useBetaServer, string gitUrlOverride, string packageSource)
+        public static System.Collections.Generic.IList<string> GetBetaServerFromArgsList(string gitUrlOverride, string packageSource)
         {
             var args = new System.Collections.Generic.List<string>();
 
diff --git a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
index 4f0904907..2e6f4bc52 100644
--- a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
+++ b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
@@ -47,10 +47,10 @@ public class MCPForUnityEditorWindow : EditorWindow
         private static readonly HashSet<MCPForUnityEditorWindow> OpenWindows = new();
         private bool guiCreated = false;
         private bool toolsLoaded = false;
-        private bool resourcesLoaded = false;
-        private double lastRefreshTime = 0;
-        private const double RefreshDebounceSeconds = 0.5;
-        private bool updateCheckQueued = false;
+        private bool resourcesLoaded = false;
+        private double lastRefreshTime = 0;
+        private const double RefreshDebounceSeconds = 0.5;
+        private bool updateCheckQueued = false;
 
         private enum ActivePanel
         {
@@ -196,8 +196,8 @@ public void CreateGUI()
                 return;
             }
 
-            // Initialize version label
-            UpdateVersionLabel();
+            // Initialize version label
+            UpdateVersionLabel();
 
             SetupTabs();
 
@@ -268,9 +268,9 @@ public void CreateGUI()
                     if (connectionSection != null)
                         await connectionSection.VerifyBridgeConnectionAsync();
                 };
-                // Wire up health status updates from Connection to Advanced
-                connectionSection?.SetHealthStatusUpdateCallback((isHealthy, statusText) =>
-                    advancedSection?.UpdateHealthStatus(isHealthy, statusText));
+                // Wire up health status updates from Connection to Advanced
+                connectionSection?.SetHealthStatusUpdateCallback((isHealthy, statusText) =>
+                    advancedSection?.UpdateHealthStatus(isHealthy, statusText));
             }
 
             // Load and initialize Tools section
@@ -319,70 +319,70 @@ public void CreateGUI()
 
             guiCreated = true;
 
-            // Initial updates
-            RefreshAllData();
-        }
-
-        private void UpdateVersionLabel()
-        {
-            if (versionLabel == null)
-            {
-                return;
-            }
-
-            string version = AssetPathUtility.GetPackageVersion();
-            versionLabel.text = $"v{version}";
-            versionLabel.tooltip = AssetPathUtility.IsPreReleaseVersion()
-                ? $"MCP For Unity v{version} (pre-release package, using prerelease server channel)"
-                : $"MCP For Unity v{version}";
-        }
-
-        private void QueueUpdateCheck()
-        {
-            if (updateCheckQueued)
-            {
-                return;
-            }
-
-            updateCheckQueued = true;
-            EditorApplication.delayCall += CheckForPackageUpdates;
-        }
-
-        private void CheckForPackageUpdates()
-        {
-            updateCheckQueued = false;
-
-            if (updateNotification == null || updateNotificationText == null)
-            {
-                return;
-            }
-
-            string currentVersion = AssetPathUtility.GetPackageVersion();
-            if (string.IsNullOrEmpty(currentVersion) || currentVersion == "unknown")
-            {
-                updateNotification.RemoveFromClassList("visible");
-                return;
-            }
-
-            try
-            {
-                var result = MCPServiceLocator.Updates.CheckForUpdate(currentVersion);
-                if (result.CheckSucceeded && result.UpdateAvailable && !string.IsNullOrEmpty(result.LatestVersion))
-                {
-                    updateNotificationText.text = $"Newer version available: v{result.LatestVersion} (current v{currentVersion})";
-                    updateNotification.AddToClassList("visible");
-                }
-                else
-                {
-                    updateNotification.RemoveFromClassList("visible");
-                }
-            }
-            catch (Exception ex)
-            {
-                McpLog.Info($"Package update check skipped: {ex.Message}");
-                updateNotification.RemoveFromClassList("visible");
-            }
-        }
+            // Initial updates
+            RefreshAllData();
+        }
+
+        private void UpdateVersionLabel()
+        {
+            if (versionLabel == null)
+            {
+                return;
+            }
+
+            string version = AssetPathUtility.GetPackageVersion();
+            versionLabel.text = $"v{version}";
+            versionLabel.tooltip = AssetPathUtility.IsPreReleaseVersion()
+                ? $"MCP For Unity v{version} (pre-release package, using prerelease server channel)"
+                : $"MCP For Unity v{version}";
+        }
+
+        private void QueueUpdateCheck()
+        {
+            if (updateCheckQueued)
+            {
+                return;
+            }
+
+            updateCheckQueued = true;
+            EditorApplication.delayCall += CheckForPackageUpdates;
+        }
+
+        private void CheckForPackageUpdates()
+        {
+            updateCheckQueued = false;
+
+            if (updateNotification == null || updateNotificationText == null)
+            {
+                return;
+            }
+
+            string currentVersion = AssetPathUtility.GetPackageVersion();
+            if (string.IsNullOrEmpty(currentVersion) || currentVersion == "unknown")
+            {
+                updateNotification.RemoveFromClassList("visible");
+                return;
+            }
+
+            try
+            {
+                var result = MCPServiceLocator.Updates.CheckForUpdate(currentVersion);
+                if (result.CheckSucceeded && result.UpdateAvailable && !string.IsNullOrEmpty(result.LatestVersion))
+                {
+                    updateNotificationText.text = $"Newer version available: v{result.LatestVersion} (current v{currentVersion})";
+                    updateNotification.AddToClassList("visible");
+                }
+                else
+                {
+                    updateNotification.RemoveFromClassList("visible");
+                }
+            }
+            catch (Exception ex)
+            {
+                McpLog.Info($"Package update check skipped: {ex.Message}");
+                updateNotification.RemoveFromClassList("visible");
+            }
+        }
 
         private void EnsureToolsLoaded()
         {
@@ -503,10 +503,10 @@ private void RefreshAllData()
                 _ = connectionSection?.VerifyBridgeConnectionAsync();
             }
 
-            advancedSection?.UpdatePathOverrides();
-            clientConfigSection?.RefreshSelectedClient();
-            QueueUpdateCheck();
-        }
+            advancedSection?.UpdatePathOverrides();
+            clientConfigSection?.RefreshSelectedClient();
+            QueueUpdateCheck();
+        }
 
         private void SetupTabs()
         {
@@ -602,11 +602,11 @@ private void SwitchPanel(ActivePanel panel)
             // Show selected panel
             switch (panel)
             {
-                case ActivePanel.Clients:
-                    if (clientsPanel != null) clientsPanel.style.display = DisplayStyle.Flex;
-                    // Refresh client status when switching to Connect tab (e.g., after package/version changes).
-                    clientConfigSection?.RefreshSelectedClient(forceImmediate: true);
-                    break;
+                case ActivePanel.Clients:
+                    if (clientsPanel != null) clientsPanel.style.display = DisplayStyle.Flex;
+                    // Refresh client status when switching to Connect tab (e.g., after package/version changes).
+                    clientConfigSection?.RefreshSelectedClient(forceImmediate: true);
+                    break;
                 case ActivePanel.Validation:
                     if (validationPanel != null) validationPanel.style.display = DisplayStyle.Flex;
                     break;
diff --git a/TestProjects/UnityMCPTests/Assets/Tests/EditMode/Helpers/CodexConfigHelperTests.cs b/TestProjects/UnityMCPTests/Assets/Tests/EditMode/Helpers/CodexConfigHelperTests.cs
index 5e5bf3367..0ffda8643 100644
--- a/TestProjects/UnityMCPTests/Assets/Tests/EditMode/Helpers/CodexConfigHelperTests.cs
+++ b/TestProjects/UnityMCPTests/Assets/Tests/EditMode/Helpers/CodexConfigHelperTests.cs
@@ -34,8 +34,6 @@ public MockPlatformService(bool isWindows, string systemRoot = "C:\\Windows")
         private bool _originalHttpTransport;
         private bool _hadDevForceRefresh;
         private bool _originalDevForceRefresh;
-        private bool _hadUseBetaServer;
-        private bool _originalUseBetaServer;
         private IPlatformService _originalPlatformService;
 
         [OneTimeSetUp]
@@ -47,8 +45,6 @@ public void OneTimeSetUp()
             _originalHttpTransport = EditorPrefs.GetBool(EditorPrefKeys.UseHttpTransport, true);
             _hadDevForceRefresh = EditorPrefs.HasKey(EditorPrefKeys.DevModeForceServerRefresh);
             _originalDevForceRefresh = EditorPrefs.GetBool(EditorPrefKeys.DevModeForceServerRefresh, false);
-            _hadUseBetaServer = EditorPrefs.HasKey(EditorPrefKeys.UseBetaServer);
-            _originalUseBetaServer = EditorPrefs.GetBool(EditorPrefKeys.UseBetaServer, true);
             _originalPlatformService = MCPServiceLocator.Platform;
         }
 
@@ -62,8 +58,6 @@ public void SetUp()
             // Ensure deterministic uvx args ordering for these tests regardless of editor settings
             // (dev-mode inserts --no-cache/--refresh, which changes the first args).
             EditorPrefs.SetBool(EditorPrefKeys.DevModeForceServerRefresh, false);
-            // Tests expect beta server mode (--prerelease explicit --from mcpforunityserver>=0.0.0a0)
-            EditorPrefs.SetBool(EditorPrefKeys.UseBetaServer, true);
             // Refresh the cache so it picks up the test's pref values
             EditorConfigurationCache.Instance.Refresh();
         }
@@ -117,14 +111,6 @@ public void OneTimeTearDown()
                 EditorPrefs.DeleteKey(EditorPrefKeys.DevModeForceServerRefresh);
             }
 
-            if (_hadUseBetaServer)
-            {
-                EditorPrefs.SetBool(EditorPrefKeys.UseBetaServer, _originalUseBetaServer);
-            }
-            else
-            {
-                EditorPrefs.DeleteKey(EditorPrefKeys.UseBetaServer);
-            }
         }
 
         [Test]