From 5fc99b4d96e14cde9e58f3a7a2efeb65c7508f8a Mon Sep 17 00:00:00 2001
From: Marcus Sanatan <msanatan@gmail.com>
Date: Tue, 27 Jan 2026 02:06:40 -0400
Subject: [PATCH 1/7] feat: add TestPyPI toggle for pre-release server package
 testing

- Add UseTestPyPI editor preference key
- Add TestPyPI toggle to Advanced settings UI with tooltip
- Configure uvx to use test.pypi.org when TestPyPI mode enabled
- Skip version pinning in TestPyPI mode to get latest pre-release
- Update ConfigJsonBuilder to handle TestPyPI index URL
---
 MCPForUnity/Editor/Constants/EditorPrefKeys.cs  |  1 +
 MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs | 16 ++++++++++++++--
 .../Components/Advanced/McpAdvancedSection.cs   | 17 +++++++++++++++++
 .../Components/Advanced/McpAdvancedSection.uxml |  5 +++++
 4 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/MCPForUnity/Editor/Constants/EditorPrefKeys.cs b/MCPForUnity/Editor/Constants/EditorPrefKeys.cs
index a6e81b4ac..42bfac2dd 100644
--- a/MCPForUnity/Editor/Constants/EditorPrefKeys.cs
+++ b/MCPForUnity/Editor/Constants/EditorPrefKeys.cs
@@ -28,6 +28,7 @@ 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 UseTestPyPI = "MCPForUnity.UseTestPyPI";
         internal const string ProjectScopedToolsLocalHttp = "MCPForUnity.ProjectScopedTools.LocalHttp";
 
         internal const string PackageDeploySourcePath = "MCPForUnity.PackageDeploy.SourcePath";
diff --git a/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs b/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
index dd00d73d0..489e9a070 100644
--- a/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
+++ b/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using MCPForUnity.Editor.Constants;
 using MCPForUnity.Editor.Clients.Configurators;
+using MCPForUnity.Editor.Constants;
 using MCPForUnity.Editor.Helpers;
 using MCPForUnity.Editor.Models;
 using Newtonsoft.Json;
@@ -170,7 +170,19 @@ private static IList<string> BuildUvxArgs(string fromUrl, string packageName)
                 args.Add("--no-cache");
                 args.Add("--refresh");
             }
-            if (!string.IsNullOrEmpty(fromUrl))
+
+            // TestPyPI mode: use test.pypi.org as the default index for pre-release testing
+            // When using TestPyPI, don't pin version since TestPyPI versions may differ from PyPI
+            bool useTestPyPI = EditorPrefs.GetBool(EditorPrefKeys.UseTestPyPI, false);
+            if (useTestPyPI)
+            {
+                args.Add("--default-index");
+                args.Add("https://test.pypi.org/simple/");
+                // Use unversioned package name to get latest from TestPyPI
+                args.Add("--from");
+                args.Add("mcpforunityserver");
+            }
+            else if (!string.IsNullOrEmpty(fromUrl))
             {
                 args.Add("--from");
                 args.Add(fromUrl);
diff --git a/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs b/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs
index 26f610167..cc5d1defb 100644
--- a/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs
+++ b/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs
@@ -26,6 +26,7 @@ public class McpAdvancedSection
         private Button clearGitUrlButton;
         private Toggle debugLogsToggle;
         private Toggle devModeForceRefreshToggle;
+        private Toggle useTestPyPIToggle;
         private TextField deploySourcePath;
         private Button browseDeploySourceButton;
         private Button clearDeploySourceButton;
@@ -64,6 +65,7 @@ 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");
+            useTestPyPIToggle = Root.Q<Toggle>("use-testpypi-toggle");
             deploySourcePath = Root.Q<TextField>("deploy-source-path");
             browseDeploySourceButton = Root.Q<Button>("browse-deploy-source-button");
             clearDeploySourceButton = Root.Q<Button>("clear-deploy-source-button");
@@ -98,6 +100,13 @@ private void InitializeUI()
                 if (forceRefreshLabel != null)
                     forceRefreshLabel.tooltip = devModeForceRefreshToggle.tooltip;
             }
+            if (useTestPyPIToggle != null)
+            {
+                useTestPyPIToggle.tooltip = "When enabled, uvx will use TestPyPI (test.pypi.org) instead of PyPI to fetch the server package. Useful for testing pre-release versions.";
+                var testPyPILabel = useTestPyPIToggle?.parent?.Q<Label>();
+                if (testPyPILabel != null)
+                    testPyPILabel.tooltip = useTestPyPIToggle.tooltip;
+            }
             if (testConnectionButton != null)
                 testConnectionButton.tooltip = "Test the connection between Unity and the MCP server.";
             if (deploySourcePath != null)
@@ -128,6 +137,7 @@ private void InitializeUI()
             McpLog.SetDebugLoggingEnabled(debugEnabled);
 
             devModeForceRefreshToggle.value = EditorPrefs.GetBool(EditorPrefKeys.DevModeForceServerRefresh, false);
+            useTestPyPIToggle.value = EditorPrefs.GetBool(EditorPrefKeys.UseTestPyPI, false);
             UpdatePathOverrides();
             UpdateDeploymentSection();
         }
@@ -172,6 +182,12 @@ private void RegisterCallbacks()
                 OnHttpServerCommandUpdateRequested?.Invoke();
             });
 
