diff --git a/MCPForUnity/Editor/Helpers/CodexConfigHelper.cs b/MCPForUnity/Editor/Helpers/CodexConfigHelper.cs
index a4728901..a2a48b2a 100644
--- a/MCPForUnity/Editor/Helpers/CodexConfigHelper.cs
+++ b/MCPForUnity/Editor/Helpers/CodexConfigHelper.cs
@@ -123,24 +123,61 @@ private static TomlTable TryParseToml(string toml)
             }
         }
 
+        /// <summary>
+        /// Checks if we should use remote uvx (Asset Store install without embedded server)
+        /// </summary>
+        private static bool ShouldUseRemoteUvx(string serverSrc)
+        {
+            // If no serverSrc provided, use remote
+            if (string.IsNullOrEmpty(serverSrc))
+                return true;
+
+            // If no embedded server exists, use remote
+            if (!ServerInstaller.HasEmbeddedServer())
+                return true;
+
+            return false;
+        }
+
         /// <summary>
         /// Creates a TomlTable for the unityMCP server configuration
         /// </summary>
-        /// <param name="uvPath">Path to uv executable</param>
-        /// <param name="serverSrc">Path to server source directory</param>
+        /// <param name="uvPath">Path to uv executable (can be null for remote uvx)</param>
+        /// <param name="serverSrc">Path to server source directory (can be null for remote uvx)</param>
         private static TomlTable CreateUnityMcpTable(string uvPath, string serverSrc)
         {
             var unityMCP = new TomlTable();
-            unityMCP["command"] = new TomlString { Value = uvPath };
+            bool useRemote = ShouldUseRemoteUvx(serverSrc);
 
-            var argsArray = new TomlArray();
-            argsArray.Add(new TomlString { Value = "run" });
-            argsArray.Add(new TomlString { Value = "--directory" });
-            argsArray.Add(new TomlString { Value = serverSrc });
-            argsArray.Add(new TomlString { Value = "server.py" });
-            unityMCP["args"] = argsArray;
+            if (useRemote)
+            {
+                // Asset Store install - use remote uvx
+                string version = AssetPathUtility.GetPackageVersion();
+                string remoteUrl = $"git+https://github.com/CoplayDev/unity-mcp@v{version}#subdirectory=MCPForUnity/UnityMcpServer~/src";
+                
+                unityMCP["command"] = new TomlString { Value = "uvx" };
+                
+                var argsArray = new TomlArray();
+                argsArray.Add(new TomlString { Value = "--from" });
+                argsArray.Add(new TomlString { Value = remoteUrl });
+                argsArray.Add(new TomlString { Value = "mcp-for-unity" });
+                unityMCP["args"] = argsArray;
+            }
+            else
+            {
+                // Git/embedded install - use local path
+                unityMCP["command"] = new TomlString { Value = uvPath };
+
+                var argsArray = new TomlArray();
+                argsArray.Add(new TomlString { Value = "run" });
+                argsArray.Add(new TomlString { Value = "--directory" });
+                argsArray.Add(new TomlString { Value = serverSrc });
+                argsArray.Add(new TomlString { Value = "server.py" });
+                unityMCP["args"] = argsArray;
+            }
 
             // Add Windows-specific environment configuration, see: https://github.com/CoplayDev/unity-mcp/issues/315
+            // Always include for Windows, even with remote uvx
             var platformService = MCPServiceLocator.Platform;
             if (platformService.IsWindows())
             {
diff --git a/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs b/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
index 5889e4f6..8126b07c 100644
--- a/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
+++ b/MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
@@ -40,19 +40,50 @@ public static JObject ApplyUnityServerToExistingConfig(JObject root, string uvPa
             return root;
         }
 
+        /// <summary>
+        /// Checks if we should use remote uvx (Asset Store install without embedded server)
+        /// </summary>
+        private static bool ShouldUseRemoteUvx(string directory)
+        {
+            // If no directory provided, use remote
+            if (string.IsNullOrEmpty(directory))
+                return true;
+
+            // If no embedded server exists, use remote
+            if (!ServerInstaller.HasEmbeddedServer())
+                return true;
+
+            return false;
+        }
+
         /// <summary>
         /// Centralized builder that applies all caveats consistently.
-        /// - Sets command/args with provided directory
+        /// - Sets command/args with provided directory OR remote uvx for Asset Store
         /// - Ensures env exists
         /// - Adds type:"stdio" for VSCode
         /// - Adds disabled:false for Windsurf/Kiro only when missing
         /// </summary>
         private static void PopulateUnityNode(JObject unity, string uvPath, string directory, McpClient client, bool isVSCode)
         {
-            unity["command"] = uvPath;
+            // Check if we should use remote uvx (Asset Store without embedded server)
+            bool useRemote = ShouldUseRemoteUvx(directory);
 
-            // For Cursor (non-VSCode) on macOS, prefer a no-spaces symlink path to avoid arg parsing issues in some runners
-            string effectiveDir = directory;
+            if (useRemote)
+            {
+                // Asset Store install - use remote uvx
+                string version = AssetPathUtility.GetPackageVersion();
+                string remoteUrl = $"git+https://github.com/CoplayDev/unity-mcp@v{version}#subdirectory=MCPForUnity/UnityMcpServer~/src";
+                
+                unity["command"] = "uvx";
+                unity["args"] = JArray.FromObject(new[] { "--from", remoteUrl, "mcp-for-unity" });
+            }
+            else
+            {
+                // Git/embedded install - use local path
+                unity["command"] = uvPath;
+
+                // For Cursor (non-VSCode) on macOS, prefer a no-spaces symlink path to avoid arg parsing issues in some runners
+                string effectiveDir = directory;
 #if UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
             bool isCursor = !isVSCode && (client == null || client.mcpType != McpTypes.VSCode);
             if (isCursor && !string.IsNullOrEmpty(directory))
@@ -92,7 +123,8 @@ private static void PopulateUnityNode(JObject unity, string uvPath, string direc
             }
 #endif
 
-            unity["args"] = JArray.FromObject(new[] { "run", "--directory", effectiveDir, "server.py" });
+                unity["args"] = JArray.FromObject(new[] { "run", "--directory", effectiveDir, "server.py" });
+            }
 
             if (isVSCode)
             {
diff --git a/MCPForUnity/Editor/Helpers/McpConfigurationHelper.cs b/MCPForUnity/Editor/Helpers/McpConfigurationHelper.cs
index 96ad7ec2..98f5ce3e 100644
--- a/MCPForUnity/Editor/Helpers/McpConfigurationHelper.cs
+++ b/MCPForUnity/Editor/Helpers/McpConfigurationHelper.cs
@@ -93,19 +93,27 @@ public static string WriteMcpConfiguration(string pythonDir, string configPath,
             }
             catch { }
 
-            // 1) Start from existing, only fill gaps (prefer trusted resolver)
-            string uvPath = ServerInstaller.FindUvPath();
-            // Optionally trust existingCommand if it looks like uv/uv.exe
-            try
+            // 1) Check if we should use remote uvx (Asset Store without embedded server)
+            bool useRemote = !ServerInstaller.HasEmbeddedServer() || string.IsNullOrEmpty(pythonDir);
+            
+            string uvPath = null;
+            if (!useRemote)
             {
-                var name = Path.GetFileName((existingCommand ?? string.Empty).Trim()).ToLowerInvariant();
-                if ((name == "uv" || name == "uv.exe") && IsValidUvBinary(existingCommand))
+                // Git/embedded install - need UV path
+                uvPath = ServerInstaller.FindUvPath();
+                // Optionally trust existingCommand if it looks like uv/uv.exe
+                try
                 {
-                    uvPath = existingCommand;
+                    var name = Path.GetFileName((existingCommand ?? string.Empty).Trim()).ToLowerInvariant();
+                    if ((name == "uv" || name == "uv.exe") && IsValidUvBinary(existingCommand))
+                    {
+                        uvPath = existingCommand;
+                    }
                 }
+                catch { }
+                if (uvPath == null) return "UV package manager not found. Please install UV first.";
             }
-            catch { }
-            if (uvPath == null) return "UV package manager not found. Please install UV first.";
+            
             string serverSrc = ResolveServerDirectory(pythonDir, existingArgs);
 
             // Ensure containers exist and write back configuration
@@ -165,20 +173,28 @@ public static string ConfigureCodexClient(string pythonDir, string configPath, M
                 CodexConfigHelper.TryParseCodexServer(existingToml, out existingCommand, out existingArgs);
             }
 
-            string uvPath = ServerInstaller.FindUvPath();
-            try
+            // Check if we should use remote uvx (Asset Store without embedded server)
+            bool useRemote = !ServerInstaller.HasEmbeddedServer() || string.IsNullOrEmpty(pythonDir);
+            
+            string uvPath = null;
+            if (!useRemote)
             {
-                var name = Path.GetFileName((existingCommand ?? string.Empty).Trim()).ToLowerInvariant();
-                if ((name == "uv" || name == "uv.exe") && IsValidUvBinary(existingCommand))
+                // Git/embedded install - need UV path
+                uvPath = ServerInstaller.FindUvPath();
+                try
                 {
-                    uvPath = existingCommand;
+                    var name = Path.GetFileName((existingCommand ?? string.Empty).Trim()).ToLowerInvariant();
+                    if ((name == "uv" || name == "uv.exe") && IsValidUvBinary(existingCommand))
+                    {
+                        uvPath = existingCommand;
+                    }
                 }
-            }
-            catch { }
+                catch { }
 
-            if (uvPath == null)
-            {
-                return "UV package manager not found. Please install UV first.";
+                if (uvPath == null)
+                {
+                    return "UV package manager not found. Please install UV first.";
+                }
             }
 
             string serverSrc = ResolveServerDirectory(pythonDir, existingArgs);
diff --git a/MCPForUnity/Editor/Helpers/ServerInstaller.cs b/MCPForUnity/Editor/Helpers/ServerInstaller.cs
index 10666342..f3064b96 100644
--- a/MCPForUnity/Editor/Helpers/ServerInstaller.cs
+++ b/MCPForUnity/Editor/Helpers/ServerInstaller.cs
@@ -866,103 +866,6 @@ private static bool ValidateUvBinary(string uvPath)
             return false;
         }
 
-        /// <summary>
-        /// Download and install server from GitHub release (Asset Store workflow)
-        /// </summary>
-        public static bool DownloadAndInstallServer()
-        {
-            string packageVersion = AssetPathUtility.GetPackageVersion();
-            if (packageVersion == "unknown")
-            {
-                McpLog.Error("Cannot determine package version for download.");
-                return false;
-            }
-
-            string downloadUrl = $"https://github.com/CoplayDev/unity-mcp/releases/download/v{packageVersion}/mcp-for-unity-server-v{packageVersion}.zip";
-            string tempZip = Path.Combine(Path.GetTempPath(), $"mcp-server-v{packageVersion}.zip");
-            string destRoot = Path.Combine(GetSaveLocation(), ServerFolder);
-
-            try
-            {
-                EditorUtility.DisplayProgressBar("MCP for Unity", "Downloading server...", 0.3f);
-
-                // Download
-                using (var client = new WebClient())
-                {
-                    client.DownloadFile(downloadUrl, tempZip);
-                }
-
-                EditorUtility.DisplayProgressBar("MCP for Unity", "Extracting server...", 0.7f);
-
-                // Kill any running UV processes
-                string destSrc = Path.Combine(destRoot, "src");
-                TryKillUvForPath(destSrc);
-
-                // Delete old installation
-                if (Directory.Exists(destRoot))
-                {
-                    if (!DeleteDirectoryWithRetry(destRoot, maxRetries: 5, delayMs: 1000))
-                    {
-                        McpLog.Warn($"Could not fully delete old server (files may be in use)");
-                    }
-                }
-
-                // Extract to temp location first
-                string tempExtractDir = Path.Combine(Path.GetTempPath(), $"mcp-server-extract-{Guid.NewGuid()}");
-                Directory.CreateDirectory(tempExtractDir);
-
-                try
-                {
-                    ZipFile.ExtractToDirectory(tempZip, tempExtractDir);
-
-                    // The ZIP contains UnityMcpServer~ folder, find it and move its contents
-                    string extractedServerFolder = Path.Combine(tempExtractDir, "UnityMcpServer~");
-                    Directory.CreateDirectory(destRoot);
-                    CopyDirectoryRecursive(extractedServerFolder, destRoot);
-                }
-                finally
-                {
-                    // Cleanup temp extraction directory
-                    try
-                    {
-                        if (Directory.Exists(tempExtractDir))
-                        {
-                            Directory.Delete(tempExtractDir, recursive: true);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        McpLog.Warn($"Could not fully delete temp extraction directory: {ex.Message}");
-                    }
-                }
-
-                EditorUtility.ClearProgressBar();
-                McpLog.Info($"Server v{packageVersion} downloaded and installed successfully!");
-                return true;
-            }
-            catch (Exception ex)
-            {
-                EditorUtility.ClearProgressBar();
-                McpLog.Error($"Failed to download server: {ex.Message}");
-                EditorUtility.DisplayDialog(
-                    "Download Failed",
-                    $"Could not download server from GitHub.\n\n{ex.Message}\n\nPlease check your internet connection or try again later.",
-                    "OK"
-                );
-                return false;
-            }
-            finally
-            {
-                try
-                {
-                    if (File.Exists(tempZip)) File.Delete(tempZip);
-                }
-                catch (Exception ex)
-                {
-                    McpLog.Warn($"Could not delete temp zip file: {ex.Message}");
-                }
-            }
-        }
 
         /// <summary>
         /// Check if the package has an embedded server (Git install vs Asset Store)
diff --git a/MCPForUnity/Editor/Services/ClientConfigurationService.cs b/MCPForUnity/Editor/Services/ClientConfigurationService.cs
index 8a9c4caf..7fd3c263 100644
--- a/MCPForUnity/Editor/Services/ClientConfigurationService.cs
+++ b/MCPForUnity/Editor/Services/ClientConfigurationService.cs
@@ -27,7 +27,9 @@ public void ConfigureClient(McpClient client)
 
                 string pythonDir = MCPServiceLocator.Paths.GetMcpServerPath();
 
-                if (pythonDir == null || !File.Exists(Path.Combine(pythonDir, "server.py")))
+                // For Asset Store installs without embedded server, pythonDir can be null (will use remote uvx)
+                bool useRemote = !ServerInstaller.HasEmbeddedServer();
+                if (!useRemote && (pythonDir == null || !File.Exists(Path.Combine(pythonDir, "server.py"))))
                 {
                     throw new InvalidOperationException("Server not found. Please use manual configuration or set server path in Advanced Settings.");
                 }
@@ -235,19 +237,35 @@ public void RegisterClaudeCode()
             var pathService = MCPServiceLocator.Paths;
             string pythonDir = pathService.GetMcpServerPath();
             
-            if (string.IsNullOrEmpty(pythonDir))
-            {
-                throw new InvalidOperationException("Cannot register: Python directory not found");
-            }
-
             string claudePath = pathService.GetClaudeCliPath();
             if (string.IsNullOrEmpty(claudePath))
             {
                 throw new InvalidOperationException("Claude CLI not found. Please install Claude Code first.");
             }
 
-            string uvPath = pathService.GetUvPath() ?? "uv";
-            string args = $"mcp add UnityMCP -- \"{uvPath}\" run --directory \"{pythonDir}\" server.py";
+            // Check if we should use remote uvx (Asset Store without embedded server)
+            bool useRemote = !ServerInstaller.HasEmbeddedServer();
+            string args;
+            
+            if (useRemote)
+            {
+                // Asset Store install - use remote uvx
+                string version = AssetPathUtility.GetPackageVersion();
+                string remoteUrl = $"git+https://github.com/CoplayDev/unity-mcp@v{version}#subdirectory=MCPForUnity/UnityMcpServer~/src";
+                args = $"mcp add UnityMCP -- uvx --from {remoteUrl} mcp-for-unity";
+            }
+            else
+            {
+                // Git/embedded install - use local path
+                if (string.IsNullOrEmpty(pythonDir))
+                {
+                    throw new InvalidOperationException("Cannot register: Python directory not found");
+                }
+                
+                string uvPath = pathService.GetUvPath() ?? "uv";
+                args = $"mcp add UnityMCP -- \"{uvPath}\" run --directory \"{pythonDir}\" server.py";
+            }
+            
             string projectDir = Path.GetDirectoryName(Application.dataPath);
 
             string pathPrepend = null;
@@ -368,17 +386,28 @@ public string GenerateConfigJson(McpClient client)
         {
             string pythonDir = MCPServiceLocator.Paths.GetMcpServerPath();
             string uvPath = MCPServiceLocator.Paths.GetUvPath();
+            bool useRemote = !ServerInstaller.HasEmbeddedServer();
 
             // Claude Code uses CLI commands, not JSON config
             if (client.mcpType == McpTypes.ClaudeCode)
             {
-                if (string.IsNullOrEmpty(pythonDir) || string.IsNullOrEmpty(uvPath))
+                string registerCommand;
+                if (useRemote)
                 {
-                    return "# Error: Configuration not available - check paths in Advanced Settings";
+                    // Asset Store install - use remote uvx
+                    string version = AssetPathUtility.GetPackageVersion();
+                    string remoteUrl = $"git+https://github.com/CoplayDev/unity-mcp@v{version}#subdirectory=MCPForUnity/UnityMcpServer~/src";
+                    registerCommand = $"claude mcp add UnityMCP -- uvx --from {remoteUrl} mcp-for-unity";
+                }
+                else
+                {
+                    // Git/embedded install - use local path
+                    if (string.IsNullOrEmpty(pythonDir) || string.IsNullOrEmpty(uvPath))
+                    {
+                        return "# Error: Configuration not available - check paths in Advanced Settings";
+                    }
+                    registerCommand = $"claude mcp add UnityMCP -- \"{uvPath}\" run --directory \"{pythonDir}\" server.py";
                 }
-
-                // Show the actual command that RegisterClaudeCode() uses
-                string registerCommand = $"claude mcp add UnityMCP -- \"{uvPath}\" run --directory \"{pythonDir}\" server.py";
 
                 return "# Register the MCP server with Claude Code:\n" +
                        $"{registerCommand}\n\n" +
@@ -388,7 +417,8 @@ public string GenerateConfigJson(McpClient client)
                        "claude mcp list # Only works when claude is run in the project's directory";
             }
 
-            if (string.IsNullOrEmpty(pythonDir) || string.IsNullOrEmpty(uvPath))
+            // For other clients, check if we need paths
+            if (!useRemote && (string.IsNullOrEmpty(pythonDir) || string.IsNullOrEmpty(uvPath)))
                 return "{ \"error\": \"Configuration not available - check paths in Advanced Settings\" }";
 
             try
diff --git a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
index b8fb3c3a..3702d54b 100644
--- a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
+++ b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
@@ -50,7 +50,6 @@ private enum ConnectionProtocol
         private Button testConnectionButton;
         private VisualElement serverStatusBanner;
         private Label serverStatusMessage;
-        private Button downloadServerButton;
         private Button rebuildServerButton;
 
         // Client UI Elements
@@ -218,7 +217,6 @@ private void CacheUIElements()
             testConnectionButton = rootVisualElement.Q<Button>("test-connection-button");
             serverStatusBanner = rootVisualElement.Q<VisualElement>("server-status-banner");
             serverStatusMessage = rootVisualElement.Q<Label>("server-status-message");
-            downloadServerButton = rootVisualElement.Q<Button>("download-server-button");
             rebuildServerButton = rootVisualElement.Q<Button>("rebuild-server-button");
 
             // Client
@@ -300,7 +298,6 @@ private void RegisterCallbacks()
             // Connection callbacks
             connectionToggleButton.clicked += OnConnectionToggleClicked;
             testConnectionButton.clicked += OnTestConnectionClicked;
-            downloadServerButton.clicked += OnDownloadServerClicked;
             rebuildServerButton.clicked += OnRebuildServerClicked;
 
             // Client callbacks
@@ -586,19 +583,6 @@ private void VerifyBridgeConnection()
             }
         }
 
-        private void OnDownloadServerClicked()
-        {
-            if (ServerInstaller.DownloadAndInstallServer())
-            {
-                UpdateServerStatusBanner();
-                UpdatePathOverrides();
-                EditorUtility.DisplayDialog(
-                    "Download Complete",
-                    "Server installed successfully! Start your connection and configure your MCP clients to begin.",
-                    "OK"
-                );
-            }
-        }
 
         private void OnRebuildServerClicked()
         {
@@ -629,38 +613,32 @@ private void UpdateServerStatusBanner()
             string installedVer = ServerInstaller.GetInstalledServerVersion();
             string packageVer = AssetPathUtility.GetPackageVersion();
 
-            // Show/hide download vs rebuild buttons
+            // Only show rebuild button for Git/embedded installs
             if (hasEmbedded)
             {
-                downloadServerButton.style.display = DisplayStyle.None;
                 rebuildServerButton.style.display = DisplayStyle.Flex;
             }
             else
             {
-                downloadServerButton.style.display = DisplayStyle.Flex;
                 rebuildServerButton.style.display = DisplayStyle.None;
             }
 
-            // Check for installation errors first
+            // Check for installation errors first (only for embedded installs)
             string installError = PackageLifecycleManager.GetLastInstallError();
-            if (!string.IsNullOrEmpty(installError))
+            if (hasEmbedded && !string.IsNullOrEmpty(installError))
             {
                 serverStatusMessage.text = $"\u274C Server installation failed: {installError}. Click 'Rebuild Server' to retry.";
                 serverStatusBanner.style.display = DisplayStyle.Flex;
             }
-            // Update banner
-            else if (!hasEmbedded && string.IsNullOrEmpty(installedVer))
-            {
-                serverStatusMessage.text = "\u26A0 Server not installed. Click 'Download & Install Server' to get started.";
-                serverStatusBanner.style.display = DisplayStyle.Flex;
-            }
-            else if (!hasEmbedded && !string.IsNullOrEmpty(installedVer) && installedVer != packageVer)
+            // Show version mismatch for embedded installs
+            else if (hasEmbedded && !string.IsNullOrEmpty(installedVer) && installedVer != packageVer)
             {
-                serverStatusMessage.text = $"\u26A0 Server update available (v{installedVer} \u2192 v{packageVer}). Update recommended.";
+                serverStatusMessage.text = $"\u26A0 Server update available (v{installedVer} \u2192 v{packageVer}). Click 'Rebuild Server' to update.";
                 serverStatusBanner.style.display = DisplayStyle.Flex;
             }
             else
             {
+                // No banner needed for Asset Store installs or when everything is up to date
                 serverStatusBanner.style.display = DisplayStyle.None;
             }
         }
diff --git a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.uxml b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.uxml
index e64f99c4..e6d2bdec 100644
--- a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.uxml
+++ b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.uxml
@@ -91,7 +91,6 @@
 
                 <!-- Server Management Buttons -->
                 <ui:VisualElement class="button-row" style="flex-direction: row; margin-top: 8px;">
-                    <ui:Button name="download-server-button" text="Download &amp; Install Server" class="secondary-button" style="display: none; flex: 1;" />
                     <ui:Button name="rebuild-server-button" text="Rebuild Server" class="secondary-button" style="flex: 1;" />
                 </ui:VisualElement>
             </ui:VisualElement>
diff --git a/MCPForUnity/UnityMcpServer~/src/server.py b/MCPForUnity/UnityMcpServer~/src/server.py
index 11053ac8..e3d3ddbb 100644
--- a/MCPForUnity/UnityMcpServer~/src/server.py
+++ b/MCPForUnity/UnityMcpServer~/src/server.py
@@ -168,7 +168,10 @@ def _emit_startup():
 - `manage_gameobject`: Manages GameObjects in the scene.\n
 - `manage_script`: Manages C# script files.\n
 - `manage_asset`: Manages prefabs and assets.\n
-- `manage_shader`: Manages shaders.\n\n
+- `manage_shader`: Manages shaders.\n
+- `apply_text_edits`: Precise text edits with precondition hashes and atomic multi-edit batches.\n
+- `script_apply_edits`: Structured C# method/class edits (insert/replace/delete) with safer boundaries.\n
+- `validate_script`: Fast validation (basic/standard) to catch syntax/structure issues before/after writes.\n\n
 - Tips:\n
 - Create prefabs for reusable GameObjects.\n
 - Always include a camera and main light in your scenes.\n
diff --git a/TestProjects/UnityMCPTests/Assets/Editor.meta b/TestProjects/UnityMCPTests/Assets/Editor.meta
new file mode 100644
index 00000000..37f17d86
--- /dev/null
+++ b/TestProjects/UnityMCPTests/Assets/Editor.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 34cd2ab02760e0a438e8815cf3f8a38a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/TestProjects/UnityMCPTests/Assets/Tests/EditMode/Helpers/CodexConfigHelperTests.cs b/TestProjects/UnityMCPTests/Assets/Tests/EditMode/Helpers/CodexConfigHelperTests.cs
index 45c1f768..0f3bfb74 100644
--- a/TestProjects/UnityMCPTests/Assets/Tests/EditMode/Helpers/CodexConfigHelperTests.cs
+++ b/TestProjects/UnityMCPTests/Assets/Tests/EditMode/Helpers/CodexConfigHelperTests.cs
@@ -3,6 +3,7 @@
 using MCPForUnity.External.Tommy;
 using MCPForUnity.Editor.Services;
 using System.IO;
+using System.Linq;
 
 namespace MCPForUnityTests.Editor.Helpers
 {
@@ -319,5 +320,109 @@ public void UpsertCodexServerBlock_OnNonWindows_ExcludesEnv()
             bool hasEnv = unityMcp.TryGetNode("env", out _);
             Assert.IsFalse(hasEnv, "Non-Windows config should not contain env table");
         }
+
+        [Test]
+        public void BuildCodexServerBlock_WithNullServerSrc_GeneratesRemoteUvxCommand()
+        {
+            // This test verifies that Asset Store installs (no embedded server) use remote uvx
+
+            // Mock Windows platform
+            MCPServiceLocator.Register<IPlatformService>(new MockPlatformService(isWindows: true, systemRoot: "C:\\Windows"));
+
+            string result = CodexConfigHelper.BuildCodexServerBlock(null, null);
+
+            Assert.IsNotNull(result, "BuildCodexServerBlock should return a valid TOML string for remote uvx");
+
+            // Parse the generated TOML to validate structure
+            TomlTable parsed;
+            using (var reader = new StringReader(result))
+            {
+                parsed = TOML.Parse(reader);
+            }
+
+            // Verify basic structure
+            Assert.IsTrue(parsed.TryGetNode("mcp_servers", out var mcpServersNode), "TOML should contain mcp_servers");
+            var mcpServers = mcpServersNode as TomlTable;
+            Assert.IsTrue(mcpServers.TryGetNode("unityMCP", out var unityMcpNode), "mcp_servers should contain unityMCP");
+            var unityMcp = unityMcpNode as TomlTable;
+
+            // Verify remote uvx command
+            Assert.IsTrue(unityMcp.TryGetNode("command", out var commandNode), "unityMCP should contain command");
+            var command = (commandNode as TomlString).Value;
+            Assert.AreEqual("uvx", command, "Command should be uvx for remote execution");
+
+            // Verify remote uvx args
+            Assert.IsTrue(unityMcp.TryGetNode("args", out var argsNode), "unityMCP should contain args");
+            var argsArray = argsNode as TomlArray;
+            Assert.IsNotNull(argsArray, "args should be an array");
+            Assert.AreEqual(3, argsArray.ChildrenCount, "Remote uvx should have 3 args: --from, url, package");
+
+            var args = argsArray.Children.OfType<TomlString>().Select(s => s.Value).ToArray();
+            Assert.AreEqual("--from", args[0], "First arg should be --from");
+            Assert.IsTrue(args[1].StartsWith("git+https://github.com/CoplayDev/unity-mcp@v"), "Second arg should be git URL");
+            Assert.IsTrue(args[1].Contains("#subdirectory=MCPForUnity/UnityMcpServer~/src"), "URL should include subdirectory");
+            Assert.AreEqual("mcp-for-unity", args[2], "Third arg should be package name");
+
+            // Verify env.SystemRoot is still present on Windows (even with remote uvx)
+            bool hasEnv = unityMcp.TryGetNode("env", out var envNode);
+            Assert.IsTrue(hasEnv, "Windows config should contain env table even with remote uvx");
+            var env = envNode as TomlTable;
+            Assert.IsTrue(env.TryGetNode("SystemRoot", out _), "env should contain SystemRoot");
+        }
+
+        [Test]
+        public void UpsertCodexServerBlock_WithNullServerSrc_GeneratesRemoteUvxCommand()
+        {
+            // This test verifies that upsert operations for Asset Store installs use remote uvx
+
+            // Mock non-Windows platform
+            MCPServiceLocator.Register<IPlatformService>(new MockPlatformService(isWindows: false));
+
+            string existingToml = string.Join("\n", new[]
+            {
+                "[other_section]",
+                "key = \"value\""
+            });
+
+            string result = CodexConfigHelper.UpsertCodexServerBlock(existingToml, null, null);
+
+            Assert.IsNotNull(result, "UpsertCodexServerBlock should return a valid TOML string for remote uvx");
+
+            // Parse the generated TOML to validate structure
+            TomlTable parsed;
+            using (var reader = new StringReader(result))
+            {
+                parsed = TOML.Parse(reader);
+            }
+
+            // Verify existing sections are preserved
+            Assert.IsTrue(parsed.TryGetNode("other_section", out _), "TOML should preserve existing sections");
+
+            // Verify mcp_servers structure
+            Assert.IsTrue(parsed.TryGetNode("mcp_servers", out var mcpServersNode), "TOML should contain mcp_servers");
+            var mcpServers = mcpServersNode as TomlTable;
+            Assert.IsTrue(mcpServers.TryGetNode("unityMCP", out var unityMcpNode), "mcp_servers should contain unityMCP");
+            var unityMcp = unityMcpNode as TomlTable;
+
+            // Verify remote uvx command
+            Assert.IsTrue(unityMcp.TryGetNode("command", out var commandNode), "unityMCP should contain command");
+            var command = (commandNode as TomlString).Value;
+            Assert.AreEqual("uvx", command, "Command should be uvx for remote execution");
+
+            // Verify remote uvx args
+            Assert.IsTrue(unityMcp.TryGetNode("args", out var argsNode), "unityMCP should contain args");
+            var argsArray = argsNode as TomlArray;
+            Assert.IsNotNull(argsArray, "args should be an array");
+            Assert.AreEqual(3, argsArray.ChildrenCount, "Remote uvx should have 3 args");
+
+            var args = argsArray.Children.OfType<TomlString>().Select(s => s.Value).ToArray();
+            Assert.AreEqual("--from", args[0], "First arg should be --from");
+            Assert.IsTrue(args[1].StartsWith("git+https://github.com/CoplayDev/unity-mcp@v"), "Second arg should be git URL");
+            Assert.AreEqual("mcp-for-unity", args[2], "Third arg should be package name");
+
+            // Verify env is NOT present on non-Windows platforms
+            bool hasEnv = unityMcp.TryGetNode("env", out _);
+            Assert.IsFalse(hasEnv, "Non-Windows config should not contain env table");
+        }
     }
 }
diff --git a/TestProjects/UnityMCPTests/Packages/manifest.json b/TestProjects/UnityMCPTests/Packages/manifest.json
index 8710d5b3..8bdffc27 100644
--- a/TestProjects/UnityMCPTests/Packages/manifest.json
+++ b/TestProjects/UnityMCPTests/Packages/manifest.json
@@ -1,16 +1,16 @@
 {
   "dependencies": {
-    "com.coplaydev.unity-mcp": "https://github.com/coplaydev/unity-mcp.git?path=MCPForUnity",
-    "com.unity.ai.navigation": "1.1.4",
-    "com.unity.collab-proxy": "2.5.2",
+    "com.coplaydev.unity-mcp": "file:../../../MCPForUnity",
+    "com.unity.ai.navigation": "1.1.6",
+    "com.unity.collab-proxy": "2.7.1",
     "com.unity.feature.development": "1.0.1",
-    "com.unity.ide.rider": "3.0.31",
+    "com.unity.ide.rider": "3.0.36",
     "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.ide.windsurf": "https://github.com/Asuta/com.unity.ide.windsurf.git",
     "com.unity.test-framework": "1.1.33",
-    "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.7.5",
+    "com.unity.textmeshpro": "3.0.7",
+    "com.unity.timeline": "1.7.7",
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.9.4",
     "com.unity.modules.ai": "1.0.0",
diff --git a/TestProjects/UnityMCPTests/ProjectSettings/ProjectVersion.txt b/TestProjects/UnityMCPTests/ProjectSettings/ProjectVersion.txt
index 105db72a..b8523623 100644
--- a/TestProjects/UnityMCPTests/ProjectSettings/ProjectVersion.txt
+++ b/TestProjects/UnityMCPTests/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.6f1
-m_EditorVersionWithRevision: 2022.3.6f1 (b9e6e7e9fa2d)
+m_EditorVersion: 2022.3.62f2
+m_EditorVersionWithRevision: 2022.3.62f2 (7670c08855a9)