+            useTestPyPIToggle.RegisterValueChangedCallback(evt =>
+            {
+                EditorPrefs.SetBool(EditorPrefKeys.UseTestPyPI, evt.newValue);
+                OnHttpServerCommandUpdateRequested?.Invoke();
+            });
+
             deploySourcePath.RegisterValueChangedCallback(evt =>
             {
                 string path = evt.newValue?.Trim();
@@ -274,6 +290,7 @@ public void UpdatePathOverrides()
             gitUrlOverride.value = EditorPrefs.GetString(EditorPrefKeys.GitUrlOverride, "");
             debugLogsToggle.value = EditorPrefs.GetBool(EditorPrefKeys.DebugLogs, false);
             devModeForceRefreshToggle.value = EditorPrefs.GetBool(EditorPrefKeys.DevModeForceServerRefresh, false);
+            useTestPyPIToggle.value = EditorPrefs.GetBool(EditorPrefKeys.UseTestPyPI, false);
             UpdateDeploymentSection();
         }
 
diff --git a/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.uxml b/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.uxml
index 50b3412c0..90a9b214a 100644
--- a/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.uxml
+++ b/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.uxml
@@ -41,6 +41,11 @@
                 <ui:Toggle name="dev-mode-force-refresh-toggle" class="setting-toggle" />
             </ui:VisualElement>
 
+            <ui:VisualElement class="setting-row">
+                <ui:Label text="Use TestPyPI:" class="setting-label" />
+                <ui:Toggle name="use-testpypi-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>

From 8be54d28d5dc55922eb7bd9c6e4674b86e2dc4a3 Mon Sep 17 00:00:00 2001
From: Marcus Sanatan <msanatan@gmail.com>
Date: Tue, 27 Jan 2026 02:06:47 -0400
Subject: [PATCH 2/7] Update .meta file

---
 .../Configurators/OpenCodeConfigurator.cs.meta        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/MCPForUnity/Editor/Clients/Configurators/OpenCodeConfigurator.cs.meta b/MCPForUnity/Editor/Clients/Configurators/OpenCodeConfigurator.cs.meta
index 8094fb1d0..c3b334d51 100644
--- a/MCPForUnity/Editor/Clients/Configurators/OpenCodeConfigurator.cs.meta
+++ b/MCPForUnity/Editor/Clients/Configurators/OpenCodeConfigurator.cs.meta
@@ -1,2 +1,11 @@
 fileFormatVersion: 2
-guid: 489f99ffb7e6743e88e3203552c8b37b
\ No newline at end of file
+guid: 489f99ffb7e6743e88e3203552c8b37b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

From fe0e89040adaff0ff84e7750598d2d7f985d122e Mon Sep 17 00:00:00 2001
From: David Sarno <david@lighthaus.us>
Date: Tue, 27 Jan 2026 10:56:05 -0800
Subject: [PATCH 3/7] fix: Use PyPI pre-release versions instead of TestPyPI
 for beta server

TestPyPI has polluted packages (broken httpx, mcp, fastapi) that cause
server startup failures. Switch to publishing beta versions directly to
PyPI as pre-releases (e.g., 9.3.0b20260127).

Key changes:
- beta-release.yml: Publish to PyPI instead of TestPyPI, use beta suffix
- Use --prerelease explicit with version specifier (>=0.0.0a0) to only
  get prereleases of our package, not broken dependency prereleases
- Default "Use Beta Server" toggle to true on beta branch
- Rename UI label from "Use TestPyPI" to "Use Beta Server"
- Add UseTestPyPI to EditorPrefsWindow known prefs
- Add search field and refresh button to EditorPrefsWindow

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 .github/workflows/beta-release.yml            | 33 +++++++-------
 .../Editor/Helpers/ConfigJsonBuilder.cs       | 18 ++++----
 .../Services/ServerManagementService.cs       | 24 +++++++++-
 .../Components/Advanced/McpAdvancedSection.cs |  6 +--
 .../Advanced/McpAdvancedSection.uxml          |  2 +-
 .../Windows/EditorPrefs/EditorPrefsWindow.cs  | 44 ++++++++++++++++++-
 6 files changed, 96 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/beta-release.yml b/.github/workflows/beta-release.yml
index 8467b02c5..deb01a834 100644
--- a/.github/workflows/beta-release.yml
+++ b/.github/workflows/beta-release.yml
@@ -1,4 +1,4 @@
-name: Beta Release (TestPyPI)
+name: Beta Release (PyPI Pre-release)
 
 concurrency:
   group: beta-release
@@ -12,12 +12,12 @@ on:
       - "Server/**"
 
 jobs:
-  publish_testpypi:
-    name: Publish beta to TestPyPI
+  publish_pypi_prerelease:
+    name: Publish beta to PyPI (pre-release)
     runs-on: ubuntu-latest
     environment:
-      name: testpypi
-      url: https://test.pypi.org/p/mcpforunityserver
+      name: pypi
+      url: https://pypi.org/p/mcpforunityserver
     permissions:
       contents: read
       id-token: write
@@ -33,27 +33,29 @@ jobs:
           enable-cache: true
           cache-dependency-glob: "Server/uv.lock"
 
-      - name: Generate dev version
+      - name: Generate beta version
         id: version
         shell: bash
         run: |
           set -euo pipefail
           BASE_VERSION=$(grep -oP '(?<=version = ")[^"]+' Server/pyproject.toml)
-          # Use date for unique dev version (PEP 440 compliant: X.Y.Z.devN)
-          # Note: PyPI/TestPyPI don't support local version identifiers (+...)
-          DEV_NUMBER="$(date +%Y%m%d%H%M%S)"
-          DEV_VERSION="${BASE_VERSION}.dev${DEV_NUMBER}"
+          # Bump minor version and use beta suffix (PEP 440 compliant: X.Y+1.0bN)
+          # This ensures beta is "newer" than the stable release
+          IFS='.' read -r MAJOR MINOR PATCH <<< "$BASE_VERSION"
+          NEXT_MINOR=$((MINOR + 1))
+          BETA_NUMBER="$(date +%Y%m%d%H%M%S)"
+          BETA_VERSION="${MAJOR}.${NEXT_MINOR}.0b${BETA_NUMBER}"
           echo "Base version: $BASE_VERSION"
-          echo "Dev version: $DEV_VERSION"
-          echo "dev_version=$DEV_VERSION" >> "$GITHUB_OUTPUT"
+          echo "Beta version: $BETA_VERSION"
+          echo "beta_version=$BETA_VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Update version for beta release
         env:
-          DEV_VERSION: ${{ steps.version.outputs.dev_version }}
+          BETA_VERSION: ${{ steps.version.outputs.beta_version }}
         shell: bash
         run: |
           set -euo pipefail
-          sed -i "s/^version = .*/version = \"${DEV_VERSION}\"/" Server/pyproject.toml
+          sed -i "s/^version = .*/version = \"${BETA_VERSION}\"/" Server/pyproject.toml
           echo "Updated pyproject.toml:"
           grep "^version" Server/pyproject.toml
 
@@ -62,8 +64,7 @@ jobs:
         run: uv build
         working-directory: ./Server
 
-      - name: Publish distribution to TestPyPI
+      - name: Publish distribution to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           packages-dir: Server/dist/
-          repository-url: https://test.pypi.org/legacy/
diff --git a/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs b/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
index 489e9a070..1537499dd 100644
--- a/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
+++ b/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
@@ -171,16 +171,18 @@ private static IList<string> BuildUvxArgs(string fromUrl, string packageName)
                 args.Add("--refresh");
             }
 
-            // TestPyPI mode: use test.pypi.org as the default index for pre-release testing
-            // When using TestPyPI, don't pin version since TestPyPI versions may differ from PyPI
-            bool useTestPyPI = EditorPrefs.GetBool(EditorPrefKeys.UseTestPyPI, false);
-            if (useTestPyPI)
+            // Beta server mode: allow beta versions from PyPI
+            // Beta server versions are published to PyPI as beta versions (e.g., 9.3.0b20260127)
+            // Defaults to true on beta branch to ensure server schema matches C# client.
+            // Use --prerelease explicit with version specifier to only get prereleases of our package,
+            // not of dependencies (which can be broken on PyPI).
+            bool usePreRelease = EditorPrefs.GetBool(EditorPrefKeys.UseTestPyPI, true);
+            if (usePreRelease)
             {
-                args.Add("--default-index");
-                args.Add("https://test.pypi.org/simple/");
-                // Use unversioned package name to get latest from TestPyPI
+                args.Add("--prerelease");
+                args.Add("explicit");
                 args.Add("--from");
-                args.Add("mcpforunityserver");
+                args.Add("mcpforunityserver>=0.0.0a0");
             }
             else if (!string.IsNullOrEmpty(fromUrl))
             {
diff --git a/MCPForUnity/Editor/Services/ServerManagementService.cs b/MCPForUnity/Editor/Services/ServerManagementService.cs
index b9e5ecd69..50d4620a3 100644
--- a/MCPForUnity/Editor/Services/ServerManagementService.cs
+++ b/MCPForUnity/Editor/Services/ServerManagementService.cs
@@ -1317,9 +1317,29 @@ private bool TryGetLocalHttpServerCommandParts(out string fileName, out string a
                 true
             );
             string scopedFlag = projectScopedTools ? " --project-scoped-tools" : string.Empty;
-            string args = string.IsNullOrEmpty(fromUrl)
+
+            // Beta server mode: allow beta versions from PyPI
+            // Beta server versions are published to PyPI as beta versions (e.g., 9.3.0b20260127)
+            // Use --prerelease explicit with version specifier to only get prereleases of our package,
+            // not of dependencies (which can be broken on PyPI).
+            bool usePreRelease = EditorPrefs.GetBool(EditorPrefKeys.UseTestPyPI, true);
+            string fromArgs;
+            if (usePreRelease)
+            {
+                fromArgs = "--prerelease explicit --from \"mcpforunityserver>=0.0.0a0\"";
+            }
+            else if (!string.IsNullOrEmpty(fromUrl))
+            {
+                fromArgs = $"--from {fromUrl}";
+            }
+            else
+            {
+                fromArgs = "";
+            }
+
+            string args = string.IsNullOrEmpty(fromArgs)
                 ? $"{devFlags}{packageName} --transport http --http-url {httpUrl}{scopedFlag}"
-                : $"{devFlags}--from {fromUrl} {packageName} --transport http --http-url {httpUrl}{scopedFlag}";
+                : $"{devFlags}{fromArgs} {packageName} --transport http --http-url {httpUrl}{scopedFlag}";
 
             fileName = uvxPath;
             arguments = args;
diff --git a/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs b/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs
index cc5d1defb..055b475f9 100644
--- a/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs
+++ b/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs
@@ -102,7 +102,7 @@ private void InitializeUI()
             }
             if (useTestPyPIToggle != null)
             {
-                useTestPyPIToggle.tooltip = "When enabled, uvx will use TestPyPI (test.pypi.org) instead of PyPI to fetch the server package. Useful for testing pre-release versions.";
+                useTestPyPIToggle.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 testPyPILabel = useTestPyPIToggle?.parent?.Q<Label>();
                 if (testPyPILabel != null)
                     testPyPILabel.tooltip = useTestPyPIToggle.tooltip;
@@ -137,7 +137,7 @@ private void InitializeUI()
             McpLog.SetDebugLoggingEnabled(debugEnabled);
 
             devModeForceRefreshToggle.value = EditorPrefs.GetBool(EditorPrefKeys.DevModeForceServerRefresh, false);
-            useTestPyPIToggle.value = EditorPrefs.GetBool(EditorPrefKeys.UseTestPyPI, false);
+            useTestPyPIToggle.value = EditorPrefs.GetBool(EditorPrefKeys.UseTestPyPI, true);
             UpdatePathOverrides();
             UpdateDeploymentSection();
         }
@@ -290,7 +290,7 @@ public void UpdatePathOverrides()
             gitUrlOverride.value = EditorPrefs.GetString(EditorPrefKeys.GitUrlOverride, "");
             debugLogsToggle.value = EditorPrefs.GetBool(EditorPrefKeys.DebugLogs, false);
             devModeForceRefreshToggle.value = EditorPrefs.GetBool(EditorPrefKeys.DevModeForceServerRefresh, false);
-            useTestPyPIToggle.value = EditorPrefs.GetBool(EditorPrefKeys.UseTestPyPI, false);
+            useTestPyPIToggle.value = EditorPrefs.GetBool(EditorPrefKeys.UseTestPyPI, true);
             UpdateDeploymentSection();
         }
 
diff --git a/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.uxml b/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.uxml
index 90a9b214a..eebf74afb 100644
--- a/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.uxml
+++ b/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.uxml
@@ -42,7 +42,7 @@
             </ui:VisualElement>
 
             <ui:VisualElement class="setting-row">
-                <ui:Label text="Use TestPyPI:" class="setting-label" />
+                <ui:Label text="Use Beta Server:" class="setting-label" />
                 <ui:Toggle name="use-testpypi-toggle" class="setting-toggle" />
             </ui:VisualElement>
 
diff --git a/MCPForUnity/Editor/Windows/EditorPrefs/EditorPrefsWindow.cs b/MCPForUnity/Editor/Windows/EditorPrefs/EditorPrefsWindow.cs
index 83e65e4dd..797e9d539 100644
--- a/MCPForUnity/Editor/Windows/EditorPrefs/EditorPrefsWindow.cs
+++ b/MCPForUnity/Editor/Windows/EditorPrefs/EditorPrefsWindow.cs
@@ -19,6 +19,8 @@ public class EditorPrefsWindow : EditorWindow
         // UI Elements
         private ScrollView scrollView;
         private VisualElement prefsContainer;
+        private TextField searchField;
+        private string searchFilter = "";
         
         // Data
         private List<EditorPrefItem> currentPrefs = new List<EditorPrefItem>();
@@ -40,6 +42,7 @@ public class EditorPrefsWindow : EditorWindow
             { EditorPrefKeys.CustomToolRegistrationEnabled, EditorPrefType.Bool },
             { EditorPrefKeys.TelemetryDisabled, EditorPrefType.Bool },
             { EditorPrefKeys.DevModeForceServerRefresh, EditorPrefType.Bool },
+            { EditorPrefKeys.UseTestPyPI, EditorPrefType.Bool },
             { EditorPrefKeys.ProjectScopedToolsLocalHttp, EditorPrefType.Bool },
             
             // Integer prefs
@@ -105,7 +108,39 @@ public void CreateGUI()
             }
             
             visualTree.CloneTree(rootVisualElement);
-            
+
+            // Add search bar container at the top
+            var searchContainer = new VisualElement();
+            searchContainer.style.flexDirection = FlexDirection.Row;
+            searchContainer.style.marginTop = 8;
+            searchContainer.style.marginBottom = 10;
+            searchContainer.style.marginLeft = 4;
+            searchContainer.style.marginRight = 4;
+
+            searchField = new TextField("Search");
+            searchField.style.flexGrow = 1;
+            searchField.style.height = 28;
+            searchField.style.paddingTop = 2;
+            searchField.style.paddingBottom = 2;
+            searchField.labelElement.style.unityFontStyleAndWeight = FontStyle.Bold;
+            searchField.RegisterValueChangedCallback(evt =>
+            {
+                searchFilter = evt.newValue ?? "";
+                RefreshPrefs();
+            });
+
+            var refreshButton = new Button(RefreshPrefs);
+            refreshButton.text = "↻";
+            refreshButton.tooltip = "Refresh prefs";
+            refreshButton.style.width = 30;
+            refreshButton.style.height = 28;
+            refreshButton.style.marginLeft = 6;
+            refreshButton.style.backgroundColor = new Color(0.9f, 0.5f, 0.1f);
+
+            searchContainer.Add(searchField);
+            searchContainer.Add(refreshButton);
+            rootVisualElement.Insert(0, searchContainer);
+
             // Get references
             scrollView = rootVisualElement.Q<ScrollView>("scroll-view");
             prefsContainer = rootVisualElement.Q<VisualElement>("prefs-container");
@@ -161,6 +196,13 @@ private void RefreshPrefs()
                 // Skip Customer UUID but show everything else that's defined
                 if (key != EditorPrefKeys.CustomerUuid)
                 {
+                    // Apply search filter
+                    if (!string.IsNullOrEmpty(searchFilter) &&
+                        !key.ToLowerInvariant().Contains(searchFilter.ToLowerInvariant()))
+                    {
+                        continue;
+                    }
+
                     var item = CreateEditorPrefItem(key);
                     if (item != null)
                     {

From 080f23566fe1ef9acc7dbb4a0d8cfe1ba2e7df64 Mon Sep 17 00:00:00 2001
From: David Sarno <david@lighthaus.us>
Date: Tue, 27 Jan 2026 11:05:28 -0800
Subject: [PATCH 4/7] feat: Add beta mode indicator to UI badge and server
 version logging
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Show "β" suffix on version badge when beta server mode is enabled
- Badge updates dynamically when toggle changes
- Add server version to startup log: "MCP for Unity Server v9.2.0 starting up"
- Add version field to /health endpoint response

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 .../Components/Advanced/McpAdvancedSection.cs |  2 ++
 .../Editor/Windows/MCPForUnityEditorWindow.cs | 21 ++++++++++++++-----
 Server/src/main.py                            |  5 +++--
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs b/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs
index 055b475f9..b3d210000 100644
--- a/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs
+++ b/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs
@@ -43,6 +43,7 @@ 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; }
 
@@ -186,6 +187,7 @@ private void RegisterCallbacks()
             {
                 EditorPrefs.SetBool(EditorPrefKeys.UseTestPyPI, evt.newValue);
                 OnHttpServerCommandUpdateRequested?.Invoke();
+                OnBetaModeChanged?.Invoke(evt.newValue);
             });
 
             deploySourcePath.RegisterValueChangedCallback(evt =>
diff --git a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
index b21d70dec..a60c29da6 100644
--- a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
+++ b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
@@ -182,11 +182,7 @@ public void CreateGUI()
             }
 
             // Initialize version label
-            if (versionLabel != null)
-            {
-                string version = AssetPathUtility.GetPackageVersion();
-                versionLabel.text = $"v{version}";
-            }
+            UpdateVersionLabel(EditorPrefs.GetBool(EditorPrefKeys.UseTestPyPI, true));
 
             SetupTabs();
 
@@ -252,6 +248,7 @@ public void CreateGUI()
                     if (connectionSection != null)
                         await connectionSection.VerifyBridgeConnectionAsync();
                 };
+                advancedSection.OnBetaModeChanged += UpdateVersionLabel;
 
                 // Wire up health status updates from Connection to Advanced
                 connectionSection?.SetHealthStatusUpdateCallback((isHealthy, statusText) =>
@@ -288,6 +285,20 @@ public void CreateGUI()
             RefreshAllData();
         }
 
+        private void UpdateVersionLabel(bool useBetaServer)
+        {
+            if (versionLabel == null)
+            {
+                return;
+            }
+
+            string version = AssetPathUtility.GetPackageVersion();
+            versionLabel.text = useBetaServer ? $"v{version} β" : $"v{version}";
+            versionLabel.tooltip = useBetaServer
+                ? "Beta server mode - fetching pre-release server versions from PyPI"
+                : $"MCP For Unity v{version}";
+        }
+
         private void EnsureToolsLoaded()
         {
             if (toolsLoaded)
diff --git a/Server/src/main.py b/Server/src/main.py
index 79eb7de76..1365f3ea5 100644
--- a/Server/src/main.py
+++ b/Server/src/main.py
@@ -134,7 +134,8 @@ def doRollover(self):
 async def server_lifespan(server: FastMCP) -> AsyncIterator[dict[str, Any]]:
     """Handle server startup and shutdown."""
     global _unity_connection_pool
-    logger.info("MCP for Unity Server starting up")
+    server_version = get_package_version()
+    logger.info(f"MCP for Unity Server v{server_version} starting up")
 
     # Register custom tool management endpoints with FastMCP
     # Routes are declared globally below after FastMCP initialization
@@ -158,7 +159,6 @@ async def server_lifespan(server: FastMCP) -> AsyncIterator[dict[str, Any]]:
     # Record server startup telemetry
     start_time = time.time()
     start_clk = time.perf_counter()
-    server_version = get_package_version()
     # Defer initial telemetry by 1s to avoid stdio handshake interference
 
     def _emit_startup():
@@ -325,6 +325,7 @@ async def health_http(_: Request) -> JSONResponse:
         return JSONResponse({
             "status": "healthy",
             "timestamp": time.time(),
+            "version": get_package_version(),
             "message": "MCP for Unity server is running"
         })
 

From eb49f574c7cbee6780d259749f0b1f5ff921608c Mon Sep 17 00:00:00 2001
From: David Sarno <david@lighthaus.us>
Date: Tue, 27 Jan 2026 11:10:37 -0800
Subject: [PATCH 5/7] refactor: Rename UseTestPyPI to UseBetaServer and fix
 EditorPrefs margin

- Rename EditorPref key from UseTestPyPI to UseBetaServer for clarity
- Rename all related variables and UXML element names
- Increase bottom margin on EditorPrefs search bar to prevent clipping first entry

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 .../Editor/Constants/EditorPrefKeys.cs        |  2 +-
 .../Editor/Helpers/ConfigJsonBuilder.cs       |  2 +-
 .../Services/ServerManagementService.cs       |  2 +-
 .../Components/Advanced/McpAdvancedSection.cs | 22 +++++++++----------
 .../Advanced/McpAdvancedSection.uxml          |  2 +-
 .../Windows/EditorPrefs/EditorPrefsWindow.cs  |  4 ++--
 .../Editor/Windows/MCPForUnityEditorWindow.cs |  2 +-
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/MCPForUnity/Editor/Constants/EditorPrefKeys.cs b/MCPForUnity/Editor/Constants/EditorPrefKeys.cs
index 42bfac2dd..60f81c1be 100644
--- a/MCPForUnity/Editor/Constants/EditorPrefKeys.cs
+++ b/MCPForUnity/Editor/Constants/EditorPrefKeys.cs
@@ -28,7 +28,7 @@ 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 UseTestPyPI = "MCPForUnity.UseTestPyPI";
+        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/ConfigJsonBuilder.cs b/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
index 1537499dd..64e957956 100644
--- a/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
+++ b/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
@@ -176,7 +176,7 @@ private static IList<string> BuildUvxArgs(string fromUrl, string packageName)
             // Defaults to true on beta branch to ensure server schema matches C# client.
             // Use --prerelease explicit with version specifier to only get prereleases of our package,
             // not of dependencies (which can be broken on PyPI).
-            bool usePreRelease = EditorPrefs.GetBool(EditorPrefKeys.UseTestPyPI, true);
+            bool usePreRelease = EditorPrefs.GetBool(EditorPrefKeys.UseBetaServer, true);
             if (usePreRelease)
             {
                 args.Add("--prerelease");
diff --git a/MCPForUnity/Editor/Services/ServerManagementService.cs b/MCPForUnity/Editor/Services/ServerManagementService.cs
index 50d4620a3..fa12aa25a 100644
--- a/MCPForUnity/Editor/Services/ServerManagementService.cs
+++ b/MCPForUnity/Editor/Services/ServerManagementService.cs
@@ -1322,7 +1322,7 @@ private bool TryGetLocalHttpServerCommandParts(out string fileName, out string a
             // Beta server versions are published to PyPI as beta versions (e.g., 9.3.0b20260127)
             // Use --prerelease explicit with version specifier to only get prereleases of our package,
             // not of dependencies (which can be broken on PyPI).
-            bool usePreRelease = EditorPrefs.GetBool(EditorPrefKeys.UseTestPyPI, true);
+            bool usePreRelease = EditorPrefs.GetBool(EditorPrefKeys.UseBetaServer, true);
             string fromArgs;
             if (usePreRelease)
             {
diff --git a/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs b/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs
index b3d210000..8898fcf23 100644
--- a/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs
+++ b/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.cs
@@ -26,7 +26,7 @@ public class McpAdvancedSection
         private Button clearGitUrlButton;
         private Toggle debugLogsToggle;
         private Toggle devModeForceRefreshToggle;
-        private Toggle useTestPyPIToggle;
+        private Toggle useBetaServerToggle;
         private TextField deploySourcePath;
         private Button browseDeploySourceButton;
         private Button clearDeploySourceButton;
@@ -66,7 +66,7 @@ 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");
-            useTestPyPIToggle = Root.Q<Toggle>("use-testpypi-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,12 +101,12 @@ private void InitializeUI()
                 if (forceRefreshLabel != null)
                     forceRefreshLabel.tooltip = devModeForceRefreshToggle.tooltip;
             }
-            if (useTestPyPIToggle != null)
+            if (useBetaServerToggle != null)
             {
-                useTestPyPIToggle.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 testPyPILabel = useTestPyPIToggle?.parent?.Q<Label>();
-                if (testPyPILabel != null)
-                    testPyPILabel.tooltip = useTestPyPIToggle.tooltip;
+                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.";
@@ -138,7 +138,7 @@ private void InitializeUI()
             McpLog.SetDebugLoggingEnabled(debugEnabled);
 
             devModeForceRefreshToggle.value = EditorPrefs.GetBool(EditorPrefKeys.DevModeForceServerRefresh, false);
-            useTestPyPIToggle.value = EditorPrefs.GetBool(EditorPrefKeys.UseTestPyPI, true);
+            useBetaServerToggle.value = EditorPrefs.GetBool(EditorPrefKeys.UseBetaServer, true);
             UpdatePathOverrides();
             UpdateDeploymentSection();
         }
@@ -183,9 +183,9 @@ private void RegisterCallbacks()
                 OnHttpServerCommandUpdateRequested?.Invoke();
             });
 
-            useTestPyPIToggle.RegisterValueChangedCallback(evt =>
+            useBetaServerToggle.RegisterValueChangedCallback(evt =>
             {
-                EditorPrefs.SetBool(EditorPrefKeys.UseTestPyPI, evt.newValue);
+                EditorPrefs.SetBool(EditorPrefKeys.UseBetaServer, evt.newValue);
                 OnHttpServerCommandUpdateRequested?.Invoke();
                 OnBetaModeChanged?.Invoke(evt.newValue);
             });
@@ -292,7 +292,7 @@ public void UpdatePathOverrides()
             gitUrlOverride.value = EditorPrefs.GetString(EditorPrefKeys.GitUrlOverride, "");
             debugLogsToggle.value = EditorPrefs.GetBool(EditorPrefKeys.DebugLogs, false);
             devModeForceRefreshToggle.value = EditorPrefs.GetBool(EditorPrefKeys.DevModeForceServerRefresh, false);
-            useTestPyPIToggle.value = EditorPrefs.GetBool(EditorPrefKeys.UseTestPyPI, true);
+            useBetaServerToggle.value = EditorPrefs.GetBool(EditorPrefKeys.UseBetaServer, true);
             UpdateDeploymentSection();
         }
 
diff --git a/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.uxml b/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.uxml
index eebf74afb..ea5358aab 100644
--- a/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.uxml
+++ b/MCPForUnity/Editor/Windows/Components/Advanced/McpAdvancedSection.uxml
@@ -43,7 +43,7 @@
 
             <ui:VisualElement class="setting-row">
                 <ui:Label text="Use Beta Server:" class="setting-label" />
-                <ui:Toggle name="use-testpypi-toggle" class="setting-toggle" />
+                <ui:Toggle name="use-beta-server-toggle" class="setting-toggle" />
             </ui:VisualElement>
 
             <ui:VisualElement class="override-row" style="margin-top: 8px;">
diff --git a/MCPForUnity/Editor/Windows/EditorPrefs/EditorPrefsWindow.cs b/MCPForUnity/Editor/Windows/EditorPrefs/EditorPrefsWindow.cs
index 797e9d539..78356fa72 100644
--- a/MCPForUnity/Editor/Windows/EditorPrefs/EditorPrefsWindow.cs
+++ b/MCPForUnity/Editor/Windows/EditorPrefs/EditorPrefsWindow.cs
@@ -42,7 +42,7 @@ public class EditorPrefsWindow : EditorWindow
             { EditorPrefKeys.CustomToolRegistrationEnabled, EditorPrefType.Bool },
             { EditorPrefKeys.TelemetryDisabled, EditorPrefType.Bool },
             { EditorPrefKeys.DevModeForceServerRefresh, EditorPrefType.Bool },
-            { EditorPrefKeys.UseTestPyPI, EditorPrefType.Bool },
+            { EditorPrefKeys.UseBetaServer, EditorPrefType.Bool },
             { EditorPrefKeys.ProjectScopedToolsLocalHttp, EditorPrefType.Bool },
             
             // Integer prefs
@@ -113,7 +113,7 @@ public void CreateGUI()
             var searchContainer = new VisualElement();
             searchContainer.style.flexDirection = FlexDirection.Row;
             searchContainer.style.marginTop = 8;
-            searchContainer.style.marginBottom = 10;
+            searchContainer.style.marginBottom = 20;
             searchContainer.style.marginLeft = 4;
             searchContainer.style.marginRight = 4;
 
diff --git a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
index a60c29da6..d455bc7ae 100644
--- a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
+++ b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
@@ -182,7 +182,7 @@ public void CreateGUI()
             }
 
             // Initialize version label
-            UpdateVersionLabel(EditorPrefs.GetBool(EditorPrefKeys.UseTestPyPI, true));
+            UpdateVersionLabel(EditorPrefs.GetBool(EditorPrefKeys.UseBetaServer, true));
 
             SetupTabs();
 

From 562a2bb9ee5490e97e651ad53e52af42227052fc Mon Sep 17 00:00:00 2001
From: David Sarno <david@lighthaus.us>
Date: Tue, 27 Jan 2026 11:21:36 -0800
Subject: [PATCH 6/7] refactor: Address code review feedback

- Centralize beta server uvx args in AssetPathUtility.GetBetaServerFromArgs()
  to avoid duplication between HTTP and stdio transports
- Cache server version at startup instead of calling get_package_version()
  on every /health request
- Add robustness to beta version parsing in workflow: strip existing
  pre-release suffix and validate X.Y.Z format before parsing

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 .github/workflows/beta-release.yml            | 11 +++-
 .../Editor/Helpers/AssetPathUtility.cs        | 56 +++++++++++++++++++
 .../Editor/Helpers/ConfigJsonBuilder.cs       | 19 +------
 .../Services/ServerManagementService.cs       | 20 +------
 Server/src/main.py                            | 13 +++--
 5 files changed, 79 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/beta-release.yml b/.github/workflows/beta-release.yml
index deb01a834..b316c3194 100644
--- a/.github/workflows/beta-release.yml
+++ b/.github/workflows/beta-release.yml
@@ -38,13 +38,22 @@ jobs:
         shell: bash
         run: |
           set -euo pipefail
-          BASE_VERSION=$(grep -oP '(?<=version = ")[^"]+' Server/pyproject.toml)
+          RAW_VERSION=$(grep -oP '(?<=version = ")[^"]+' Server/pyproject.toml)
+          # Strip any existing pre-release suffix (a, b, rc, dev, post) for safe parsing
+          # e.g., "9.2.0b1" -> "9.2.0", "9.2.0.dev1" -> "9.2.0"
+          BASE_VERSION=$(echo "$RAW_VERSION" | sed -E 's/(a|b|rc|\.dev|\.post)[0-9]+$//')
+          # Validate we have a proper X.Y.Z format
+          if ! [[ "$BASE_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "Error: Could not parse version '$RAW_VERSION' -> '$BASE_VERSION'" >&2
+            exit 1
+          fi
           # Bump minor version and use beta suffix (PEP 440 compliant: X.Y+1.0bN)
           # This ensures beta is "newer" than the stable release
           IFS='.' read -r MAJOR MINOR PATCH <<< "$BASE_VERSION"
           NEXT_MINOR=$((MINOR + 1))
           BETA_NUMBER="$(date +%Y%m%d%H%M%S)"
           BETA_VERSION="${MAJOR}.${NEXT_MINOR}.0b${BETA_NUMBER}"
+          echo "Raw version: $RAW_VERSION"
           echo "Base version: $BASE_VERSION"
           echo "Beta version: $BETA_VERSION"
           echo "beta_version=$BETA_VERSION" >> "$GITHUB_OUTPUT"
diff --git a/MCPForUnity/Editor/Helpers/AssetPathUtility.cs b/MCPForUnity/Editor/Helpers/AssetPathUtility.cs
index c4169da5b..e266f185d 100644
--- a/MCPForUnity/Editor/Helpers/AssetPathUtility.cs
+++ b/MCPForUnity/Editor/Helpers/AssetPathUtility.cs
@@ -243,6 +243,62 @@ public static (string uvxPath, string fromUrl, string packageName) GetUvxCommand
             return (uvxPath, fromUrl, packageName);
         }
 
+        /// <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).
+        /// Centralizes the prerelease logic to avoid duplication between HTTP and stdio transports.
+        /// </summary>
+        /// <param name="quoteFromPath">Whether to quote the --from path (needed for command-line strings, not for arg lists)</param>
+        /// <returns>The package source arguments (e.g., "--prerelease explicit --from mcpforunityserver>=0.0.0a0")</returns>
+        public static string GetBetaServerFromArgs(bool quoteFromPath = false)
+        {
+            bool useBetaServer = EditorPrefs.GetBool(EditorPrefKeys.UseBetaServer, true);
+            if (useBetaServer)
+            {
+                // Use --prerelease explicit with version specifier to only get prereleases of our package,
+                // not of dependencies (which can be broken on PyPI).
+                string fromValue = quoteFromPath ? "\"mcpforunityserver>=0.0.0a0\"" : "mcpforunityserver>=0.0.0a0";
+                return $"--prerelease explicit --from {fromValue}";
+            }
+
+            string fromUrl = GetMcpServerPackageSource();
+            if (!string.IsNullOrEmpty(fromUrl))
+            {
+                return $"--from {fromUrl}";
+            }
+
+            return string.Empty;
+        }
+
+        /// <summary>
+        /// Builds the uvx package source arguments as a list (for JSON config builders).
+        /// </summary>
+        /// <returns>List of arguments to add to uvx command</returns>
+        public static System.Collections.Generic.IList<string> GetBetaServerFromArgsList()
+        {
+            var args = new System.Collections.Generic.List<string>();
+            bool useBetaServer = EditorPrefs.GetBool(EditorPrefKeys.UseBetaServer, true);
+
+            if (useBetaServer)
+            {
+                args.Add("--prerelease");
+                args.Add("explicit");
+                args.Add("--from");
+                args.Add("mcpforunityserver>=0.0.0a0");
+            }
+            else
+            {
+                string fromUrl = GetMcpServerPackageSource();
+                if (!string.IsNullOrEmpty(fromUrl))
+                {
+                    args.Add("--from");
+                    args.Add(fromUrl);
+                }
+            }
+
+            return args;
+        }
+
         /// <summary>
         /// Determines whether uvx should use --no-cache --refresh flags.
         /// Returns true if DevModeForceServerRefresh is enabled OR if the server URL is a local path.
diff --git a/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs b/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
index 64e957956..118ef083b 100644
--- a/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
+++ b/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
@@ -171,23 +171,10 @@ private static IList<string> BuildUvxArgs(string fromUrl, string packageName)
                 args.Add("--refresh");
             }
 
-            // Beta server mode: allow beta versions from PyPI
-            // Beta server versions are published to PyPI as beta versions (e.g., 9.3.0b20260127)
-            // Defaults to true on beta branch to ensure server schema matches C# client.
-            // Use --prerelease explicit with version specifier to only get prereleases of our package,
-            // not of dependencies (which can be broken on PyPI).
-            bool usePreRelease = EditorPrefs.GetBool(EditorPrefKeys.UseBetaServer, true);
-            if (usePreRelease)
+            // Use centralized helper for beta server / prerelease args
+            foreach (var arg in AssetPathUtility.GetBetaServerFromArgsList())
             {
-                args.Add("--prerelease");
-                args.Add("explicit");
-                args.Add("--from");
-                args.Add("mcpforunityserver>=0.0.0a0");
-            }
-            else if (!string.IsNullOrEmpty(fromUrl))
-            {
-                args.Add("--from");
-                args.Add(fromUrl);
+                args.Add(arg);
             }
             args.Add(packageName);
 
diff --git a/MCPForUnity/Editor/Services/ServerManagementService.cs b/MCPForUnity/Editor/Services/ServerManagementService.cs
index fa12aa25a..bb512832d 100644
--- a/MCPForUnity/Editor/Services/ServerManagementService.cs
+++ b/MCPForUnity/Editor/Services/ServerManagementService.cs
@@ -1318,24 +1318,8 @@ private bool TryGetLocalHttpServerCommandParts(out string fileName, out string a
             );
             string scopedFlag = projectScopedTools ? " --project-scoped-tools" : string.Empty;
 
-            // Beta server mode: allow beta versions from PyPI
-            // Beta server versions are published to PyPI as beta versions (e.g., 9.3.0b20260127)
-            // Use --prerelease explicit with version specifier to only get prereleases of our package,
-            // not of dependencies (which can be broken on PyPI).
-            bool usePreRelease = EditorPrefs.GetBool(EditorPrefKeys.UseBetaServer, true);
-            string fromArgs;
-            if (usePreRelease)
-            {
-                fromArgs = "--prerelease explicit --from \"mcpforunityserver>=0.0.0a0\"";
-            }
-            else if (!string.IsNullOrEmpty(fromUrl))
-            {
-                fromArgs = $"--from {fromUrl}";
-            }
-            else
-            {
-                fromArgs = "";
-            }
+            // Use centralized helper for beta server / prerelease args
+            string fromArgs = AssetPathUtility.GetBetaServerFromArgs(quoteFromPath: true);
 
             string args = string.IsNullOrEmpty(fromArgs)
                 ? $"{devFlags}{packageName} --transport http --http-url {httpUrl}{scopedFlag}"
diff --git a/Server/src/main.py b/Server/src/main.py
index 1365f3ea5..a115b7f76 100644
--- a/Server/src/main.py
+++ b/Server/src/main.py
@@ -126,6 +126,9 @@ def doRollover(self):
 _unity_connection_pool: UnityConnectionPool | None = None
 _plugin_registry: PluginRegistry | None = None
 
+# Cached server version (set at startup to avoid repeated I/O)
+_server_version: str | None = None
+
 # In-memory custom tool service initialized after MCP construction
 custom_tool_service: CustomToolService | None = None
 
@@ -133,9 +136,9 @@ def doRollover(self):
 @asynccontextmanager
 async def server_lifespan(server: FastMCP) -> AsyncIterator[dict[str, Any]]:
     """Handle server startup and shutdown."""
-    global _unity_connection_pool
-    server_version = get_package_version()
-    logger.info(f"MCP for Unity Server v{server_version} starting up")
+    global _unity_connection_pool, _server_version
+    _server_version = get_package_version()
+    logger.info(f"MCP for Unity Server v{_server_version} starting up")
 
     # Register custom tool management endpoints with FastMCP
     # Routes are declared globally below after FastMCP initialization
@@ -164,7 +167,7 @@ async def server_lifespan(server: FastMCP) -> AsyncIterator[dict[str, Any]]:
     def _emit_startup():
         try:
             record_telemetry(RecordType.STARTUP, {
-                "server_version": server_version,
+                "server_version": _server_version,
                 "startup_time": start_time,
             })
             record_milestone(MilestoneType.FIRST_STARTUP)
@@ -325,7 +328,7 @@ async def health_http(_: Request) -> JSONResponse:
         return JSONResponse({
             "status": "healthy",
             "timestamp": time.time(),
-            "version": get_package_version(),
+            "version": _server_version or "unknown",
             "message": "MCP for Unity server is running"
         })
 

From 985b572bc14f8ef646e73a93724b7ea8907813c8 Mon Sep 17 00:00:00 2001
From: David Sarno <david@lighthaus.us>
Date: Tue, 27 Jan 2026 11:32:32 -0800
Subject: [PATCH 7/7] Prioritize explicit fromUrl override and optimize search
 filter

- GetBetaServerFromArgs/GetBetaServerFromArgsList now check for explicit
  GitUrlOverride before applying beta server mode, ensuring local dev
  paths and custom URLs are honored
- EditorPrefsWindow search filter uses IndexOf with OrdinalIgnoreCase
  instead of ToLowerInvariant().Contains() for fewer allocations

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 .../Editor/Helpers/AssetPathUtility.cs        | 39 ++++++++++++++-----
 .../Windows/EditorPrefs/EditorPrefsWindow.cs  | 11 ++++--
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/MCPForUnity/Editor/Helpers/AssetPathUtility.cs b/MCPForUnity/Editor/Helpers/AssetPathUtility.cs
index e266f185d..69c017ef2 100644
--- a/MCPForUnity/Editor/Helpers/AssetPathUtility.cs
+++ b/MCPForUnity/Editor/Helpers/AssetPathUtility.cs
@@ -247,11 +247,21 @@ public static (string uvxPath, string fromUrl, string packageName) GetUvxCommand
         /// Builds the uvx package source arguments for the MCP server.
         /// Handles beta server mode (prerelease from PyPI) vs standard 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.
         /// </summary>
         /// <param name="quoteFromPath">Whether to quote the --from path (needed for command-line strings, not for arg lists)</param>
         /// <returns>The package source arguments (e.g., "--prerelease explicit --from mcpforunityserver>=0.0.0a0")</returns>
         public static string GetBetaServerFromArgs(bool quoteFromPath = false)
         {
+            // Explicit override (local path, git URL, etc.) always wins
+            string fromUrl = GetMcpServerPackageSource();
+            string overrideUrl = EditorPrefs.GetString(EditorPrefKeys.GitUrlOverride, "");
+            if (!string.IsNullOrEmpty(overrideUrl))
+            {
+                return $"--from {fromUrl}";
+            }
+
+            // Beta server mode: use prerelease from PyPI
             bool useBetaServer = EditorPrefs.GetBool(EditorPrefKeys.UseBetaServer, true);
             if (useBetaServer)
             {
@@ -261,7 +271,7 @@ public static string GetBetaServerFromArgs(bool quoteFromPath = false)
                 return $"--prerelease explicit --from {fromValue}";
             }
 
-            string fromUrl = GetMcpServerPackageSource();
+            // Standard mode: use pinned version from package.json
             if (!string.IsNullOrEmpty(fromUrl))
             {
                 return $"--from {fromUrl}";
@@ -272,28 +282,39 @@ public static string GetBetaServerFromArgs(bool quoteFromPath = false)
 
         /// <summary>
         /// Builds the uvx package source arguments as a list (for JSON config builders).
+        /// Priority: explicit fromUrl override > beta server mode > default package.
         /// </summary>
         /// <returns>List of arguments to add to uvx command</returns>
         public static System.Collections.Generic.IList<string> GetBetaServerFromArgsList()
         {
             var args = new System.Collections.Generic.List<string>();
-            bool useBetaServer = EditorPrefs.GetBool(EditorPrefKeys.UseBetaServer, true);
 
+            // Explicit override (local path, git URL, etc.) always wins
+            string fromUrl = GetMcpServerPackageSource();
+            string overrideUrl = EditorPrefs.GetString(EditorPrefKeys.GitUrlOverride, "");
+            if (!string.IsNullOrEmpty(overrideUrl))
+            {
+                args.Add("--from");
+                args.Add(fromUrl);
+                return args;
+            }
+
+            // Beta server mode: use prerelease from PyPI
+            bool useBetaServer = EditorPrefs.GetBool(EditorPrefKeys.UseBetaServer, true);
             if (useBetaServer)
             {
                 args.Add("--prerelease");
                 args.Add("explicit");
                 args.Add("--from");
                 args.Add("mcpforunityserver>=0.0.0a0");
+                return args;
             }
-            else
+
+            // Standard mode: use pinned version from package.json
+            if (!string.IsNullOrEmpty(fromUrl))
             {
-                string fromUrl = GetMcpServerPackageSource();
-                if (!string.IsNullOrEmpty(fromUrl))
-                {
-                    args.Add("--from");
-                    args.Add(fromUrl);
-                }
+                args.Add("--from");
+                args.Add(fromUrl);
             }
 
             return args;
diff --git a/MCPForUnity/Editor/Windows/EditorPrefs/EditorPrefsWindow.cs b/MCPForUnity/Editor/Windows/EditorPrefs/EditorPrefsWindow.cs
index 78356fa72..caaf72803 100644
--- a/MCPForUnity/Editor/Windows/EditorPrefs/EditorPrefsWindow.cs
+++ b/MCPForUnity/Editor/Windows/EditorPrefs/EditorPrefsWindow.cs
@@ -189,16 +189,19 @@ private void RefreshPrefs()
             
             // Sort keys
             allKeys.Sort();
-            
+
+            // Pre-trim filter once outside the loop
+            var filter = searchFilter?.Trim();
+
             // Create items for existing prefs
             foreach (var key in allKeys)
             {
                 // Skip Customer UUID but show everything else that's defined
                 if (key != EditorPrefKeys.CustomerUuid)
                 {
-                    // Apply search filter
-                    if (!string.IsNullOrEmpty(searchFilter) &&
-                        !key.ToLowerInvariant().Contains(searchFilter.ToLowerInvariant()))
+                    // Apply search filter using OrdinalIgnoreCase for fewer allocations
+                    if (!string.IsNullOrEmpty(filter) &&
+                        key.IndexOf(filter, StringComparison.OrdinalIgnoreCase) < 0)
                     {
                         continue;
                     }