Replace NetMQ with custom TCP networking

2025-10-18 12:39:36 +02:00 · 2025-09-23 07:48:07 +02:00 · 2025-09-23 02:29:21 +02:00 · 2025-09-23 02:05:35 +02:00 · 2025-09-22 14:45:39 +02:00 · 2025-09-22 13:31:59 +02:00
204 changed files with 1634 additions and 2725 deletions
--- a/Agent/Phantom.Agent.Minecraft.Tests/Java/JavaPropertiesStreamTests.cs
+++ b/Agent/Phantom.Agent.Minecraft.Tests/Java/JavaPropertiesStreamTests.cs
@@ -1,289 +0,0 @@
-using System.Collections.Immutable;
-using NUnit.Framework;
-using Phantom.Agent.Minecraft.Java;
-using Phantom.Utils.Collections;
-
-namespace Phantom.Agent.Minecraft.Tests.Java;
-
-[TestFixture]
-public sealed class JavaPropertiesStreamTests {
-	public sealed class Reader {
-		private static async Task<ImmutableArray<KeyValuePair<string, string>>> Parse(string contents) {
-			using var stream = new MemoryStream(JavaPropertiesStream.Encoding.GetBytes(contents));
-			using var properties = new JavaPropertiesStream.Reader(stream);
-			return await properties.ReadProperties(CancellationToken.None).ToImmutableArrayAsync();
-		}
-		
-		private static ImmutableArray<KeyValuePair<string, string>> KeyValue(string key, string value) {
-			return [new KeyValuePair<string, string>(key, value)];
-		}
-		
-		[TestCase("")]
-		[TestCase("\n")]
-		public async Task EmptyLinesAreIgnored(string contents) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(ImmutableArray<KeyValuePair<string, string>>.Empty));
-		}
-		
-		[TestCase("# Comment")]
-		[TestCase("! Comment")]
-		[TestCase("# Comment\n! Comment")]
-		public async Task CommentsAreIgnored(string contents) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(ImmutableArray<KeyValuePair<string, string>>.Empty));
-		}
-		
-		[TestCase("key=value")]
-		[TestCase("key= value")]
-		[TestCase("key =value")]
-		[TestCase("key = value")]
-		[TestCase("key:value")]
-		[TestCase("key: value")]
-		[TestCase("key :value")]
-		[TestCase("key : value")]
-		[TestCase("key value")]
-		[TestCase("key\tvalue")]
-		[TestCase("key\fvalue")]
-		[TestCase("key \t\fvalue")]
-		public async Task SimpleKeyValue(string contents) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue("key", "value")));
-		}
-		
-		[TestCase("key")]
-		[TestCase(" key")]
-		[TestCase(" key ")]
-		[TestCase("key=")]
-		[TestCase("key:")]
-		public async Task KeyWithoutValue(string contents) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue("key", "")));
-		}
-		
-		[TestCase(@"\#key=value", "#key")]
-		[TestCase(@"\!key=value", "!key")]
-		public async Task KeyBeginsWithEscapedComment(string contents, string expectedKey) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue(expectedKey, "value")));
-		}
-		
-		[TestCase(@"\=key=value", "=key")]
-		[TestCase(@"\:key=value", ":key")]
-		[TestCase(@"\ key=value", " key")]
-		[TestCase("\\\tkey=value", "\tkey")]
-		[TestCase("\\\fkey=value", "\fkey")]
-		public async Task KeyBeginsWithEscapedDelimiter(string contents, string expectedKey) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue(expectedKey, "value")));
-		}
-		
-		[TestCase(@"start\=end=value", "start=end")]
-		[TestCase(@"start\:end:value", "start:end")]
-		[TestCase(@"start\ end value", "start end")]
-		[TestCase(@"start\ \:\=end = value", "start :=end")]
-		[TestCase("start\\ \\\t\\\fend = value", "start \t\fend")]
-		public async Task KeyContainsEscapedDelimiter(string contents, string expectedKey) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue(expectedKey, "value")));
-		}
-		
-		[TestCase(@"key = \ value", " value")]
-		[TestCase("key = \\\tvalue", "\tvalue")]
-		[TestCase("key = \\\fvalue", "\fvalue")]
-		[TestCase("key=\\ \\\t\\\fvalue", " \t\fvalue")]
-		public async Task ValueBeginsWithEscapedWhitespace(string contents, string expectedValue) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue("key", expectedValue)));
-		}
-		
-		[TestCase(@"key = value\", "value")]
-		public async Task ValueEndsWithTrailingBackslash(string contents, string expectedValue) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue("key", expectedValue)));
-		}
-		
-		[TestCase("key=\\\0", "\0")]
-		[TestCase(@"key=\\", "\\")]
-		[TestCase(@"key=\t", "\t")]
-		[TestCase(@"key=\n", "\n")]
-		[TestCase(@"key=\r", "\r")]
-		[TestCase(@"key=\f", "\f")]
-		[TestCase(@"key=\u3053\u3093\u306b\u3061\u306f", "こんにちは")]
-		[TestCase(@"key=\u3053\u3093\u306B\u3061\u306F", "こんにちは")]
-		[TestCase("key=\\\0\\\\\\t\\n\\r\\f\\u3053", "\0\\\t\n\r\fこ")]
-		public async Task ValueContainsEscapedSpecialCharacters(string contents, string expectedValue) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue("key", expectedValue)));
-		}
-		
-		[TestCase("key=first\\\nsecond", "first\nsecond")]
-		[TestCase("key=first\\\n    second", "first\nsecond")]
-		[TestCase("key=first\\\n#second", "first\n#second")]
-		[TestCase("key=first\\\n!second", "first\n!second")]
-		public async Task ValueContainsNewLine(string contents, string expectedValue) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue("key", expectedValue)));
-		}
-		
-		[TestCase("key=first\\\n    \\ second", "first\n second")]
-		[TestCase("key=first\\\n    \\\tsecond", "first\n\tsecond")]
-		[TestCase("key=first\\\n    \\\fsecond", "first\n\fsecond")]
-		[TestCase("key=first\\\n \t\f\\ second", "first\n second")]
-		public async Task ValueContainsNewLineWithEscapedLeadingWhitespace(string contents, string expectedValue) {
-			Assert.That(await Parse(contents), Is.EquivalentTo(KeyValue("key", expectedValue)));
-		}
-		
-		[Test]
-		public async Task ExampleFile() {
-			// From Wikipedia: https://en.wikipedia.org/wiki/.properties
-			const string ExampleFile = """
-			                           # You are reading a comment in ".properties" file.
-			                           ! The exclamation mark ('!') can also be used for comments.
-			                           # Comments are ignored.
-			                           # Blank lines are also ignored.
-			                           
-			                           # Lines with "properties" contain a key and a value separated by a delimiting character.
-			                           # There are 3 delimiting characters: equal ('='), colon (':') and whitespace (' ', '\t' and '\f').
-			                           website = https://en.wikipedia.org/
-			                           language : English
-			                           topic .properties files
-			                           # A word on a line will just create a key with no value.
-			                           empty
-			                           # Whitespace that appears between the key, the delimiter and the value is ignored.
-			                           # This means that the following are equivalent (other than for readability).
-			                           hello=hello
-			                           hello = hello
-			                           # To start the value with whitespace, escape it with a backslash ('\').
-			                           whitespaceStart = \ <-This space is not ignored.
-			                           # Keys with the same name will be overwritten by the key that is the furthest in a file.
-			                           # For example the final value for "duplicateKey" will be "second".
-			                           duplicateKey = first
-			                           duplicateKey = second
-			                           # To use the delimiter characters inside a key, you need to escape them with a ('\').
-			                           # However, there is no need to do this in the value.
-			                           delimiterCharacters\:\=\ = This is the value for the key "delimiterCharacters\:\=\ "
-			                           # Adding a backslash ('\') at the end of a line means that the value continues on the next line.
-			                           multiline = This line \
-			                           continues
-			                           # If you want your value to include a backslash ('\'), it should be escaped by another backslash ('\').
-			                           path = c:\\wiki\\templates
-			                           # This means that if the number of backslashes ('\') at the end of the line is even, the next line is not included in the value. 
-			                           # In the following example, the value for "evenKey" is "This is on one line\".
-			                           evenKey = This is on one line\\
-			                           # This line is a normal comment and is not included in the value for "evenKey".
-			                           # If the number of backslash ('\') is odd, then the next line is included in the value.
-			                           # In the following example, the value for "oddKey" is "This is line one and\# This is line two".
-			                           oddKey = This is line one and\\\
-			                           # This is line two
-			                           # Whitespace characters at the beginning of a line is removed.
-			                           # Make sure to add the spaces you need before the backslash ('\') on the first line. 
-			                           # If you add them at the beginning of the next line, they will be removed.
-			                           # In the following example, the value for "welcome" is "Welcome to Wikipedia!".
-			                           welcome = Welcome to \
-			                                     Wikipedia!
-			                           # If you need to add newlines and carriage returns, they need to be escaped using ('\n') and ('\r') respectively.
-			                           # You can also optionally escape tabs with ('\t') for readability purposes.
-			                           valueWithEscapes = This is a newline\n and a carriage return\r and a tab\t.
-			                           # You can also use Unicode escape characters (maximum of four hexadecimal digits).
-			                           # In the following example, the value for "encodedHelloInJapanese" is "こんにちは".
-			                           encodedHelloInJapanese = \u3053\u3093\u306b\u3061\u306f
-			                           """;
-			
-			ImmutableArray<KeyValuePair<string, string>> result = [
-				new ("website", "https://en.wikipedia.org/"),
-				new ("language", "English"),
-				new ("topic", ".properties files"),
-				new ("empty", ""),
-				new ("hello", "hello"),
-				new ("hello", "hello"),
-				new ("whitespaceStart", @" <-This space is not ignored."),
-				new ("duplicateKey", "first"),
-				new ("duplicateKey", "second"),
-				new ("delimiterCharacters:= ", @"This is the value for the key ""delimiterCharacters:= """),
-				new ("multiline", "This line \ncontinues"),
-				new ("path", @"c:\wiki\templates"),
-				new ("evenKey", @"This is on one line\"),
-				new ("oddKey", "This is line one and\\\n# This is line two"),
-				new ("welcome", "Welcome to \nWikipedia!"),
-				new ("valueWithEscapes", "This is a newline\n and a carriage return\r and a tab\t."),
-				new ("encodedHelloInJapanese", "こんにちは"),
-			];
-			
-			Assert.That(await Parse(ExampleFile), Is.EquivalentTo(result));
-		}
-	}
-	
-	public sealed class Writer {
-		private static async Task<string> Write(Func<JavaPropertiesStream.Writer, Task> write) {
-			using var stream = new MemoryStream();
-			
-			await using (var writer = new JavaPropertiesStream.Writer(stream)) {
-				await write(writer);
-			}
-			
-			return JavaPropertiesStream.Encoding.GetString(stream.ToArray());
-		}
-		
-		[TestCase("one line comment", "# one line comment\n")]
-		[TestCase("こんにちは", "# \\u3053\\u3093\\u306B\\u3061\\u306F\n")]
-		[TestCase("first line\nsecond line\r\nthird line", "# first line\n# second line\n# third line\n")]
-		public async Task Comment(string comment, string contents) {
-			Assert.That(await Write(writer => writer.WriteComment(comment, CancellationToken.None)), Is.EqualTo(contents));
-		}
-		
-		[TestCase("key", "value", "key=value\n")]
-		[TestCase("key", "", "key=\n")]
-		[TestCase("", "value", "=value\n")]
-		public async Task SimpleKeyValue(string key, string value, string contents) {
-			Assert.That(await Write(writer => writer.WriteProperty(key, value, CancellationToken.None)), Is.EqualTo(contents));
-		}
-		
-		[TestCase("#key", "value", "\\#key=value\n")]
-		[TestCase("!key", "value", "\\!key=value\n")]
-		public async Task KeyBeginsWithEscapedComment(string key, string value, string contents) {
-			Assert.That(await Write(writer => writer.WriteProperty(key, value, CancellationToken.None)), Is.EqualTo(contents));
-		}
-		
-		[TestCase("=key", "value", "\\=key=value\n")]
-		[TestCase(":key", "value", "\\:key=value\n")]
-		[TestCase(" key", "value", "\\ key=value\n")]
-		[TestCase("\tkey", "value", "\\tkey=value\n")]
-		[TestCase("\fkey", "value", "\\fkey=value\n")]
-		public async Task KeyBeginsWithEscapedDelimiter(string key, string value, string contents) {
-			Assert.That(await Write(writer => writer.WriteProperty(key, value, CancellationToken.None)), Is.EqualTo(contents));
-		}
-		
-		[TestCase("start=end", "value", "start\\=end=value\n")]
-		[TestCase("start:end", "value", "start\\:end=value\n")]
-		[TestCase("start end", "value", "start\\ end=value\n")]
-		[TestCase("start :=end", "value", "start\\ \\:\\=end=value\n")]
-		[TestCase("start \t\fend", "value", "start\\ \\t\\fend=value\n")]
-		public async Task KeyContainsEscapedDelimiter(string key, string value, string contents) {
-			Assert.That(await Write(writer => writer.WriteProperty(key, value, CancellationToken.None)), Is.EqualTo(contents));
-		}
-		
-		[TestCase("\\", "value", "\\\\=value\n")]
-		[TestCase("\t", "value", "\\t=value\n")]
-		[TestCase("\n", "value", "\\n=value\n")]
-		[TestCase("\r", "value", "\\r=value\n")]
-		[TestCase("\f", "value", "\\f=value\n")]
-		[TestCase("こんにちは", "value", "\\u3053\\u3093\\u306B\\u3061\\u306F=value\n")]
-		[TestCase("\\\t\n\r\fこ", "value", "\\\\\\t\\n\\r\\f\\u3053=value\n")]
-		[TestCase("first-line\nsecond-line\r\nthird-line", "value", "first-line\\nsecond-line\\r\\nthird-line=value\n")]
-		public async Task KeyContainsEscapedSpecialCharacters(string key, string value, string contents) {
-			Assert.That(await Write(writer => writer.WriteProperty(key, value, CancellationToken.None)), Is.EqualTo(contents));
-		}
-		
-		[TestCase("key", "\\", "key=\\\\\n")]
-		[TestCase("key", "\t", "key=\\t\n")]
-		[TestCase("key", "\n", "key=\\n\n")]
-		[TestCase("key", "\r", "key=\\r\n")]
-		[TestCase("key", "\f", "key=\\f\n")]
-		[TestCase("key", "こんにちは", "key=\\u3053\\u3093\\u306B\\u3061\\u306F\n")]
-		[TestCase("key", "\\\t\n\r\fこ", "key=\\\\\\t\\n\\r\\f\\u3053\n")]
-		[TestCase("key", "first line\nsecond line\r\nthird line", "key=first line\\nsecond line\\r\\nthird line\n")]
-		public async Task ValueContainsEscapedSpecialCharacters(string key, string value, string contents) {
-			Assert.That(await Write(writer => writer.WriteProperty(key, value, CancellationToken.None)), Is.EqualTo(contents));
-		}
-		
-		[Test]
-		public async Task ExampleFile() {
-			string contents = await Write(static async writer => {
-				await writer.WriteComment("Comment", CancellationToken.None);
-				await writer.WriteProperty("key", "value", CancellationToken.None);
-				await writer.WriteProperty("multiline", "first line\nsecond line", CancellationToken.None);
-			});
-			
-			Assert.That(contents, Is.EqualTo("# Comment\nkey=value\nmultiline=first line\\nsecond line\n"));
-		}
-	}
-}
--- a/Agent/Phantom.Agent.Minecraft.Tests/Phantom.Agent.Minecraft.Tests.csproj
+++ b/Agent/Phantom.Agent.Minecraft.Tests/Phantom.Agent.Minecraft.Tests.csproj
@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  
-  <PropertyGroup>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-  
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="NUnit" />
-    <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="NUnit.Analyzers" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\Phantom.Agent.Minecraft\Phantom.Agent.Minecraft.csproj" />
-  </ItemGroup>
-
-</Project>
--- a/Agent/Phantom.Agent.Minecraft/Java/JavaPropertiesFileEditor.cs
+++ b/Agent/Phantom.Agent.Minecraft/Java/JavaPropertiesFileEditor.cs
@@ -1,52 +1,92 @@
-namespace Phantom.Agent.Minecraft.Java;
+using System.Text;
+using Kajabity.Tools.Java;
+
+namespace Phantom.Agent.Minecraft.Java;

 sealed class JavaPropertiesFileEditor {
+	private static readonly Encoding Encoding = Encoding.GetEncoding("ISO-8859-1");
+	
 	private readonly Dictionary<string, string> overriddenProperties = new ();
 	
 	public void Set(string key, string value) {
 		overriddenProperties[key] = value;
 	}
 	
-	public async Task EditOrCreate(string filePath, string comment, CancellationToken cancellationToken) {
+	public async Task EditOrCreate(string filePath) {
 		if (File.Exists(filePath)) {
 			string tmpFilePath = filePath + ".tmp";
-			await Edit(filePath, tmpFilePath, comment, cancellationToken);
+			File.Copy(filePath, tmpFilePath, overwrite: true);
+			await EditFromCopyOrCreate(filePath, tmpFilePath);
 			File.Move(tmpFilePath, filePath, overwrite: true);
 		}
 		else {
-			await Create(filePath, comment, cancellationToken);
+			await EditFromCopyOrCreate(null, filePath);
 		}
 	}
 	
-	private async Task Create(string targetFilePath, string comment, CancellationToken cancellationToken) {
-		await using var targetWriter = new JavaPropertiesStream.Writer(targetFilePath);
+	private async Task EditFromCopyOrCreate(string? sourceFilePath, string targetFilePath) {
+		var properties = new JavaProperties();
 		
-		await targetWriter.WriteComment(comment, cancellationToken);
+		if (sourceFilePath != null) {
+			// TODO replace with custom async parser
+			await using var sourceStream = new FileStream(sourceFilePath, FileMode.Open, FileAccess.Read, FileShare.Read);
+			properties.Load(sourceStream, Encoding);
+		}
 		
-		foreach ((string key, string value) in overriddenProperties) {
-			await targetWriter.WriteProperty(key, value, cancellationToken);
+		foreach (var (key, value) in overriddenProperties) {
+			properties[key] = value;
+		}
+		
+		await using var targetStream = new FileStream(targetFilePath, FileMode.Create, FileAccess.Write, FileShare.Read);
+		await using var targetWriter = new StreamWriter(targetStream, Encoding);
+		
+		await targetWriter.WriteLineAsync("# Properties");
+		
+		foreach (var (key, value) in properties) {
+			await WriteProperty(targetWriter, key, value);
 		}
 	}
 	
-	private async Task Edit(string sourceFilePath, string targetFilePath, string comment, CancellationToken cancellationToken) {
-		using var sourceReader = new JavaPropertiesStream.Reader(sourceFilePath);
-		await using var targetWriter = new JavaPropertiesStream.Writer(targetFilePath);
-		
-		await targetWriter.WriteComment(comment, cancellationToken);
-		
-		var remainingOverriddenPropertyKeys = new HashSet<string>(overriddenProperties.Keys);
-		
-		await foreach ((string key, string value) in sourceReader.ReadProperties(cancellationToken)) {
-			if (remainingOverriddenPropertyKeys.Remove(key)) {
-				await targetWriter.WriteProperty(key, overriddenProperties[key], cancellationToken);
+	private static async Task WriteProperty(StreamWriter writer, string key, string value) {
+		await WritePropertyComponent(writer, key, escapeSpaces: true);
+		await writer.WriteAsync('=');
+		await WritePropertyComponent(writer, value, escapeSpaces: false);
+		await writer.WriteLineAsync();
+	}
+	
+	private static async Task WritePropertyComponent(TextWriter writer, string component, bool escapeSpaces) {
+		for (int index = 0; index < component.Length; index++) {
+			var c = component[index];
+			switch (c) {
+				case '\\':
+				case '#':
+				case '!':
+				case '=':
+				case ':':
+				case ' ' when escapeSpaces || index == 0:
+					await writer.WriteAsync('\\');
+					await writer.WriteAsync(c);
+					break;
+				case var _ when c > 31 && c < 127:
+					await writer.WriteAsync(c);
+					break;
+				case '\t':
+					await writer.WriteAsync("\\t");
+					break;
+				case '\n':
+					await writer.WriteAsync("\\n");
+					break;
+				case '\r':
+					await writer.WriteAsync("\\r");
+					break;
+				case '\f':
+					await writer.WriteAsync("\\f");
+					break;
+				default:
+					await writer.WriteAsync("\\u");
+					await writer.WriteAsync(((int) c).ToString("X4"));
+					break;
 			}
-			else {
-				await targetWriter.WriteProperty(key, value, cancellationToken);
-			}
-		}
-		
-		foreach (string key in remainingOverriddenPropertyKeys) {
-			await targetWriter.WriteProperty(key, overriddenProperties[key], cancellationToken);
 		}
 	}
 }
--- a/Agent/Phantom.Agent.Minecraft/Java/JavaPropertiesStream.cs
+++ b/Agent/Phantom.Agent.Minecraft/Java/JavaPropertiesStream.cs
@@ -1,284 +0,0 @@
-using System.Buffers;
-using System.Globalization;
-using System.Runtime.CompilerServices;
-using System.Text;
-using Phantom.Utils.Collections;
-
-namespace Phantom.Agent.Minecraft.Java;
-
-static class JavaPropertiesStream {
-	internal static readonly Encoding Encoding = Encoding.GetEncoding("ISO-8859-1");
-	
-	private static FileStreamOptions CreateFileStreamOptions(FileMode mode, FileAccess access) {
-		return new FileStreamOptions {
-			Mode = mode,
-			Access = access,
-			Share = FileShare.Read,
-			Options = FileOptions.SequentialScan,
-		};
-	}
-	
-	internal sealed class Reader : IDisposable {
-		private static readonly SearchValues<char> LineStartWhitespace = SearchValues.Create(' ', '\t', '\f');
-		private static readonly SearchValues<char> KeyValueDelimiter = SearchValues.Create('=', ':', ' ', '\t', '\f');
-		private static readonly SearchValues<char> Backslash = SearchValues.Create('\\');
-		
-		private readonly StreamReader reader;
-		
-		public Reader(Stream stream) {
-			this.reader = new StreamReader(stream, Encoding, leaveOpen: false);
-		}
-		
-		public Reader(string path) {
-			this.reader = new StreamReader(path, Encoding, detectEncodingFromByteOrderMarks: false, CreateFileStreamOptions(FileMode.Open, FileAccess.Read));
-		}
-		
-		public async IAsyncEnumerable<KeyValuePair<string, string>> ReadProperties([EnumeratorCancellation] CancellationToken cancellationToken) {
-			await foreach (string line in ReadLogicalLines(cancellationToken)) {
-				yield return ParseLine(line.AsSpan());
-			}
-		}
-		
-		private async IAsyncEnumerable<string> ReadLogicalLines([EnumeratorCancellation] CancellationToken cancellationToken) {
-			StringBuilder nextLogicalLine = new StringBuilder();
-			
-			while (await reader.ReadLineAsync(cancellationToken) is {} line) {
-				var span = line.AsSpan();
-				int startIndex = span.IndexOfAnyExcept(LineStartWhitespace);
-				if (startIndex == -1) {
-					continue;
-				}
-				
-				if (nextLogicalLine.Length == 0 && (span[0] == '#' || span[0] == '!')) {
-					continue;
-				}
-				
-				span = span[startIndex..];
-				
-				if (IsEndEscaped(span)) {
-					nextLogicalLine.Append(span[..^1]);
-					nextLogicalLine.Append('\n');
-				}
-				else {
-					nextLogicalLine.Append(span);
-					yield return nextLogicalLine.ToString();
-					nextLogicalLine.Clear();
-				}
-			}
-			
-			if (nextLogicalLine.Length > 0) {
-				yield return nextLogicalLine.ToString(startIndex: 0, nextLogicalLine.Length - 1); // Remove trailing new line.
-			}
-		}
-		
-		private static KeyValuePair<string, string> ParseLine(ReadOnlySpan<char> line) {
-			int delimiterIndex = -1;
-			
-			foreach (int candidateIndex in line.IndicesOf(KeyValueDelimiter)) {
-				if (candidateIndex == 0 || !IsEndEscaped(line[..candidateIndex])) {
-					delimiterIndex = candidateIndex;
-					break;
-				}
-			}
-			
-			if (delimiterIndex == -1) {
-				return new KeyValuePair<string, string>(line.ToString(), string.Empty);
-			}
-			
-			string key = ReadPropertyComponent(line[..delimiterIndex]);
-			
-			line = line[(delimiterIndex + 1)..];
-			int valueStartIndex = line.IndexOfAnyExcept(KeyValueDelimiter);
-			string value = valueStartIndex == -1 ? string.Empty : ReadPropertyComponent(line[valueStartIndex..]);
-			
-			return new KeyValuePair<string, string>(key, value);
-		}
-		
-		private static string ReadPropertyComponent(ReadOnlySpan<char> component) {
-			StringBuilder builder = new StringBuilder();
-			int nextStartIndex = 0;
-			
-			foreach (int backslashIndex in component.IndicesOf(Backslash)) {
-				if (backslashIndex == component.Length - 1) {
-					break;
-				}
-				
-				if (backslashIndex < nextStartIndex) {
-					continue;
-				}
-				
-				builder.Append(component[nextStartIndex..backslashIndex]);
-				
-				int escapedIndex = backslashIndex + 1;
-				int escapedLength = 1;
-				
-				char c = component[escapedIndex];
-				switch (c) {
-					case 't':
-						builder.Append('\t');
-						break;
-					
-					case 'n':
-						builder.Append('\n');
-						break;
-					
-					case 'r':
-						builder.Append('\r');
-						break;
-					
-					case 'f':
-						builder.Append('\f');
-						break;
-					
-					case 'u':
-						escapedLength += 4;
-						
-						int hexRangeStart = escapedIndex + 1;
-						int hexRangeEnd = hexRangeStart + 4;
-						
-						if (hexRangeEnd - 1 < component.Length) {
-							var hexString = component[hexRangeStart..hexRangeEnd];
-							int hexValue = int.Parse(hexString, NumberStyles.HexNumber);
-							builder.Append((char) hexValue);
-						}
-						else {
-							throw new FormatException("Malformed \\uxxxx encoding.");
-						}
-						
-						break;
-					
-					default:
-						builder.Append(c);
-						break;
-				}
-				
-				nextStartIndex = escapedIndex + escapedLength;
-			}
-			
-			builder.Append(component[nextStartIndex..]);
-			return builder.ToString();
-		}
-		
-		private static bool IsEndEscaped(ReadOnlySpan<char> span) {
-			if (span.EndsWith('\\')) {
-				int trailingBackslashCount = span.Length - span.TrimEnd('\\').Length;
-				return trailingBackslashCount % 2 == 1;
-			}
-			else {
-				return false;
-			}
-		}
-		
-		public void Dispose() {
-			reader.Dispose();
-		}
-	}
-	
-	internal sealed class Writer : IAsyncDisposable {
-		private const string CommentStart = "# ";
-		
-		private readonly StreamWriter writer;
-		private readonly Memory<char> oneCharBuffer = new char[1];
-		
-		public Writer(Stream stream) {
-			this.writer = new StreamWriter(stream, Encoding, leaveOpen: false);
-		}
-		
-		public Writer(string path) {
-			this.writer = new StreamWriter(path, Encoding, CreateFileStreamOptions(FileMode.Create, FileAccess.Write));
-		}
-		
-		public async Task WriteComment(string comment, CancellationToken cancellationToken) {
-			await Write(CommentStart, cancellationToken);
-			
-			for (int index = 0; index < comment.Length; index++) {
-				char c = comment[index];
-				switch (c) {
-					case var _ when c > 31 && c < 127:
-						await Write(c, cancellationToken);
-						break;
-					
-					case '\n':
-					case '\r':
-						await Write(c: '\n', cancellationToken);
-						await Write(CommentStart, cancellationToken);
-						
-						if (index < comment.Length - 1 && comment[index + 1] == '\n') {
-							index++;
-						}
-						
-						break;
-					
-					default:
-						await Write("\\u", cancellationToken);
-						await Write(((int) c).ToString("X4"), cancellationToken);
-						break;
-				}
-			}
-			
-			await Write(c: '\n', cancellationToken);
-		}
-		
-		public async Task WriteProperty(string key, string value, CancellationToken cancellationToken) {
-			await WritePropertyComponent(key, escapeSpaces: true, cancellationToken);
-			await Write(c: '=', cancellationToken);
-			await WritePropertyComponent(value, escapeSpaces: false, cancellationToken);
-			await Write(c: '\n', cancellationToken);
-		}
-		
-		private async Task WritePropertyComponent(string component, bool escapeSpaces, CancellationToken cancellationToken) {
-			for (int index = 0; index < component.Length; index++) {
-				char c = component[index];
-				switch (c) {
-					case '\\':
-					case '#':
-					case '!':
-					case '=':
-					case ':':
-					case ' ' when escapeSpaces || index == 0:
-						await Write(c: '\\', cancellationToken);
-						await Write(c, cancellationToken);
-						break;
-					
-					case var _ when c > 31 && c < 127:
-						await Write(c, cancellationToken);
-						break;
-					
-					case '\t':
-						await Write("\\t", cancellationToken);
-						break;
-					
-					case '\n':
-						await Write("\\n", cancellationToken);
-						break;
-					
-					case '\r':
-						await Write("\\r", cancellationToken);
-						break;
-					
-					case '\f':
-						await Write("\\f", cancellationToken);
-						break;
-					
-					default:
-						await Write("\\u", cancellationToken);
-						await Write(((int) c).ToString("X4"), cancellationToken);
-						break;
-				}
-			}
-		}
-		
-		private Task Write(char c, CancellationToken cancellationToken) {
-			oneCharBuffer.Span[0] = c;
-			return writer.WriteAsync(oneCharBuffer, cancellationToken);
-		}
-		
-		private Task Write(string value, CancellationToken cancellationToken) {
-			return writer.WriteAsync(value.AsMemory(), cancellationToken);
-		}
-		
-		public async ValueTask DisposeAsync() {
-			await writer.DisposeAsync();
-		}
-	}
-}
--- a/Agent/Phantom.Agent.Minecraft/Java/JavaRuntimeDiscovery.cs
+++ b/Agent/Phantom.Agent.Minecraft/Java/JavaRuntimeDiscovery.cs
@@ -38,7 +38,7 @@ public sealed class JavaRuntimeDiscovery {
 			RecurseSubdirectories = true,
 			ReturnSpecialDirectories = false,
 			IgnoreInaccessible = true,
-			AttributesToSkip = FileAttributes.Hidden | FileAttributes.ReparsePoint | FileAttributes.System,
+			AttributesToSkip = FileAttributes.Hidden | FileAttributes.ReparsePoint | FileAttributes.System
 		}).Order()) {
 			cancellationToken.ThrowIfCancellationRequested();
 			
--- a/Agent/Phantom.Agent.Minecraft/Java/JavaRuntimeExecutable.cs
+++ b/Agent/Phantom.Agent.Minecraft/Java/JavaRuntimeExecutable.cs
@@ -2,4 +2,12 @@

 namespace Phantom.Agent.Minecraft.Java;

-sealed record JavaRuntimeExecutable(string ExecutablePath, JavaRuntime Runtime);
+public sealed class JavaRuntimeExecutable {
+	internal string ExecutablePath { get; }
+	internal JavaRuntime Runtime { get; }
+	
+	internal JavaRuntimeExecutable(string executablePath, JavaRuntime runtime) {
+		this.ExecutablePath = executablePath;
+		this.Runtime = runtime;
+	}
+}
--- a/Agent/Phantom.Agent.Minecraft/Java/JavaRuntimeRepository.cs
+++ b/Agent/Phantom.Agent.Minecraft/Java/JavaRuntimeRepository.cs
@@ -19,10 +19,11 @@ public sealed class JavaRuntimeRepository {
 	}
 	
 	public ImmutableArray<TaggedJavaRuntime> All {
-		[SuppressMessage("ReSharper", "UseCollectionExpression")]
-		get => runtimesByGuid.Select(static kvp => new TaggedJavaRuntime(kvp.Key, kvp.Value.Runtime))
-		                     .OrderBy(static taggedRuntime => taggedRuntime.Runtime)
-		                     .ToImmutableArray();
+		get {
+			return runtimesByGuid.Select(static kvp => new TaggedJavaRuntime(kvp.Key, kvp.Value.Runtime))
+			                     .OrderBy(static taggedRuntime => taggedRuntime.Runtime)
+			                     .ToImmutableArray();
+		}
 	}
 	
 	internal bool TryGetByGuid(Guid guid, [MaybeNullWhen(false)] out JavaRuntimeExecutable runtime) {
--- a/Agent/Phantom.Agent.Minecraft/Java/JvmArgumentBuilder.cs
+++ b/Agent/Phantom.Agent.Minecraft/Java/JvmArgumentBuilder.cs
@@ -2,8 +2,13 @@

 namespace Phantom.Agent.Minecraft.Java;

-sealed class JvmArgumentBuilder(JvmProperties basicProperties) {
-	private readonly List<string> customArguments = [];
+sealed class JvmArgumentBuilder {
+	private readonly JvmProperties basicProperties;
+	private readonly List<string> customArguments = new ();
+	
+	public JvmArgumentBuilder(JvmProperties basicProperties) {
+		this.basicProperties = basicProperties;
+	}
 	
 	public void Add(string argument) {
 		customArguments.Add(argument);
--- a/Agent/Phantom.Agent.Minecraft/Launcher/BaseLauncher.cs
+++ b/Agent/Phantom.Agent.Minecraft/Launcher/BaseLauncher.cs
@@ -43,7 +43,7 @@ public abstract class BaseLauncher : IServerLauncher {
 		
 		try {
 			await AcceptEula(instanceProperties);
-			await UpdateServerProperties(instanceProperties, cancellationToken);
+			await UpdateServerProperties(instanceProperties);
 		} catch (Exception e) {
 			logger.Error(e, "Caught exception while configuring the server.");
 			return new LaunchResult.CouldNotConfigureMinecraftServer();
@@ -53,7 +53,7 @@ public abstract class BaseLauncher : IServerLauncher {
 			FileName = javaRuntimeExecutable.ExecutablePath,
 			WorkingDirectory = instanceProperties.InstanceFolder,
 			RedirectInput = true,
-			UseShellExecute = false,
+			UseShellExecute = false
 		};
 		
 		var processArguments = processConfigurator.ArgumentList;
@@ -105,12 +105,12 @@ public abstract class BaseLauncher : IServerLauncher {
 	
 	private static async Task AcceptEula(InstanceProperties instanceProperties) {
 		var eulaFilePath = Path.Combine(instanceProperties.InstanceFolder, "eula.txt");
-		await File.WriteAllLinesAsync(eulaFilePath, ["# EULA", "eula=true"], Encoding.UTF8);
+		await File.WriteAllLinesAsync(eulaFilePath, new[] { "# EULA", "eula=true" }, Encoding.UTF8);
 	}
 	
-	private static async Task UpdateServerProperties(InstanceProperties instanceProperties, CancellationToken cancellationToken) {
+	private static async Task UpdateServerProperties(InstanceProperties instanceProperties) {
 		var serverPropertiesEditor = new JavaPropertiesFileEditor();
 		instanceProperties.ServerProperties.SetTo(serverPropertiesEditor);
-		await serverPropertiesEditor.EditOrCreate(Path.Combine(instanceProperties.InstanceFolder, "server.properties"), comment: "server.properties", cancellationToken);
+		await serverPropertiesEditor.EditOrCreate(Path.Combine(instanceProperties.InstanceFolder, "server.properties"));
 	}
 }
--- a/Agent/Phantom.Agent.Minecraft/Launcher/Types/FabricLauncher.cs
+++ b/Agent/Phantom.Agent.Minecraft/Launcher/Types/FabricLauncher.cs
@@ -1,4 +1,5 @@
-using Phantom.Agent.Minecraft.Instance;
+using System.Collections.Immutable;
+using Phantom.Agent.Minecraft.Instance;
 using Phantom.Utils.IO;
 using Serilog;

@@ -19,7 +20,7 @@ public sealed class FabricLauncher : BaseLauncher {
 			await DownloadLauncher(logger, launcherJarPath, cancellationToken);
 		}
 		
-		return new ServerJarInfo(launcherJarPath, ["-Dfabric.installer.server.gameJar=" + Paths.NormalizeSlashes(serverJarPath)]);
+		return new ServerJarInfo(launcherJarPath, ImmutableArray.Create("-Dfabric.installer.server.gameJar=" + Paths.NormalizeSlashes(serverJarPath)));
 	}
 	
 	private async Task DownloadLauncher(ILogger logger, string targetFilePath, CancellationToken cancellationToken) {
--- a/Agent/Phantom.Agent.Minecraft/Phantom.Agent.Minecraft.csproj
+++ b/Agent/Phantom.Agent.Minecraft/Phantom.Agent.Minecraft.csproj
@@ -6,7 +6,7 @@
  </PropertyGroup>
  
  <ItemGroup>
-    <InternalsVisibleTo Include="Phantom.Agent.Minecraft.Tests" />
+    <PackageReference Include="Kajabity.Tools.Java" />
  </ItemGroup>
  
  <ItemGroup>
--- a/Agent/Phantom.Agent.Minecraft/Server/MinecraftServerExecutableDownloader.cs
+++ b/Agent/Phantom.Agent.Minecraft/Server/MinecraftServerExecutableDownloader.cs
@@ -17,7 +17,7 @@ sealed class MinecraftServerExecutableDownloader {
 	
 	private readonly CancellationTokenSource cancellationTokenSource = new ();
 	
-	private readonly List<CancellationTokenRegistration> listenerCancellationRegistrations = [];
+	private readonly List<CancellationTokenRegistration> listenerCancellationRegistrations = new ();
 	private int listenerCount = 0;
 	
 	public MinecraftServerExecutableDownloader(FileDownloadInfo fileDownloadInfo, string minecraftVersion, string filePath, MinecraftServerExecutableDownloadListener listener) {
@@ -106,7 +106,7 @@ sealed class MinecraftServerExecutableDownloader {
 				throw;
 			}
 			
-			File.Move(tmpFilePath, filePath, overwrite: true);
+			File.Move(tmpFilePath, filePath, true);
 			Logger.Information("Server version {Version} downloaded.", minecraftVersion);
 			
 			return filePath;
--- a/Agent/Phantom.Agent.Minecraft/Server/ServerStatusProtocol.cs
+++ b/Agent/Phantom.Agent.Minecraft/Server/ServerStatusProtocol.cs
@@ -24,7 +24,7 @@ public static class ServerStatusProtocol {
 	private static async Task<short> ReadStreamHeader(NetworkStream tcpStream, CancellationToken cancellationToken) {
 		var headerBuffer = ArrayPool<byte>.Shared.Rent(3);
 		try {
-			await tcpStream.ReadExactlyAsync(headerBuffer, offset: 0, count: 3, cancellationToken);
+			await tcpStream.ReadExactlyAsync(headerBuffer, 0, 3, cancellationToken);
 			
 			if (headerBuffer[0] != 0xFF) {
 				throw new ProtocolException("Unexpected first byte in response from server: " + headerBuffer[0]);
@@ -44,8 +44,8 @@ public static class ServerStatusProtocol {
 	private static async Task<InstancePlayerCounts> ReadPlayerCounts(NetworkStream tcpStream, int messageLength, CancellationToken cancellationToken) {
 		var messageBuffer = ArrayPool<byte>.Shared.Rent(messageLength);
 		try {
-			await tcpStream.ReadExactlyAsync(messageBuffer, offset: 0, messageLength, cancellationToken);
-			return ReadPlayerCountsFromResponse(messageBuffer.AsSpan(start: 0, messageLength));
+			await tcpStream.ReadExactlyAsync(messageBuffer, 0, messageLength, cancellationToken);
+			return ReadPlayerCountsFromResponse(messageBuffer.AsSpan(0, messageLength));
 		} finally {
 			ArrayPool<byte>.Shared.Return(messageBuffer);
 		}
@@ -54,7 +54,7 @@ public static class ServerStatusProtocol {
 	/// <summary>
 	/// Legacy query protocol uses the paragraph symbol (§) as separator encoded in UTF-16BE.
 	/// </summary>
-	private static readonly byte[] Separator = [0x00, 0xA7];
+	private static readonly byte[] Separator = { 0x00, 0xA7 };
 	
 	private static InstancePlayerCounts ReadPlayerCountsFromResponse(ReadOnlySpan<byte> messageBuffer) {
 		int lastSeparator = messageBuffer.LastIndexOf(Separator);
--- a/Agent/Phantom.Agent.Services/AgentRegistrationHandler.cs
+++ b/Agent/Phantom.Agent.Services/AgentRegistrationHandler.cs
@@ -1,85 +0,0 @@
-using System.Collections.Immutable;
-using Phantom.Agent.Services.Instances;
-using Phantom.Common.Data.Replies;
-using Phantom.Common.Messages.Agent.ToAgent;
-using Phantom.Utils.Logging;
-using Phantom.Utils.Tasks;
-using Phantom.Utils.Threading;
-using Serilog;
-
-namespace Phantom.Agent.Services;
-
-public sealed class AgentRegistrationHandler {
-	private readonly ILogger logger = PhantomLogger.Create<AgentRegistrationHandler>();
-	
-	private readonly ManualResetEventSlim newSessionEvent = new ();
-	private ImmutableArray<ConfigureInstanceMessage> lastConfigureInstanceMessages;
-	
-	internal void OnRegistrationComplete(ImmutableArray<ConfigureInstanceMessage> configureInstanceMessages) {
-		ImmutableInterlocked.InterlockedExchange(ref lastConfigureInstanceMessages, configureInstanceMessages);
-	}
-	
-	internal void OnNewSession() {
-		newSessionEvent.Set();
-	}
-	
-	public async Task<bool> Start(AgentServices agentServices, CancellationToken cancellationToken) {
-		var configureInstanceMessages = ImmutableInterlocked.InterlockedExchange(ref lastConfigureInstanceMessages, value: default);
-		if (configureInstanceMessages.IsDefault) {
-			logger.Fatal("Handshake failed.");
-			return false;
-		}
-		
-		foreach (var configureInstanceMessage in configureInstanceMessages) {
-			var configureInstanceResult = await agentServices.InstanceManager.Request(GetCommand(configureInstanceMessage), cancellationToken);
-			if (!configureInstanceResult.Is(ConfigureInstanceResult.Success)) {
-				logger.Fatal("Unable to configure instance \"{Name}\" (GUID {Guid}), shutting down.", configureInstanceMessage.Configuration.InstanceName, configureInstanceMessage.InstanceGuid);
-				return false;
-			}
-		}
-		
-		agentServices.InstanceTicketManager.RefreshAgentStatus();
-		
-		_ = HandleNewSessionRegistrations(agentServices, cancellationToken);
-		return true;
-	}
-	
-	private async Task HandleNewSessionRegistrations(AgentServices agentServices, CancellationToken cancellationToken) {
-		while (cancellationToken.Check()) {
-			await newSessionEvent.WaitHandle.WaitOneAsync(cancellationToken);
-			newSessionEvent.Reset();
-			
-			try {
-				await HandleNewSessionRegistration(agentServices, cancellationToken);
-			} catch (Exception e) {
-				logger.Error(e, "Could not configure instances after re-registration.");
-			}
-		}
-	}
-	
-	private async Task HandleNewSessionRegistration(AgentServices agentServices, CancellationToken cancellationToken) {
-		var configureInstanceMessages = ImmutableInterlocked.InterlockedExchange(ref lastConfigureInstanceMessages, value: default);
-		if (configureInstanceMessages.IsDefaultOrEmpty) {
-			return;
-		}
-		
-		foreach (var configureInstanceMessage in configureInstanceMessages) {
-			var configureInstanceResult = await agentServices.InstanceManager.Request(GetCommand(configureInstanceMessage), cancellationToken);
-			if (!configureInstanceResult.Is(ConfigureInstanceResult.Success)) {
-				logger.Error("Unable to configure instance \"{Name}\" (GUID {Guid}).", configureInstanceMessage.Configuration.InstanceName, configureInstanceMessage.InstanceGuid);
-			}
-		}
-		
-		agentServices.InstanceTicketManager.RefreshAgentStatus();
-	}
-	
-	private static InstanceManagerActor.ConfigureInstanceCommand GetCommand(ConfigureInstanceMessage configureInstanceMessage) {
-		return new InstanceManagerActor.ConfigureInstanceCommand(
-			configureInstanceMessage.InstanceGuid,
-			configureInstanceMessage.Configuration,
-			configureInstanceMessage.LaunchProperties,
-			configureInstanceMessage.LaunchNow,
-			AlwaysReportStatus: true
-		);
-	}
-}
--- a/Agent/Phantom.Agent.Services/AgentServices.cs
+++ b/Agent/Phantom.Agent.Services/AgentServices.cs
@@ -1,9 +1,12 @@
-using Akka.Actor;
+using System.Collections.Immutable;
+using Akka.Actor;
 using Phantom.Agent.Minecraft.Java;
 using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Instances;
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Agent;
+using Phantom.Common.Data.Replies;
+using Phantom.Common.Messages.Agent.ToAgent;
 using Phantom.Utils.Actor;
 using Phantom.Utils.Logging;
 using Serilog;
@@ -35,6 +38,33 @@ public sealed class AgentServices {
 		this.InstanceManager = ActorSystem.ActorOf(InstanceManagerActor.Factory(instanceManagerInit), "InstanceManager");
 	}
 	
+	public async Task<bool> Register(ControllerHandshake handshake, CancellationToken cancellationToken) {
+		ImmutableArray<ConfigureInstanceMessage> configureInstanceMessages = handshake.Response;
+		if (configureInstanceMessages.IsDefault) {
+			Logger.Fatal("Handshake failed.");
+			return false;
+		}
+		
+		foreach (var configureInstanceMessage in configureInstanceMessages) {
+			var configureInstanceCommand = new InstanceManagerActor.ConfigureInstanceCommand(
+				configureInstanceMessage.InstanceGuid,
+				configureInstanceMessage.Configuration,
+				configureInstanceMessage.LaunchProperties,
+				configureInstanceMessage.LaunchNow,
+				AlwaysReportStatus: true
+			);
+			
+			var configureInstanceResult = await InstanceManager.Request(configureInstanceCommand, cancellationToken);
+			if (!configureInstanceResult.Is(ConfigureInstanceResult.Success)) {
+				Logger.Fatal("Unable to configure instance \"{Name}\" (GUID {Guid}), shutting down.", configureInstanceMessage.Configuration.InstanceName, configureInstanceMessage.InstanceGuid);
+				return false;
+			}
+		}
+		
+		InstanceTicketManager.RefreshAgentStatus();
+		return true;
+	}
+	
 	public async Task Shutdown() {
 		Logger.Information("Stopping services...");
 		
--- a/Agent/Phantom.Agent.Services/Backups/BackupArchiver.cs
+++ b/Agent/Phantom.Agent.Services/Backups/BackupArchiver.cs
@@ -108,7 +108,7 @@ sealed class BackupArchiver {
 	
 	private async Task<bool> CreateTarArchive(string sourceFolderPath, string backupFilePath) {
 		try {
-			await TarFile.CreateFromDirectoryAsync(sourceFolderPath, backupFilePath, includeBaseDirectory: false, cancellationToken);
+			await TarFile.CreateFromDirectoryAsync(sourceFolderPath, backupFilePath, false, cancellationToken);
 			return true;
 		} catch (Exception e) {
 			logger.Error(e, "Could not create archive.");
@@ -135,7 +135,7 @@ sealed class BackupArchiver {
 		foreach (FileInfo file in sourceFolder.EnumerateFiles()) {
 			var filePath = relativePath.Add(file.Name);
 			if (IsFileSkipped(filePath)) {
-				logger.Debug("Skipping file: {File}", string.Join(separator: '/', filePath));
+				logger.Debug("Skipping file: {File}", string.Join('/', filePath));
 				continue;
 			}
 			
@@ -150,7 +150,7 @@ sealed class BackupArchiver {
 		foreach (DirectoryInfo directory in sourceFolder.EnumerateDirectories()) {
 			var folderPath = relativePath.Add(directory.Name);
 			if (IsFolderSkipped(folderPath)) {
-				logger.Debug("Skipping folder: {Folder}", string.Join(separator: '/', folderPath));
+				logger.Debug("Skipping folder: {Folder}", string.Join('/', folderPath));
 				continue;
 			}
 			
@@ -172,7 +172,7 @@ sealed class BackupArchiver {
 				}
 				else {
 					logger.Warning("Failed copying file {File}, retrying...", sourceFile.FullName);
-					await Task.Delay(millisecondsDelay: 200, cancellationToken);
+					await Task.Delay(200, cancellationToken);
 				}
 			}
 		}
--- a/Agent/Phantom.Agent.Services/Backups/BackupCompressor.cs
+++ b/Agent/Phantom.Agent.Services/Backups/BackupCompressor.cs
@@ -50,8 +50,8 @@ static class BackupCompressor {
 				"--rm",
 				"--no-progress",
 				"-o", destinationFilePath,
-				"--", sourceFilePath,
-			},
+				"--", sourceFilePath
+			}
 		};
 		
 		static void OnZstdOutput(object? sender, Process.Output output) {
--- a/Agent/Phantom.Agent.Services/Backups/BackupManager.cs
+++ b/Agent/Phantom.Agent.Services/Backups/BackupManager.cs
@@ -133,7 +133,7 @@ sealed class BackupManager : IDisposable {
 				BackupCreationResultKind.CouldNotCreateBackupFolder         => "Could not create backup folder.",
 				BackupCreationResultKind.CouldNotCopyWorldToTemporaryFolder => "Could not copy world to temporary folder.",
 				BackupCreationResultKind.CouldNotCreateWorldArchive         => "Could not create world archive.",
-				_                                                           => "Unknown error.",
+				_                                                           => "Unknown error."
 			};
 		}
 	}
--- a/Agent/Phantom.Agent.Services/Backups/BackupScheduler.cs
+++ b/Agent/Phantom.Agent.Services/Backups/BackupScheduler.cs
@@ -14,7 +14,7 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 	
 	private readonly BackupManager backupManager;
 	private readonly InstanceContext context;
-	private readonly SemaphoreSlim backupSemaphore = new (initialCount: 1, maxCount: 1);
+	private readonly SemaphoreSlim backupSemaphore = new (1, 1);
 	private readonly ManualResetEventSlim serverOutputWhileWaitingForOnlinePlayers = new ();
 	private readonly InstancePlayerCountTracker playerCountTracker;
 	
--- a/Agent/Phantom.Agent.Services/Instances/InstanceManagerActor.cs
+++ b/Agent/Phantom.Agent.Services/Instances/InstanceManagerActor.cs
@@ -58,7 +58,7 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 	
 	private sealed record InstanceInfo(ActorRef<InstanceActor.ICommand> Actor, InstanceConfiguration Configuration, IServerLauncher Launcher);
 	
-	public interface ICommand;
+	public interface ICommand {}
 	
 	public sealed record ConfigureInstanceCommand(Guid InstanceGuid, InstanceConfiguration Configuration, InstanceLaunchProperties LaunchProperties, bool LaunchNow, bool AlwaysReportStatus) : ICommand, ICanReply<Result<ConfigureInstanceResult, InstanceActionFailure>>;
 	
@@ -97,13 +97,13 @@ sealed class InstanceManagerActor : ReceiveActor<InstanceManagerActor.ICommand>
 		IServerLauncher launcher = configuration.MinecraftServerKind switch {
 			MinecraftServerKind.Vanilla => new VanillaLauncher(properties),
 			MinecraftServerKind.Fabric  => new FabricLauncher(properties),
-			_                           => InvalidLauncher.Instance,
+			_                           => InvalidLauncher.Instance
 		};
 		
 		if (instances.TryGetValue(instanceGuid, out var instance)) {
 			instances[instanceGuid] = instance with {
 				Configuration = configuration,
-				Launcher = launcher,
+				Launcher = launcher
 			};
 			
 			Logger.Information("Reconfigured instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, instanceGuid);
--- a/Agent/Phantom.Agent.Services/Instances/State/InstanceLaunchProcedure.cs
+++ b/Agent/Phantom.Agent.Services/Instances/State/InstanceLaunchProcedure.cs
@@ -46,7 +46,7 @@ static class InstanceLaunchProcedure {
 		byte lastDownloadProgress = byte.MaxValue;
 		
 		void OnDownloadProgress(object? sender, DownloadProgressEventArgs args) {
-			byte progress = (byte) Math.Min(args.DownloadedBytes * 100 / args.TotalBytes, val2: 100);
+			byte progress = (byte) Math.Min(args.DownloadedBytes * 100 / args.TotalBytes, 100);
 			
 			if (lastDownloadProgress != progress) {
 				lastDownloadProgress = progress;
--- a/Agent/Phantom.Agent.Services/Instances/State/InstancePlayerCountTracker.cs
+++ b/Agent/Phantom.Agent.Services/Instances/State/InstancePlayerCountTracker.cs
@@ -1,5 +1,4 @@
-using System.Net.Sockets;
-using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Instance;
 using Phantom.Agent.Minecraft.Server;
 using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Instance;
@@ -19,8 +18,6 @@ sealed class InstancePlayerCountTracker : CancellableBackgroundTask {
 	private readonly TaskCompletionSource firstDetection = AsyncTasks.CreateCompletionSource();
 	private readonly ManualResetEventSlim serverOutputEvent = new ();
 	
-	private bool WaitingForFirstDetection => !firstDetection.Task.IsCompleted;
-	
 	private InstancePlayerCounts? playerCounts;
 	private event EventHandler<int?>? OnlinePlayerCountChanged;
 	
@@ -36,40 +33,33 @@ sealed class InstancePlayerCountTracker : CancellableBackgroundTask {
 	
 	protected override async Task RunTask() {
 		// Give the server time to start accepting connections.
-		await Task.Delay(TimeSpan.FromSeconds(5), CancellationToken);
+		await Task.Delay(TimeSpan.FromSeconds(10), CancellationToken);
 		
 		serverOutputEvent.Set();
 		process.AddOutputListener(OnOutput, maxLinesToReadFromHistory: 0);
 		
-		while (CancellationToken.Check()) {
+		while (!CancellationToken.IsCancellationRequested) {
 			serverOutputEvent.Reset();
 			
-			InstancePlayerCounts? latestPlayerCounts = await TryGetPlayerCounts();
-			UpdatePlayerCounts(latestPlayerCounts);
+			await UpdatePlayerCounts(await TryGetPlayerCounts());
 			
-			if (latestPlayerCounts == null) {
-				await Task.Delay(WaitingForFirstDetection ? TimeSpan.FromSeconds(5) : TimeSpan.FromSeconds(10), CancellationToken);
-			}
-			else {
-				await Task.Delay(TimeSpan.FromSeconds(10), CancellationToken);
-				await serverOutputEvent.WaitHandle.WaitOneAsync(CancellationToken);
-				await Task.Delay(TimeSpan.FromSeconds(1), CancellationToken);
+			if (!firstDetection.Task.IsCompleted) {
+				firstDetection.SetResult();
 			}
+			
+			await Task.Delay(TimeSpan.FromSeconds(10), CancellationToken);
+			await serverOutputEvent.WaitHandle.WaitOneAsync(CancellationToken);
+			await Task.Delay(TimeSpan.FromSeconds(1), CancellationToken);
 		}
 	}
 	
 	private async Task<InstancePlayerCounts?> TryGetPlayerCounts() {
 		try {
-			return await ServerStatusProtocol.GetPlayerCounts(serverPort, CancellationToken);
+			var result = await ServerStatusProtocol.GetPlayerCounts(serverPort, CancellationToken);
+			Logger.Debug("Detected {OnlinePlayerCount} / {MaximumPlayerCount} online player(s).", result.Online, result.Maximum);
+			return result;
 		} catch (ServerStatusProtocol.ProtocolException e) {
 			Logger.Error("{Message}", e.Message);
-			return null;
-		} catch (SocketException e) {
-			bool waitingForServerStart = e.SocketErrorCode == SocketError.ConnectionRefused && WaitingForFirstDetection;
-			if (!waitingForServerStart) {
-				Logger.Warning("Could not check online player count. Socket error {ErrorCode} ({ErrorCodeName}), reason: {ErrorMessage}", e.ErrorCode, e.SocketErrorCode, e.Message);
-			}
-			
 			return null;
 		} catch (Exception e) {
 			Logger.Error(e, "Caught exception while checking online player count.");
@@ -77,27 +67,19 @@ sealed class InstancePlayerCountTracker : CancellableBackgroundTask {
 		}
 	}
 	
-	private void UpdatePlayerCounts(InstancePlayerCounts? newPlayerCounts) {
-		if (newPlayerCounts is {} value) {
-			Logger.Debug("Detected {OnlinePlayerCount} / {MaximumPlayerCount} online player(s).", value.Online, value.Maximum);
-			firstDetection.TrySetResult();
-		}
-		
+	private async Task UpdatePlayerCounts(InstancePlayerCounts? value) {
 		EventHandler<int?>? onlinePlayerCountChanged;
 		lock (this) {
-			if (playerCounts == newPlayerCounts) {
+			if (playerCounts == value) {
 				return;
 			}
 			
-			playerCounts = newPlayerCounts;
+			playerCounts = value;
 			onlinePlayerCountChanged = OnlinePlayerCountChanged;
 		}
 		
-		onlinePlayerCountChanged?.Invoke(this, newPlayerCounts?.Online);
-		
-		if (!controllerConnection.TrySend(new ReportInstancePlayerCountsMessage(instanceGuid, newPlayerCounts))) {
-			Logger.Warning("Could not report online player count to Controller.");
-		}
+		onlinePlayerCountChanged?.Invoke(this, value?.Online);
+		await controllerConnection.Send(new ReportInstancePlayerCountsMessage(instanceGuid, value), CancellationToken);
 	}
 	
 	public async Task WaitForOnlinePlayers(CancellationToken cancellationToken) {
--- a/Agent/Phantom.Agent.Services/Instances/State/InstanceStopProcedure.cs
+++ b/Agent/Phantom.Agent.Services/Instances/State/InstanceStopProcedure.cs
@@ -7,7 +7,7 @@ using Phantom.Common.Data.Minecraft;
 namespace Phantom.Agent.Services.Instances.State;

 static class InstanceStopProcedure {
-	private static readonly ushort[] Stops = [60, 30, 10, 5, 4, 3, 2, 1, 0];
+	private static readonly ushort[] Stops = { 60, 30, 10, 5, 4, 3, 2, 1, 0 };
 	
 	public static async Task<bool> Run(InstanceContext context, MinecraftStopStrategy stopStrategy, InstanceRunningState runningState, Action<IInstanceStatus> reportStatus, CancellationToken cancellationToken) {
 		var process = runningState.Process;
--- a/Agent/Phantom.Agent.Services/Rpc/ControllerHandshake.cs
+++ b/Agent/Phantom.Agent.Services/Rpc/ControllerHandshake.cs
@@ -2,32 +2,46 @@
 using Phantom.Common.Messages.Agent.Handshake;
 using Phantom.Common.Messages.Agent.ToAgent;
 using Phantom.Utils.Logging;
-using Phantom.Utils.Rpc.Message;
 using Phantom.Utils.Rpc.Runtime;
 using Phantom.Utils.Rpc.Runtime.Client;
 using Serilog;

 namespace Phantom.Agent.Services.Rpc;

-public sealed class ControllerHandshake(AgentRegistration registration, AgentRegistrationHandler registrationHandler) : IRpcClientHandshake {
+public sealed class ControllerHandshake(AgentRegistration registration) : IRpcClientHandshake {
 	private const int MaxInstances = 100_000;
 	private const int MaxMessageBytes = 1024 * 1024 * 8;
 	
 	private readonly ILogger logger = PhantomLogger.Create<ControllerHandshake>();
 	
-	public async Task Perform(RpcStream stream, CancellationToken cancellationToken) {
+	private readonly Lock responseLock = new ();
+	private ImmutableArray<ConfigureInstanceMessage> response;
+	
+	internal ImmutableArray<ConfigureInstanceMessage> Response {
+		get {
+			lock (responseLock) {
+				return response;
+			}
+		}
+		private set {
+			lock (responseLock) {
+				response = value;
+			}
+		}
+	}
+	
+	public async Task Perform(Stream stream, CancellationToken cancellationToken) {
 		logger.Information("Registering with the controller...");
 		
-		ReadOnlyMemory<byte> serializedRegistration = MessageSerialization.Serialize(registration);
-		await stream.WriteSignedInt(serializedRegistration.Length, cancellationToken);
-		await stream.WriteBytes(serializedRegistration, cancellationToken);
-		await stream.Flush(cancellationToken);
+		ReadOnlyMemory<byte> serializedRegistration = RpcSerialization.Serialize(registration);
+		await RpcSerialization.WriteSignedInt(serializedRegistration.Length, stream, cancellationToken);
+		await stream.WriteAsync(serializedRegistration, cancellationToken);
 		
-		if (await stream.ReadByte(cancellationToken) == 0) {
+		if (await RpcSerialization.ReadByte(stream, cancellationToken) == 0) {
 			return;
 		}
 		
-		uint configureInstanceMessageCount = await stream.ReadUnsignedInt(cancellationToken);
+		uint configureInstanceMessageCount = await RpcSerialization.ReadUnsignedInt(stream, cancellationToken);
 		if (configureInstanceMessageCount > MaxInstances) {
 			throw new InvalidOperationException("Trying to configure too many instances (" + configureInstanceMessageCount + " > " + MaxInstances + ").");
 		}
@@ -35,16 +49,17 @@ public sealed class ControllerHandshake(AgentRegistration registration, AgentReg
 		var configureInstanceMessages = ImmutableArray.CreateBuilder<ConfigureInstanceMessage>();
 		
 		for (int index = 0; index < configureInstanceMessageCount; index++) {
-			int serializedMessageLength = await stream.ReadSignedInt(cancellationToken);
+			int serializedMessageLength = await RpcSerialization.ReadSignedInt(stream, cancellationToken);
 			if (serializedMessageLength is < 0 or > MaxMessageBytes) {
 				throw new InvalidOperationException("Message must be between 0 and " + MaxMessageBytes + " bytes.");
 			}
 			
-			var serializedMessage = await stream.ReadBytes(serializedMessageLength, cancellationToken);
-			configureInstanceMessages.Add(MessageSerialization.Deserialize<ConfigureInstanceMessage>(serializedMessage));
+			var serializedMessage = await RpcSerialization.ReadBytes(serializedMessageLength, stream, cancellationToken);
+			configureInstanceMessages.Add(RpcSerialization.Deserialize<ConfigureInstanceMessage>(serializedMessage));
 		}
 		
-		registrationHandler.OnRegistrationComplete(configureInstanceMessages.ToImmutable());
+		// TODO handle response, only if new session
+		Response = configureInstanceMessages.ToImmutable();
 		logger.Information("Registration complete.");
 	}
 }
--- a/Agent/Phantom.Agent.Services/Rpc/ControllerMessageReceiver.cs
+++ b/Agent/Phantom.Agent.Services/Rpc/ControllerMessageReceiver.cs
@@ -1,11 +0,0 @@
-using Phantom.Common.Messages.Agent;
-using Phantom.Utils.Actor;
-using Phantom.Utils.Rpc.Message;
-
-namespace Phantom.Agent.Services.Rpc;
-
-public sealed class ControllerMessageReceiver(ActorRef<IMessageToAgent> actor, AgentRegistrationHandler agentRegistrationHandler) : IMessageReceiver<IMessageToAgent>.Actor(actor) {
-	public override void OnSessionRestarted() {
-		agentRegistrationHandler.OnNewSession();
-	}
-}
--- a/Agent/Phantom.Agent/GuidFile.cs
+++ b/Agent/Phantom.Agent/GuidFile.cs
@@ -37,7 +37,7 @@ static class GuidFile {
 	}
 	
 	private static async Task<Guid> LoadGuidFromFile(string filePath) {
-		Files.RequireMaximumFileSize(filePath, maximumBytes: 128);
+		Files.RequireMaximumFileSize(filePath, 128);
 		string contents = await File.ReadAllTextAsync(filePath, Encoding.ASCII);
 		return Guid.Parse(contents.Trim());
 	}
--- a/Agent/Phantom.Agent/Program.cs
+++ b/Agent/Phantom.Agent/Program.cs
@@ -6,8 +6,11 @@ using Phantom.Agent.Services.Rpc;
 using Phantom.Common.Data.Agent;
 using Phantom.Common.Messages.Agent;
 using Phantom.Common.Messages.Agent.Handshake;
+using Phantom.Common.Messages.Agent.ToController;
 using Phantom.Utils.Actor;
 using Phantom.Utils.Logging;
+using Phantom.Utils.Rpc.Message;
+using Phantom.Utils.Rpc.Runtime;
 using Phantom.Utils.Rpc.Runtime.Client;
 using Phantom.Utils.Runtime;
 using Phantom.Utils.Threading;
@@ -49,9 +52,7 @@ try {
 	
 	var agentInfo = new AgentInfo(agentGuid.Value, agentName, ProtocolVersion, fullVersion, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts);
 	var javaRuntimeRepository = await JavaRuntimeDiscovery.Scan(folders.JavaSearchFolderPath, shutdownCancellationToken);
-	
-	var agentRegistrationHandler = new AgentRegistrationHandler();
-	var controllerHandshake = new ControllerHandshake(new AgentRegistration(agentInfo, javaRuntimeRepository.All), agentRegistrationHandler);
+	var controllerHandshake = new ControllerHandshake(new AgentRegistration(agentInfo, javaRuntimeRepository.All));
 	
 	var rpcClientConnectionParameters = new RpcClientConnectionParameters(
 		Host: controllerHost,
@@ -60,17 +61,21 @@ try {
 		CertificateThumbprint: agentKey.Value.CertificateThumbprint,
 		AuthToken: agentKey.Value.AuthToken,
 		Handshake: controllerHandshake,
-		MessageQueueCapacity: 250,
-		FrameQueueCapacity: 500,
-		MaxConcurrentlyHandledMessages: 50
+		CommonParameters: new RpcCommonConnectionParameters(
+			MessageQueueCapacity: 250,
+			FrameQueueCapacity: 500,
+			MaxConcurrentlyHandledMessages: 50,
+			PingInterval: TimeSpan.FromSeconds(10)
+		)
 	);
 	
-	using var rpcClient = await RpcClient<IMessageToController, IMessageToAgent>.Connect("Controller", rpcClientConnectionParameters, AgentMessageRegistries.Registries, shutdownCancellationToken);
+	using var rpcClient = await RpcClient<IMessageToController, IMessageToAgent>.Connect("Controller", rpcClientConnectionParameters, AgentMessageRegistries.Definitions, shutdownCancellationToken);
 	if (rpcClient == null) {
 		PhantomLogger.Root.Fatal("Could not connect to Phantom Controller, shutting down.");
 		return 1;
 	}
 	
+	Task? rpcClientListener = null;
 	try {
 		PhantomLogger.Root.InformationHeading("Launching Phantom Panel agent...");
 		
@@ -79,16 +84,30 @@ try {
 		var rpcMessageHandlerInit = new ControllerMessageHandlerActor.Init(agentServices);
 		var rpcMessageHandlerActor = agentServices.ActorSystem.ActorOf(ControllerMessageHandlerActor.Factory(rpcMessageHandlerInit), "ControllerMessageHandler");
 		
-		rpcClient.StartListening(new ControllerMessageReceiver(rpcMessageHandlerActor, agentRegistrationHandler));
+		rpcClientListener = rpcClient.Listen(new IMessageReceiver<IMessageToAgent>.Actor(rpcMessageHandlerActor));
 		
-		if (await agentRegistrationHandler.Start(agentServices, shutdownCancellationToken)) {
+		if (await agentServices.Register(controllerHandshake, shutdownCancellationToken)) {
 			PhantomLogger.Root.Information("Phantom Panel agent is ready.");
 			await shutdownCancellationToken.WaitHandle.WaitOneAsync();
 		}
 		
 		await agentServices.Shutdown();
 	} finally {
-		await rpcClient.Shutdown();
+		PhantomLogger.Root.Information("Unregistering agent...");
+		try {
+			using var unregisterCancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(10));
+			await rpcClient.MessageSender.Send(new UnregisterAgentMessage(), unregisterCancellationTokenSource.Token);
+		} catch (OperationCanceledException) {
+			PhantomLogger.Root.Warning("Could not unregister agent after shutdown.");
+		} catch (Exception e) {
+			PhantomLogger.Root.Warning(e, "Could not unregister agent during shutdown.");
+		} finally {
+			await rpcClient.Shutdown();
+			
+			if (rpcClientListener != null) {
+				await rpcClientListener;
+			}
+		}
 	}
 	
 	return 0;
--- a/Common/Phantom.Common.Data.Tests/RamAllocationUnitsTests.cs
+++ b/Common/Phantom.Common.Data.Tests/RamAllocationUnitsTests.cs
@@ -67,22 +67,22 @@ public sealed class RamAllocationUnitsTests {
 			Assert.That(CallFromString("123A5M"), Throws.Exception.TypeOf<ArgumentOutOfRangeException>().With.Message.StartsWith("Must begin with a number."));
 		}
 		
-		[TestCase("0m", arg2: 0)]
-		[TestCase("256m", arg2: 256)]
-		[TestCase("256M", arg2: 256)]
-		[TestCase("512M", arg2: 512)]
-		[TestCase("65536M", arg2: 65536)]
+		[TestCase("0m", 0)]
+		[TestCase("256m", 256)]
+		[TestCase("256M", 256)]
+		[TestCase("512M", 512)]
+		[TestCase("65536M", 65536)]
 		[TestCase("16776960M", 16777216 - 256)]
 		public void ValidDefinitionInMegabytesIsParsedCorrectly(string definition, int megabytes) {
 			Assert.That(RamAllocationUnits.FromString(definition).InMegabytes, Is.EqualTo(megabytes));
 		}
 		
-		[TestCase("0g", arg2: 0)]
-		[TestCase("1g", arg2: 1024)]
-		[TestCase("1G", arg2: 1024)]
-		[TestCase("8G", arg2: 8192)]
-		[TestCase("64G", arg2: 65536)]
-		[TestCase("16383G", arg2: 16776192)]
+		[TestCase("0g", 0)]
+		[TestCase("1g", 1024)]
+		[TestCase("1G", 1024)]
+		[TestCase("8G", 8192)]
+		[TestCase("64G", 65536)]
+		[TestCase("16383G", 16776192)]
 		public void ValidDefinitionInGigabytesIsParsedCorrectly(string definition, int megabytes) {
 			Assert.That(RamAllocationUnits.FromString(definition).InMegabytes, Is.EqualTo(megabytes));
 		}
--- a/Common/Phantom.Common.Data.Web/Agent/IAgentConnectionStatus.cs
+++ b/Common/Phantom.Common.Data.Web/Agent/IAgentConnectionStatus.cs
@@ -3,10 +3,10 @@
 namespace Phantom.Common.Data.Web.Agent;

 [MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(AgentIsOffline))]
-[MemoryPackUnion(tag: 1, typeof(AgentIsDisconnected))]
-[MemoryPackUnion(tag: 2, typeof(AgentIsOnline))]
-public partial interface IAgentConnectionStatus;
+[MemoryPackUnion(0, typeof(AgentIsOffline))]
+[MemoryPackUnion(1, typeof(AgentIsDisconnected))]
+[MemoryPackUnion(2, typeof(AgentIsOnline))]
+public partial interface IAgentConnectionStatus {}

 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record AgentIsOffline : IAgentConnectionStatus;
--- a/Common/Phantom.Common.Data.Web/AuditLog/AuditLogEventType.cs
+++ b/Common/Phantom.Common.Data.Web/AuditLog/AuditLogEventType.cs
@@ -13,7 +13,7 @@ public enum AuditLogEventType {
 	InstanceEdited,
 	InstanceLaunched,
 	InstanceStopped,
-	InstanceCommandExecuted,
+	InstanceCommandExecuted
 }

 public static class AuditLogEventTypeExtensions {
@@ -30,7 +30,7 @@ public static class AuditLogEventTypeExtensions {
 		{ AuditLogEventType.InstanceEdited,            AuditLogSubjectType.Instance },
 		{ AuditLogEventType.InstanceLaunched,          AuditLogSubjectType.Instance },
 		{ AuditLogEventType.InstanceStopped,           AuditLogSubjectType.Instance },
-		{ AuditLogEventType.InstanceCommandExecuted,   AuditLogSubjectType.Instance },
+		{ AuditLogEventType.InstanceCommandExecuted,   AuditLogSubjectType.Instance }
 	};
 	
 	static AuditLogEventTypeExtensions() {
--- a/Common/Phantom.Common.Data.Web/AuditLog/AuditLogSubjectType.cs
+++ b/Common/Phantom.Common.Data.Web/AuditLog/AuditLogSubjectType.cs
@@ -2,5 +2,5 @@

 public enum AuditLogSubjectType {
 	User,
-	Instance,
+	Instance
 }
--- a/Common/Phantom.Common.Data.Web/EventLog/EventLogEventType.cs
+++ b/Common/Phantom.Common.Data.Web/EventLog/EventLogEventType.cs
@@ -7,7 +7,7 @@ public enum EventLogEventType {
 	InstanceStopped,
 	InstanceBackupSucceeded,
 	InstanceBackupSucceededWithWarnings,
-	InstanceBackupFailed,
+	InstanceBackupFailed
 }

 public static class EventLogEventTypeExtensions {
@@ -18,7 +18,7 @@ public static class EventLogEventTypeExtensions {
 		{ EventLogEventType.InstanceStopped, EventLogSubjectType.Instance },
 		{ EventLogEventType.InstanceBackupSucceeded, EventLogSubjectType.Instance },
 		{ EventLogEventType.InstanceBackupSucceededWithWarnings, EventLogSubjectType.Instance },
-		{ EventLogEventType.InstanceBackupFailed, EventLogSubjectType.Instance },
+		{ EventLogEventType.InstanceBackupFailed, EventLogSubjectType.Instance }
 	};
 	
 	static EventLogEventTypeExtensions() {
--- a/Common/Phantom.Common.Data.Web/EventLog/EventLogSubjectType.cs
+++ b/Common/Phantom.Common.Data.Web/EventLog/EventLogSubjectType.cs
@@ -1,5 +1,5 @@
 namespace Phantom.Common.Data.Web.EventLog;

 public enum EventLogSubjectType {
-	Instance,
+	Instance
 }
--- a/Common/Phantom.Common.Data.Web/Instance/CreateOrUpdateInstanceResult.cs
+++ b/Common/Phantom.Common.Data.Web/Instance/CreateOrUpdateInstanceResult.cs
@@ -6,7 +6,7 @@ public enum CreateOrUpdateInstanceResult : byte {
 	InstanceNameMustNotBeEmpty,
 	InstanceMemoryMustNotBeZero,
 	MinecraftVersionDownloadInfoNotFound,
-	AgentNotFound,
+	AgentNotFound
 }

 public static class CreateOrUpdateInstanceResultExtensions {
@@ -17,7 +17,7 @@ public static class CreateOrUpdateInstanceResultExtensions {
 			CreateOrUpdateInstanceResult.InstanceMemoryMustNotBeZero          => "Memory must not be 0 MB.",
 			CreateOrUpdateInstanceResult.MinecraftVersionDownloadInfoNotFound => "Could not find download information for the selected Minecraft version.",
 			CreateOrUpdateInstanceResult.AgentNotFound                        => "Agent not found.",
-			_                                                                 => "Unknown error.",
+			_                                                                 => "Unknown error."
 		};
 	}
 }
--- a/Common/Phantom.Common.Data.Web/Minecraft/JvmArgumentsHelper.cs
+++ b/Common/Phantom.Common.Data.Web/Minecraft/JvmArgumentsHelper.cs
@@ -4,11 +4,11 @@ namespace Phantom.Common.Data.Web.Minecraft;

 public static class JvmArgumentsHelper {
 	public static ImmutableArray<string> Split(string arguments) {
-		return [..arguments.Split(separator: '\n', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)];
+		return arguments.Split('\n', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries).ToImmutableArray();
 	}
 	
 	public static string Join(ImmutableArray<string> arguments) {
-		return string.Join(separator: '\n', arguments);
+		return string.Join('\n', arguments);
 	}
 	
 	public static ValidationError? Validate(string arguments) {
@@ -35,6 +35,6 @@ public static class JvmArgumentsHelper {
 	public enum ValidationError {
 		InvalidFormat,
 		XmxNotAllowed,
-		XmsNotAllowed,
+		XmsNotAllowed
 	}
 }
--- a/Common/Phantom.Common.Data.Web/Users/AddRoleError.cs
+++ b/Common/Phantom.Common.Data.Web/Users/AddRoleError.cs
@@ -4,5 +4,5 @@ public enum AddRoleError : byte {
 	NameIsEmpty,
 	NameIsTooLong,
 	NameAlreadyExists,
-	UnknownError,
+	UnknownError
 }
--- a/Common/Phantom.Common.Data.Web/Users/AddUserError.cs
+++ b/Common/Phantom.Common.Data.Web/Users/AddUserError.cs
@@ -1,16 +1,19 @@
 using System.Collections.Immutable;
 using MemoryPack;
+using Phantom.Common.Data.Web.Users.AddUserErrors;

-namespace Phantom.Common.Data.Web.Users;
+namespace Phantom.Common.Data.Web.Users {
+	[MemoryPackable]
+	[MemoryPackUnion(0, typeof(NameIsInvalid))]
+	[MemoryPackUnion(1, typeof(PasswordIsInvalid))]
+	[MemoryPackUnion(2, typeof(NameAlreadyExists))]
+	[MemoryPackUnion(3, typeof(UnknownError))]
+	public abstract partial record AddUserError {
+		internal AddUserError() {}
+	}
+}

-[MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(NameIsInvalid))]
-[MemoryPackUnion(tag: 1, typeof(PasswordIsInvalid))]
-[MemoryPackUnion(tag: 2, typeof(NameAlreadyExists))]
-[MemoryPackUnion(tag: 3, typeof(UnknownError))]
-public abstract partial record AddUserError {
-	private AddUserError() {}
-	
+namespace Phantom.Common.Data.Web.Users.AddUserErrors {
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record NameIsInvalid([property: MemoryPackOrder(0)] UsernameRequirementViolation Violation) : AddUserError;
 	
--- a/Common/Phantom.Common.Data.Web/Users/CreateOrUpdateAdministratorUserResult.cs
+++ b/Common/Phantom.Common.Data.Web/Users/CreateOrUpdateAdministratorUserResult.cs
@@ -1,16 +1,19 @@
 using MemoryPack;
+using Phantom.Common.Data.Web.Users.CreateOrUpdateAdministratorUserResults;

-namespace Phantom.Common.Data.Web.Users;
+namespace Phantom.Common.Data.Web.Users {
+	[MemoryPackable]
+	[MemoryPackUnion(0, typeof(Success))]
+	[MemoryPackUnion(1, typeof(CreationFailed))]
+	[MemoryPackUnion(2, typeof(UpdatingFailed))]
+	[MemoryPackUnion(3, typeof(AddingToRoleFailed))]
+	[MemoryPackUnion(4, typeof(UnknownError))]
+	public abstract partial record CreateOrUpdateAdministratorUserResult {
+		internal CreateOrUpdateAdministratorUserResult() {}
+	}
+}

-[MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(Success))]
-[MemoryPackUnion(tag: 1, typeof(CreationFailed))]
-[MemoryPackUnion(tag: 2, typeof(UpdatingFailed))]
-[MemoryPackUnion(tag: 3, typeof(AddingToRoleFailed))]
-[MemoryPackUnion(tag: 4, typeof(UnknownError))]
-public abstract partial record CreateOrUpdateAdministratorUserResult {
-	private CreateOrUpdateAdministratorUserResult() {}
-	
+namespace Phantom.Common.Data.Web.Users.CreateOrUpdateAdministratorUserResults {
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record Success([property: MemoryPackOrder(0)] UserInfo User) : CreateOrUpdateAdministratorUserResult;
 	
--- a/Common/Phantom.Common.Data.Web/Users/CreateUserResult.cs
+++ b/Common/Phantom.Common.Data.Web/Users/CreateUserResult.cs
@@ -1,14 +1,17 @@
 using MemoryPack;
+using Phantom.Common.Data.Web.Users.CreateUserResults;

-namespace Phantom.Common.Data.Web.Users;
+namespace Phantom.Common.Data.Web.Users {
+	[MemoryPackable]
+	[MemoryPackUnion(0, typeof(Success))]
+	[MemoryPackUnion(1, typeof(CreationFailed))]
+	[MemoryPackUnion(2, typeof(UnknownError))]
+	public abstract partial record CreateUserResult {
+		internal CreateUserResult() {}
+	}
+}

-[MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(Success))]
-[MemoryPackUnion(tag: 1, typeof(CreationFailed))]
-[MemoryPackUnion(tag: 2, typeof(UnknownError))]
-public abstract partial record CreateUserResult {
-	private CreateUserResult() {}
-	
+namespace Phantom.Common.Data.Web.Users.CreateUserResults {
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record Success([property: MemoryPackOrder(0)] UserInfo User) : CreateUserResult;
 	
--- a/Common/Phantom.Common.Data.Web/Users/DeleteUserResult.cs
+++ b/Common/Phantom.Common.Data.Web/Users/DeleteUserResult.cs
@@ -3,5 +3,5 @@
 public enum DeleteUserResult : byte {
 	Deleted,
 	NotFound,
-	Failed,
+	Failed
 }
--- a/Common/Phantom.Common.Data.Web/Users/PasswordRequirementViolation.cs
+++ b/Common/Phantom.Common.Data.Web/Users/PasswordRequirementViolation.cs
@@ -1,15 +1,18 @@
 using MemoryPack;
+using Phantom.Common.Data.Web.Users.PasswordRequirementViolations;

-namespace Phantom.Common.Data.Web.Users;
+namespace Phantom.Common.Data.Web.Users {
+	[MemoryPackable]
+	[MemoryPackUnion(0, typeof(TooShort))]
+	[MemoryPackUnion(1, typeof(MustContainLowercaseLetter))]
+	[MemoryPackUnion(2, typeof(MustContainUppercaseLetter))]
+	[MemoryPackUnion(3, typeof(MustContainDigit))]
+	public abstract partial record PasswordRequirementViolation {
+		internal PasswordRequirementViolation() {}
+	}
+}

-[MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(TooShort))]
-[MemoryPackUnion(tag: 1, typeof(MustContainLowercaseLetter))]
-[MemoryPackUnion(tag: 2, typeof(MustContainUppercaseLetter))]
-[MemoryPackUnion(tag: 3, typeof(MustContainDigit))]
-public abstract partial record PasswordRequirementViolation {
-	private PasswordRequirementViolation() {}
-	
+namespace Phantom.Common.Data.Web.Users.PasswordRequirementViolations {
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record TooShort([property: MemoryPackOrder(0)] int MinimumLength) : PasswordRequirementViolation;
 	
--- a/Common/Phantom.Common.Data.Web/Users/Permission.cs
+++ b/Common/Phantom.Common.Data.Web/Users/Permission.cs
@@ -1,7 +1,7 @@
 namespace Phantom.Common.Data.Web.Users;

 public sealed record Permission(string Id, Permission? Parent) {
-	private static readonly List<Permission> AllPermissions = [];
+	private static readonly List<Permission> AllPermissions = new ();
 	public static IEnumerable<Permission> All => AllPermissions;
 	
 	private static Permission Register(string id, Permission? parent = null) {
--- a/Common/Phantom.Common.Data.Web/Users/SetUserPasswordError.cs
+++ b/Common/Phantom.Common.Data.Web/Users/SetUserPasswordError.cs
@@ -1,15 +1,18 @@
 using System.Collections.Immutable;
 using MemoryPack;
+using Phantom.Common.Data.Web.Users.SetUserPasswordErrors;

-namespace Phantom.Common.Data.Web.Users;
+namespace Phantom.Common.Data.Web.Users {
+	[MemoryPackable]
+	[MemoryPackUnion(0, typeof(UserNotFound))]
+	[MemoryPackUnion(1, typeof(PasswordIsInvalid))]
+	[MemoryPackUnion(2, typeof(UnknownError))]
+	public abstract partial record SetUserPasswordError {
+		internal SetUserPasswordError() {}
+	}
+}

-[MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(UserNotFound))]
-[MemoryPackUnion(tag: 1, typeof(PasswordIsInvalid))]
-[MemoryPackUnion(tag: 2, typeof(UnknownError))]
-public abstract partial record SetUserPasswordError {
-	private SetUserPasswordError() {}
-	
+namespace Phantom.Common.Data.Web.Users.SetUserPasswordErrors {
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record UserNotFound : SetUserPasswordError;
 	
--- a/Common/Phantom.Common.Data.Web/Users/UserActionFailure.cs
+++ b/Common/Phantom.Common.Data.Web/Users/UserActionFailure.cs
@@ -1,5 +1,5 @@
 namespace Phantom.Common.Data.Web.Users;

 public enum UserActionFailure {
-	NotAuthorized,
+	NotAuthorized
 }
--- a/Common/Phantom.Common.Data.Web/Users/UserInstanceActionFailure.cs
+++ b/Common/Phantom.Common.Data.Web/Users/UserInstanceActionFailure.cs
@@ -4,22 +4,22 @@ using Phantom.Common.Data.Replies;
 namespace Phantom.Common.Data.Web.Users;

 [MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(User))]
-[MemoryPackUnion(tag: 1, typeof(Instance))]
+[MemoryPackUnion(0, typeof(OfUserActionFailure))]
+[MemoryPackUnion(1, typeof(OfInstanceActionFailure))]
 public abstract partial record UserInstanceActionFailure {
-	private UserInstanceActionFailure() {}
-	
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record User([property: MemoryPackOrder(0)] UserActionFailure Failure) : UserInstanceActionFailure;
-	
-	[MemoryPackable(GenerateType.VersionTolerant)]
-	public sealed partial record Instance([property: MemoryPackOrder(0)] InstanceActionFailure Failure) : UserInstanceActionFailure;
+	internal UserInstanceActionFailure() {}
 	
 	public static implicit operator UserInstanceActionFailure(UserActionFailure failure) {
-		return new User(failure);
+		return new OfUserActionFailure(failure);
 	}
 	
 	public static implicit operator UserInstanceActionFailure(InstanceActionFailure failure) {
-		return new Instance(failure);
+		return new OfInstanceActionFailure(failure);
 	}
 }
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record OfUserActionFailure([property: MemoryPackOrder(0)] UserActionFailure Failure) : UserInstanceActionFailure;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record OfInstanceActionFailure([property: MemoryPackOrder(0)] InstanceActionFailure Failure) : UserInstanceActionFailure;
--- a/Common/Phantom.Common.Data.Web/Users/UsernameRequirementViolation.cs
+++ b/Common/Phantom.Common.Data.Web/Users/UsernameRequirementViolation.cs
@@ -1,13 +1,16 @@
 using MemoryPack;
+using Phantom.Common.Data.Web.Users.UsernameRequirementViolations;

-namespace Phantom.Common.Data.Web.Users;
+namespace Phantom.Common.Data.Web.Users {
+	[MemoryPackable]
+	[MemoryPackUnion(0, typeof(IsEmpty))]
+	[MemoryPackUnion(1, typeof(TooLong))]
+	public abstract partial record UsernameRequirementViolation {
+		internal UsernameRequirementViolation() {}
+	}
+}

-[MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(IsEmpty))]
-[MemoryPackUnion(tag: 1, typeof(TooLong))]
-public abstract partial record UsernameRequirementViolation {
-	private UsernameRequirementViolation() {}
-	
+namespace Phantom.Common.Data.Web.Users.UsernameRequirementViolations {
 	[MemoryPackable(GenerateType.VersionTolerant)]
 	public sealed partial record IsEmpty : UsernameRequirementViolation;
 	
--- a/Common/Phantom.Common.Data/AllowedPorts.cs
+++ b/Common/Phantom.Common.Data/AllowedPorts.cs
@@ -35,7 +35,7 @@ public sealed partial class AllowedPorts {
 	}
 	
 	private static AllowedPorts FromString(ReadOnlySpan<char> definitions) {
-		List<PortRange> parsedDefinitions = [];
+		List<PortRange> parsedDefinitions = new ();
 		
 		while (!definitions.IsEmpty) {
 			int separatorIndex = definitions.IndexOf(',');
@@ -49,7 +49,7 @@ public sealed partial class AllowedPorts {
 			}
 		}
 		
-		return new AllowedPorts([..parsedDefinitions]);
+		return new AllowedPorts(parsedDefinitions.ToImmutableArray());
 	}
 	
 	public static AllowedPorts FromString(string definitions) {
--- a/Common/Phantom.Common.Data/Backups/BackupCreationResultKind.cs
+++ b/Common/Phantom.Common.Data/Backups/BackupCreationResultKind.cs
@@ -10,7 +10,7 @@ public enum BackupCreationResultKind : byte {
 	BackupFileAlreadyExists = 6,
 	CouldNotCreateBackupFolder = 7,
 	CouldNotCopyWorldToTemporaryFolder = 8,
-	CouldNotCreateWorldArchive = 9,
+	CouldNotCreateWorldArchive = 9
 }

 public static class BackupCreationResultSummaryExtensions {
--- a/Common/Phantom.Common.Data/Backups/BackupCreationWarnings.cs
+++ b/Common/Phantom.Common.Data/Backups/BackupCreationWarnings.cs
@@ -7,7 +7,7 @@ public enum BackupCreationWarnings : byte {
 	None = 0,
 	CouldNotDeleteTemporaryFolder = 1 << 0,
 	CouldNotCompressWorldArchive = 1 << 1,
-	CouldNotRestoreAutomaticSaving = 1 << 2,
+	CouldNotRestoreAutomaticSaving = 1 << 2
 }

 public static class BackupCreationWarningsExtensions {
--- a/Common/Phantom.Common.Data/ConnectionKey.cs
+++ b/Common/Phantom.Common.Data/ConnectionKey.cs
@@ -1,4 +1,4 @@
-using Phantom.Utils.Rpc;
+using Phantom.Utils.Rpc.Handshake;
 using Phantom.Utils.Rpc.Runtime.Tls;

 namespace Phantom.Common.Data;
--- a/Common/Phantom.Common.Data/Instance/IInstanceEvent.cs
+++ b/Common/Phantom.Common.Data/Instance/IInstanceEvent.cs
@@ -4,11 +4,11 @@ using Phantom.Common.Data.Backups;
 namespace Phantom.Common.Data.Instance;

 [MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(InstanceLaunchSucceededEvent))]
-[MemoryPackUnion(tag: 1, typeof(InstanceLaunchFailedEvent))]
-[MemoryPackUnion(tag: 2, typeof(InstanceCrashedEvent))]
-[MemoryPackUnion(tag: 3, typeof(InstanceStoppedEvent))]
-[MemoryPackUnion(tag: 4, typeof(InstanceBackupCompletedEvent))]
+[MemoryPackUnion(0, typeof(InstanceLaunchSucceededEvent))]
+[MemoryPackUnion(1, typeof(InstanceLaunchFailedEvent))]
+[MemoryPackUnion(2, typeof(InstanceCrashedEvent))]
+[MemoryPackUnion(3, typeof(InstanceStoppedEvent))]
+[MemoryPackUnion(4, typeof(InstanceBackupCompletedEvent))]
 public partial interface IInstanceEvent {
 	void Accept(IInstanceEventVisitor visitor);
 }
--- a/Common/Phantom.Common.Data/Instance/IInstanceStatus.cs
+++ b/Common/Phantom.Common.Data/Instance/IInstanceStatus.cs
@@ -3,17 +3,17 @@
 namespace Phantom.Common.Data.Instance;

 [MemoryPackable]
-[MemoryPackUnion(tag: 0, typeof(InstanceIsOffline))]
-[MemoryPackUnion(tag: 1, typeof(InstanceIsInvalid))]
-[MemoryPackUnion(tag: 2, typeof(InstanceIsNotRunning))]
-[MemoryPackUnion(tag: 3, typeof(InstanceIsDownloading))]
-[MemoryPackUnion(tag: 4, typeof(InstanceIsLaunching))]
-[MemoryPackUnion(tag: 5, typeof(InstanceIsRunning))]
-[MemoryPackUnion(tag: 6, typeof(InstanceIsBackingUp))]
-[MemoryPackUnion(tag: 7, typeof(InstanceIsRestarting))]
-[MemoryPackUnion(tag: 8, typeof(InstanceIsStopping))]
-[MemoryPackUnion(tag: 9, typeof(InstanceIsFailed))]
-public partial interface IInstanceStatus;
+[MemoryPackUnion(0, typeof(InstanceIsOffline))]
+[MemoryPackUnion(1, typeof(InstanceIsInvalid))]
+[MemoryPackUnion(2, typeof(InstanceIsNotRunning))]
+[MemoryPackUnion(3, typeof(InstanceIsDownloading))]
+[MemoryPackUnion(4, typeof(InstanceIsLaunching))]
+[MemoryPackUnion(5, typeof(InstanceIsRunning))]
+[MemoryPackUnion(6, typeof(InstanceIsBackingUp))]
+[MemoryPackUnion(7, typeof(InstanceIsRestarting))]
+[MemoryPackUnion(8, typeof(InstanceIsStopping))]
+[MemoryPackUnion(9, typeof(InstanceIsFailed))]
+public partial interface IInstanceStatus {}

 [MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceIsOffline : IInstanceStatus;
--- a/Common/Phantom.Common.Data/Instance/InstanceLaunchFailReason.cs
+++ b/Common/Phantom.Common.Data/Instance/InstanceLaunchFailReason.cs
@@ -6,5 +6,5 @@ public enum InstanceLaunchFailReason : byte {
 	CouldNotDownloadMinecraftServer        = 6,
 	CouldNotConfigureMinecraftServer       = 7,
 	CouldNotPrepareMinecraftServerLauncher = 8,
-	CouldNotStartMinecraftServer           = 9,
+	CouldNotStartMinecraftServer           = 9
 }
--- a/Common/Phantom.Common.Data/Instance/InstancePlayerCounts.cs
+++ b/Common/Phantom.Common.Data/Instance/InstancePlayerCounts.cs
@@ -3,7 +3,7 @@
 namespace Phantom.Common.Data.Instance;

 [MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record InstancePlayerCounts(
+public readonly partial record struct InstancePlayerCounts(
 	[property: MemoryPackOrder(0)] int Online,
 	[property: MemoryPackOrder(1)] int Maximum
 );
--- a/Common/Phantom.Common.Data/Java/JavaRuntime.cs
+++ b/Common/Phantom.Common.Data/Java/JavaRuntime.cs
@@ -14,7 +14,7 @@ public sealed partial record JavaRuntime(
 			return 0;
 		}
 		
-		if (other is null) {
+		if (ReferenceEquals(null, other)) {
 			return 1;
 		}
 		
@@ -30,9 +30,9 @@ public sealed partial record JavaRuntime(
 	
 	private static bool TryParseFullVersion(string versionString, [NotNullWhen(true)] out Version? version) {
 		int dashIndex = versionString.IndexOf('-');
-		var versionSpan = dashIndex != -1 ? versionString.AsSpan(start: 0, dashIndex) : versionString;
+		var versionSpan = dashIndex != -1 ? versionString.AsSpan(0, dashIndex) : versionString;
 		if (versionSpan.Contains('_')) {
-			versionSpan = versionSpan.ToString().Replace(oldChar: '_', newChar: '.');
+			versionSpan = versionSpan.ToString().Replace('_', '.');
 		}
 		
 		return Version.TryParse(versionSpan, out version);
--- a/Common/Phantom.Common.Data/Minecraft/MinecraftServerKind.cs
+++ b/Common/Phantom.Common.Data/Minecraft/MinecraftServerKind.cs
@@ -2,5 +2,5 @@

 public enum MinecraftServerKind : ushort {
 	Vanilla = 1,
-	Fabric = 2,
+	Fabric = 2
 }
--- a/Common/Phantom.Common.Data/Minecraft/MinecraftStopStrategy.cs
+++ b/Common/Phantom.Common.Data/Minecraft/MinecraftStopStrategy.cs
@@ -3,7 +3,7 @@
 namespace Phantom.Common.Data.Minecraft;

 [MemoryPackable(GenerateType.VersionTolerant)]
-public sealed partial record MinecraftStopStrategy(
+public readonly partial record struct MinecraftStopStrategy(
 	[property: MemoryPackOrder(0)] ushort Seconds
 ) {
 	public static MinecraftStopStrategy Instant => new (0);
--- a/Common/Phantom.Common.Data/Minecraft/MinecraftVersionType.cs
+++ b/Common/Phantom.Common.Data/Minecraft/MinecraftVersionType.cs
@@ -7,14 +7,14 @@ public enum MinecraftVersionType : ushort {
 	Release = 1,
 	Snapshot = 2,
 	OldBeta = 3,
-	OldAlpha = 4,
+	OldAlpha = 4
 }

 public static class MinecraftVersionTypes {
-	public static readonly ImmutableArray<MinecraftVersionType> WithServerJars = [
+	public static readonly ImmutableArray<MinecraftVersionType> WithServerJars = ImmutableArray.Create(
 		MinecraftVersionType.Release,
-		MinecraftVersionType.Snapshot,
-	];
+		MinecraftVersionType.Snapshot
+	);
 	
 	public static MinecraftVersionType FromString(string? type) {
 		return type switch {
@@ -22,7 +22,7 @@ public static class MinecraftVersionTypes {
 			"snapshot"  => MinecraftVersionType.Snapshot,
 			"old_beta"  => MinecraftVersionType.OldBeta,
 			"old_alpha" => MinecraftVersionType.OldAlpha,
-			_           => MinecraftVersionType.Other,
+			_           => MinecraftVersionType.Other
 		};
 	}
 	
@@ -32,7 +32,7 @@ public static class MinecraftVersionTypes {
 			MinecraftVersionType.Snapshot => "Snapshots",
 			MinecraftVersionType.OldBeta  => "Beta",
 			MinecraftVersionType.OldAlpha => "Alpha",
-			_                             => "Unknown",
+			_                             => "Unknown"
 		};
 	}
 }
--- a/Common/Phantom.Common.Data/PortRange.cs
+++ b/Common/Phantom.Common.Data/PortRange.cs
@@ -3,7 +3,7 @@ using MemoryPack;

 namespace Phantom.Common.Data;

-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 readonly partial record struct PortRange(
 	[property: MemoryPackOrder(0)] ushort FirstPort,
 	[property: MemoryPackOrder(1)] ushort LastPort
--- a/Common/Phantom.Common.Data/RamAllocationUnits.cs
+++ b/Common/Phantom.Common.Data/RamAllocationUnits.cs
@@ -6,7 +6,7 @@ namespace Phantom.Common.Data;
 /// <summary>
 /// Represents a number of RAM allocation units, using the conversion factor of 256 MB per unit. Supports allocations up to 16 TB minus 256 MB (65535 units).
 /// </summary>
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
 public readonly partial record struct RamAllocationUnits(
 	[property: MemoryPackOrder(0)] ushort RawValue
@@ -24,7 +24,7 @@ public readonly partial record struct RamAllocationUnits(
 	}
 	
 	public static RamAllocationUnits operator -(RamAllocationUnits left, RamAllocationUnits right) {
-		ushort units = (ushort) Math.Max(left.RawValue - right.RawValue, val2: 0);
+		ushort units = (ushort) Math.Max(left.RawValue - right.RawValue, 0);
 		return new RamAllocationUnits(units);
 	}
 	
@@ -68,7 +68,7 @@ public readonly partial record struct RamAllocationUnits(
 			throw new ArgumentOutOfRangeException(nameof(megabytes), "Must be at most " + MaximumMegabytes + " MB.");
 		}
 		
-		return new RamAllocationUnits((ushort) Math.Clamp(units, min: 0, MaximumUnits));
+		return new RamAllocationUnits((ushort) Math.Clamp(units, 0, MaximumUnits));
 	}
 	
 	/// <summary>
@@ -83,7 +83,7 @@ public readonly partial record struct RamAllocationUnits(
 		int unitMultiplier = char.ToUpperInvariant(definition[^1]) switch {
 			'M' => 1,
 			'G' => 1024,
-			_   => throw new ArgumentOutOfRangeException(nameof(definition), "Must end with 'M' or 'G'."),
+			_   => throw new ArgumentOutOfRangeException(nameof(definition), "Must end with 'M' or 'G'.")
 		};
 		
 		if (!int.TryParse(definition[..^1], out int size)) {
--- a/Common/Phantom.Common.Data/Replies/ConfigureInstanceResult.cs
+++ b/Common/Phantom.Common.Data/Replies/ConfigureInstanceResult.cs
@@ -1,14 +1,14 @@
 namespace Phantom.Common.Data.Replies;

 public enum ConfigureInstanceResult : byte {
-	Success,
+	Success
 }

 public static class ConfigureInstanceResultExtensions {
 	public static string ToSentence(this ConfigureInstanceResult reason) {
 		return reason switch {
 			ConfigureInstanceResult.Success => "Success.",
-			_                               => "Unknown error.",
+			_                               => "Unknown error."
 		};
 	}
 }
--- a/Common/Phantom.Common.Data/Replies/InstanceActionFailure.cs
+++ b/Common/Phantom.Common.Data/Replies/InstanceActionFailure.cs
@@ -4,7 +4,7 @@ public enum InstanceActionFailure : byte {
 	AgentDoesNotExist,
 	AgentShuttingDown,
 	AgentIsNotResponding,
-	InstanceDoesNotExist,
+	InstanceDoesNotExist
 }

 public static class InstanceActionFailureExtensions {
@@ -14,7 +14,7 @@ public static class InstanceActionFailureExtensions {
 			InstanceActionFailure.AgentShuttingDown    => "Agent is shutting down.",
 			InstanceActionFailure.AgentIsNotResponding => "Agent is not responding.",
 			InstanceActionFailure.InstanceDoesNotExist => "Instance does not exist.",
-			_                                          => "Unknown error.",
+			_                                          => "Unknown error."
 		};
 	}
 }
--- a/Common/Phantom.Common.Data/Replies/LaunchInstanceResult.cs
+++ b/Common/Phantom.Common.Data/Replies/LaunchInstanceResult.cs
@@ -9,5 +9,5 @@ public enum LaunchInstanceResult : byte {
 	ServerPortNotAllowed     = 6,
 	ServerPortAlreadyInUse   = 7,
 	RconPortNotAllowed       = 8,
-	RconPortAlreadyInUse     = 9,
+	RconPortAlreadyInUse     = 9
 }
--- a/Common/Phantom.Common.Data/Replies/SendCommandToInstanceResult.cs
+++ b/Common/Phantom.Common.Data/Replies/SendCommandToInstanceResult.cs
@@ -3,5 +3,5 @@
 public enum SendCommandToInstanceResult : byte {
 	UnknownError = 0,
 	Success = 1,
-	InstanceNotRunning = 2,
+	InstanceNotRunning = 2
 }
--- a/Common/Phantom.Common.Data/Replies/StopInstanceResult.cs
+++ b/Common/Phantom.Common.Data/Replies/StopInstanceResult.cs
@@ -3,5 +3,5 @@
 public enum StopInstanceResult : byte {
 	StopInitiated           = 1,
 	InstanceAlreadyStopping = 2,
-	InstanceAlreadyStopped  = 3,
+	InstanceAlreadyStopped  = 3
 }
--- a/Common/Phantom.Common.Data/Result.cs
+++ b/Common/Phantom.Common.Data/Result.cs
@@ -51,11 +51,11 @@ public sealed partial class Result<TValue, TError> {
 	}
 	
 	public static implicit operator Result<TValue, TError>(TValue value) {
-		return new Result<TValue, TError>(hasValue: true, value, error: default);
+		return new Result<TValue, TError>(hasValue: true, value, default);
 	}
 	
 	public static implicit operator Result<TValue, TError>(TError error) {
-		return new Result<TValue, TError>(hasValue: false, value: default, error);
+		return new Result<TValue, TError>(hasValue: false, default, error);
 	}
 	
 	public static implicit operator bool(Result<TValue, TError> result) {
@@ -93,7 +93,7 @@ public sealed partial class Result<TError> {
 	}
 	
 	public static implicit operator Result<TError>([SuppressMessage("ReSharper", "UnusedParameter.Global")] Result.OkType _) {
-		return new Result<TError>(hasValue: true, error: default);
+		return new Result<TError>(hasValue: true, default);
 	}
 	
 	public static implicit operator Result<TError>(TError error) {
--- a/Common/Phantom.Common.Messages.Agent/AgentMessageRegistries.cs
+++ b/Common/Phantom.Common.Messages.Agent/AgentMessageRegistries.cs
@@ -2,26 +2,33 @@
 using Phantom.Common.Data.Replies;
 using Phantom.Common.Messages.Agent.ToAgent;
 using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.Logging;
 using Phantom.Utils.Rpc.Message;

 namespace Phantom.Common.Messages.Agent;

 public static class AgentMessageRegistries {
-	public static MessageRegistry<IMessageToAgent> ToAgent { get; } = new (nameof(ToAgent));
-	public static MessageRegistry<IMessageToController> ToController { get; } = new (nameof(ToController));
+	public static MessageRegistry<IMessageToAgent> ToAgent { get; } = new (PhantomLogger.Create("MessageRegistry", nameof(ToAgent)));
+	public static MessageRegistry<IMessageToController> ToController { get; } = new (PhantomLogger.Create("MessageRegistry", nameof(ToController)));
 	
-	public static MessageRegistries<IMessageToController, IMessageToAgent> Registries => new (ToAgent, ToController);
+	public static IMessageDefinitions<IMessageToController, IMessageToAgent> Definitions { get; } = new MessageDefinitions();
 	
 	static AgentMessageRegistries() {
-		ToAgent.Add<ConfigureInstanceMessage, Result<ConfigureInstanceResult, InstanceActionFailure>>();
-		ToAgent.Add<LaunchInstanceMessage, Result<LaunchInstanceResult, InstanceActionFailure>>();
-		ToAgent.Add<StopInstanceMessage, Result<StopInstanceResult, InstanceActionFailure>>();
-		ToAgent.Add<SendCommandToInstanceMessage, Result<SendCommandToInstanceResult, InstanceActionFailure>>();
+		ToAgent.Add<ConfigureInstanceMessage, Result<ConfigureInstanceResult, InstanceActionFailure>>(1);
+		ToAgent.Add<LaunchInstanceMessage, Result<LaunchInstanceResult, InstanceActionFailure>>(2);
+		ToAgent.Add<StopInstanceMessage, Result<StopInstanceResult, InstanceActionFailure>>(3);
+		ToAgent.Add<SendCommandToInstanceMessage, Result<SendCommandToInstanceResult, InstanceActionFailure>>(4);
 		
-		ToController.Add<ReportInstanceStatusMessage>();
-		ToController.Add<InstanceOutputMessage>();
-		ToController.Add<ReportAgentStatusMessage>();
-		ToController.Add<ReportInstanceEventMessage>();
-		ToController.Add<ReportInstancePlayerCountsMessage>();
+		ToController.Add<UnregisterAgentMessage>(1);
+		ToController.Add<ReportInstanceStatusMessage>(2);
+		ToController.Add<InstanceOutputMessage>(3);
+		ToController.Add<ReportAgentStatusMessage>(4);
+		ToController.Add<ReportInstanceEventMessage>(5);
+		ToController.Add<ReportInstancePlayerCountsMessage>(6);
+	}
+	
+	private sealed class MessageDefinitions : IMessageDefinitions<IMessageToController, IMessageToAgent> {
+		public MessageRegistry<IMessageToAgent> ToClient => ToAgent;
+		public MessageRegistry<IMessageToController> ToServer => ToController;
 	}
 }
--- a/Common/Phantom.Common.Messages.Agent/IMessageToAgent.cs
+++ b/Common/Phantom.Common.Messages.Agent/IMessageToAgent.cs
@@ -1,3 +1,3 @@
 namespace Phantom.Common.Messages.Agent;

-public interface IMessageToAgent;
+public interface IMessageToAgent {}
--- a/Common/Phantom.Common.Messages.Agent/IMessageToController.cs
+++ b/Common/Phantom.Common.Messages.Agent/IMessageToController.cs
@@ -1,3 +1,3 @@
 namespace Phantom.Common.Messages.Agent;

-public interface IMessageToController;
+public interface IMessageToController {}
--- a/Common/Phantom.Common.Messages.Agent/ToController/UnregisterAgentMessage.cs
+++ b/Common/Phantom.Common.Messages.Agent/ToController/UnregisterAgentMessage.cs
@@ -0,0 +1,6 @@
+using MemoryPack;
+
+namespace Phantom.Common.Messages.Agent.ToController;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record UnregisterAgentMessage : IMessageToController;
--- a/Common/Phantom.Common.Messages.Web/IMessageToController.cs
+++ b/Common/Phantom.Common.Messages.Web/IMessageToController.cs
@@ -1,3 +1,3 @@
 namespace Phantom.Common.Messages.Web;

-public interface IMessageToController;
+public interface IMessageToController {}
--- a/Common/Phantom.Common.Messages.Web/IMessageToWeb.cs
+++ b/Common/Phantom.Common.Messages.Web/IMessageToWeb.cs
@@ -1,3 +1,3 @@
 namespace Phantom.Common.Messages.Web;

-public interface IMessageToWeb;
+public interface IMessageToWeb {}
--- a/Common/Phantom.Common.Messages.Web/ToController/UnregisterWebMessage.cs
+++ b/Common/Phantom.Common.Messages.Web/ToController/UnregisterWebMessage.cs
@@ -0,0 +1,6 @@
+using MemoryPack;
+
+namespace Phantom.Common.Messages.Web.ToController;
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record UnregisterWebMessage : IMessageToController;
--- a/Common/Phantom.Common.Messages.Web/WebMessageRegistries.cs
+++ b/Common/Phantom.Common.Messages.Web/WebMessageRegistries.cs
@@ -9,39 +9,46 @@ using Phantom.Common.Data.Web.Instance;
 using Phantom.Common.Data.Web.Users;
 using Phantom.Common.Messages.Web.ToController;
 using Phantom.Common.Messages.Web.ToWeb;
+using Phantom.Utils.Logging;
 using Phantom.Utils.Rpc.Message;

 namespace Phantom.Common.Messages.Web;

 public static class WebMessageRegistries {
-	public static MessageRegistry<IMessageToController> ToController { get; } = new (nameof(ToController));
-	public static MessageRegistry<IMessageToWeb> ToWeb { get; } = new (nameof(ToWeb));
+	public static MessageRegistry<IMessageToController> ToController { get; } = new (PhantomLogger.Create("MessageRegistry", nameof(ToController)));
+	public static MessageRegistry<IMessageToWeb> ToWeb { get; } = new (PhantomLogger.Create("MessageRegistry", nameof(ToWeb)));
 	
-	public static MessageRegistries<IMessageToController, IMessageToWeb> Registries => new (ToWeb, ToController);
+	public static IMessageDefinitions<IMessageToController, IMessageToWeb> Definitions { get; } = new MessageDefinitions();
 	
 	static WebMessageRegistries() {
-		ToController.Add<LogInMessage, Optional<LogInSuccess>>();
-		ToController.Add<LogOutMessage>();
-		ToController.Add<GetAuthenticatedUser, Optional<AuthenticatedUserInfo>>();
-		ToController.Add<CreateOrUpdateAdministratorUserMessage, CreateOrUpdateAdministratorUserResult>();
-		ToController.Add<CreateUserMessage, Result<CreateUserResult, UserActionFailure>>();
-		ToController.Add<DeleteUserMessage, Result<DeleteUserResult, UserActionFailure>>();
-		ToController.Add<GetUsersMessage, ImmutableArray<UserInfo>>();
-		ToController.Add<GetRolesMessage, ImmutableArray<RoleInfo>>();
-		ToController.Add<GetUserRolesMessage, ImmutableDictionary<Guid, ImmutableArray<Guid>>>();
-		ToController.Add<ChangeUserRolesMessage, Result<ChangeUserRolesResult, UserActionFailure>>();
-		ToController.Add<CreateOrUpdateInstanceMessage, Result<CreateOrUpdateInstanceResult, UserInstanceActionFailure>>();
-		ToController.Add<LaunchInstanceMessage, Result<LaunchInstanceResult, UserInstanceActionFailure>>();
-		ToController.Add<StopInstanceMessage, Result<StopInstanceResult, UserInstanceActionFailure>>();
-		ToController.Add<SendCommandToInstanceMessage, Result<SendCommandToInstanceResult, UserInstanceActionFailure>>();
-		ToController.Add<GetMinecraftVersionsMessage, ImmutableArray<MinecraftVersion>>();
-		ToController.Add<GetAgentJavaRuntimesMessage, ImmutableDictionary<Guid, ImmutableArray<TaggedJavaRuntime>>>();
-		ToController.Add<GetAuditLogMessage, Result<ImmutableArray<AuditLogItem>, UserActionFailure>>();
-		ToController.Add<GetEventLogMessage, Result<ImmutableArray<EventLogItem>, UserActionFailure>>();
+		ToController.Add<UnregisterWebMessage>(1);
+		ToController.Add<LogInMessage, Optional<LogInSuccess>>(2);
+		ToController.Add<LogOutMessage>(3);
+		ToController.Add<GetAuthenticatedUser, Optional<AuthenticatedUserInfo>>(4);
+		ToController.Add<CreateOrUpdateAdministratorUserMessage, CreateOrUpdateAdministratorUserResult>(5);
+		ToController.Add<CreateUserMessage, Result<CreateUserResult, UserActionFailure>>(6);
+		ToController.Add<DeleteUserMessage, Result<DeleteUserResult, UserActionFailure>>(7);
+		ToController.Add<GetUsersMessage, ImmutableArray<UserInfo>>(8);
+		ToController.Add<GetRolesMessage, ImmutableArray<RoleInfo>>(9);
+		ToController.Add<GetUserRolesMessage, ImmutableDictionary<Guid, ImmutableArray<Guid>>>(10);
+		ToController.Add<ChangeUserRolesMessage, Result<ChangeUserRolesResult, UserActionFailure>>(11);
+		ToController.Add<CreateOrUpdateInstanceMessage, Result<CreateOrUpdateInstanceResult, UserInstanceActionFailure>>(12);
+		ToController.Add<LaunchInstanceMessage, Result<LaunchInstanceResult, UserInstanceActionFailure>>(13);
+		ToController.Add<StopInstanceMessage, Result<StopInstanceResult, UserInstanceActionFailure>>(14);
+		ToController.Add<SendCommandToInstanceMessage, Result<SendCommandToInstanceResult, UserInstanceActionFailure>>(15);
+		ToController.Add<GetMinecraftVersionsMessage, ImmutableArray<MinecraftVersion>>(16);
+		ToController.Add<GetAgentJavaRuntimesMessage, ImmutableDictionary<Guid, ImmutableArray<TaggedJavaRuntime>>>(17);
+		ToController.Add<GetAuditLogMessage, Result<ImmutableArray<AuditLogItem>, UserActionFailure>>(18);
+		ToController.Add<GetEventLogMessage, Result<ImmutableArray<EventLogItem>, UserActionFailure>>(19);
 		
-		ToWeb.Add<RefreshAgentsMessage>();
-		ToWeb.Add<RefreshInstancesMessage>();
-		ToWeb.Add<InstanceOutputMessage>();
-		ToWeb.Add<RefreshUserSessionMessage>();
+		ToWeb.Add<RefreshAgentsMessage>(1);
+		ToWeb.Add<RefreshInstancesMessage>(2);
+		ToWeb.Add<InstanceOutputMessage>(3);
+		ToWeb.Add<RefreshUserSessionMessage>(4);
+	}
+	
+	private sealed class MessageDefinitions : IMessageDefinitions<IMessageToController, IMessageToWeb> {
+		public MessageRegistry<IMessageToWeb> ToClient => ToWeb;
+		public MessageRegistry<IMessageToController> ToServer => ToController;
 	}
 }
--- a/Controller/Phantom.Controller.Database/Repositories/AuditLogRepository.Writer.cs
+++ b/Controller/Phantom.Controller.Database/Repositories/AuditLogRepository.Writer.cs
@@ -57,7 +57,7 @@ sealed partial class AuditLogRepository {
 		
 		public void UserDeleted(UserEntity user) {
 			AddItem(AuditLogEventType.UserDeleted, user.UserGuid.ToString(), new Dictionary<string, object?> {
-				{ "username", user.Name },
+				{ "username", user.Name }
 			});
 		}
 		
@@ -75,13 +75,13 @@ sealed partial class AuditLogRepository {
 		
 		public void InstanceCommandExecuted(Guid instanceGuid, string command) {
 			AddItem(AuditLogEventType.InstanceCommandExecuted, instanceGuid.ToString(), new Dictionary<string, object?> {
-				{ "command", command },
+				{ "command", command }
 			});
 		}
 		
 		public void InstanceStopped(Guid instanceGuid, int stopInSeconds) {
 			AddItem(AuditLogEventType.InstanceStopped, instanceGuid.ToString(), new Dictionary<string, object?> {
-				{ "stop_in_seconds", stopInSeconds.ToString() },
+				{ "stop_in_seconds", stopInSeconds.ToString() }
 			});
 		}
 	}
--- a/Controller/Phantom.Controller.Database/Repositories/UserRepository.cs
+++ b/Controller/Phantom.Controller.Database/Repositories/UserRepository.cs
@@ -2,6 +2,9 @@
 using Microsoft.EntityFrameworkCore;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Web.Users;
+using Phantom.Common.Data.Web.Users.AddUserErrors;
+using Phantom.Common.Data.Web.Users.PasswordRequirementViolations;
+using Phantom.Common.Data.Web.Users.UsernameRequirementViolations;
 using Phantom.Controller.Database.Entities;
 using Phantom.Utils.Collections;

@@ -13,10 +16,10 @@ public sealed class UserRepository {
 	
 	private static UsernameRequirementViolation? CheckUsernameRequirements(string username) {
 		if (string.IsNullOrWhiteSpace(username)) {
-			return new UsernameRequirementViolation.IsEmpty();
+			return new IsEmpty();
 		}
 		else if (username.Length > MaxUserNameLength) {
-			return new UsernameRequirementViolation.TooLong(MaxUserNameLength);
+			return new TooLong(MaxUserNameLength);
 		}
 		else {
 			return null;
@@ -27,19 +30,19 @@ public sealed class UserRepository {
 		var violations = ImmutableArray.CreateBuilder<PasswordRequirementViolation>();
 		
 		if (password.Length < MinimumPasswordLength) {
-			violations.Add(new PasswordRequirementViolation.TooShort(MinimumPasswordLength));
+			violations.Add(new TooShort(MinimumPasswordLength));
 		}
 		
 		if (!password.Any(char.IsLower)) {
-			violations.Add(new PasswordRequirementViolation.MustContainLowercaseLetter());
+			violations.Add(new MustContainLowercaseLetter());
 		}
 		
 		if (!password.Any(char.IsUpper)) {
-			violations.Add(new PasswordRequirementViolation.MustContainUppercaseLetter());
+			violations.Add(new MustContainUppercaseLetter());
 		}
 		
 		if (!password.Any(char.IsDigit)) {
-			violations.Add(new PasswordRequirementViolation.MustContainDigit());
+			violations.Add(new MustContainDigit());
 		}
 		
 		return violations.ToImmutable();
@@ -70,16 +73,16 @@ public sealed class UserRepository {
 	public async Task<Result<UserEntity, AddUserError>> CreateUser(string username, string password) {
 		var usernameRequirementViolation = CheckUsernameRequirements(username);
 		if (usernameRequirementViolation != null) {
-			return new AddUserError.NameIsInvalid(usernameRequirementViolation);
+			return new NameIsInvalid(usernameRequirementViolation);
 		}
 		
 		var passwordRequirementViolations = CheckPasswordRequirements(password);
 		if (!passwordRequirementViolations.IsEmpty) {
-			return new AddUserError.PasswordIsInvalid(passwordRequirementViolations);
+			return new PasswordIsInvalid(passwordRequirementViolations);
 		}
 		
 		if (await db.Ctx.Users.AnyAsync(user => user.Name == username)) {
-			return new AddUserError.NameAlreadyExists();
+			return new NameAlreadyExists();
 		}
 		
 		var user = new UserEntity(Guid.NewGuid(), username, UserPasswords.Hash(password));
@@ -92,7 +95,7 @@ public sealed class UserRepository {
 	public Result<SetUserPasswordError> SetUserPassword(UserEntity user, string password) {
 		var requirementViolations = CheckPasswordRequirements(password);
 		if (!requirementViolations.IsEmpty) {
-			return new SetUserPasswordError.PasswordIsInvalid(requirementViolations);
+			return new Common.Data.Web.Users.SetUserPasswordErrors.PasswordIsInvalid(requirementViolations);
 		}
 		
 		user.PasswordHash = UserPasswords.Hash(password);
--- a/Controller/Phantom.Controller.Minecraft/MinecraftVersions.cs
+++ b/Controller/Phantom.Controller.Minecraft/MinecraftVersions.cs
@@ -12,7 +12,7 @@ public sealed class MinecraftVersions : IDisposable {
 	
 	private readonly MinecraftVersionApi api = new ();
 	private readonly Stopwatch cacheTimer = new ();
-	private readonly SemaphoreSlim cacheSemaphore = new (initialCount: 1, maxCount: 1);
+	private readonly SemaphoreSlim cacheSemaphore = new (1, 1);
 	
 	private bool IsCacheNotExpired => cacheTimer.IsRunning && cacheTimer.Elapsed < CacheRetentionTime;
 	
--- a/Controller/Phantom.Controller.Services/Agents/AgentActor.cs
+++ b/Controller/Phantom.Controller.Services/Agents/AgentActor.cs
@@ -26,7 +26,7 @@ using Serilog;

 namespace Phantom.Controller.Services.Agents;

-sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
+sealed class AgentActor : ReceiveActor<AgentActor.ICommand> {
 	private static readonly ILogger Logger = PhantomLogger.Create<AgentActor>();
 	
 	private static readonly TimeSpan DisconnectionRecheckInterval = TimeSpan.FromSeconds(5);
@@ -38,8 +38,6 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 		return Props<ICommand>.Create(() => new AgentActor(init), new ActorConfiguration { SupervisorStrategy = SupervisorStrategies.Resume, MailboxType = UnboundedJumpAheadMailbox.Name });
 	}
 	
-	public ITimerScheduler Timers { get; set; } = null!;
-	
 	private readonly ControllerState controllerState;
 	private readonly MinecraftVersions minecraftVersions;
 	private readonly IDbContextProvider dbProvider;
@@ -112,7 +110,7 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 	protected override void PreStart() {
 		Self.Tell(new InitializeCommand());
 		
-		Timers.StartPeriodicTimer("RefreshConnectionStatus", new RefreshConnectionStatusCommand(), DisconnectionRecheckInterval, Self);
+		Context.System.Scheduler.ScheduleTellRepeatedly(DisconnectionRecheckInterval, DisconnectionRecheckInterval, Self, new RefreshConnectionStatusCommand(), Self);
 	}
 	
 	private ActorRef<InstanceActor.ICommand> CreateNewInstance(Instance instance) {
@@ -178,7 +176,7 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 	
 	public sealed record SetConnectionCommand(RpcServerToClientConnection<IMessageToController, IMessageToAgent> Connection) : ICommand;
 	
-	public sealed record UnregisterCommand : ICommand;
+	public sealed record UnregisterCommand(RpcServerToClientConnection<IMessageToController, IMessageToAgent> Connection) : ICommand;
 	
 	private sealed record RefreshConnectionStatusCommand : ICommand;
 	
@@ -252,16 +250,16 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 	}
 	
 	private void Unregister(UnregisterCommand command) {
-		connection.Close();
-		
-		stats = null;
-		lastPingTime = null;
-		isOnline = false;
-		NotifyAgentUpdated();
-		
-		TellAllInstances(new InstanceActor.SetStatusCommand(InstanceStatus.Offline));
-		
-		Logger.Information("Unregistered agent \"{Name}\" (GUID {Guid}).", configuration.AgentName, agentGuid);
+		if (connection.CloseIfSame(command.Connection)) {
+			stats = null;
+			lastPingTime = null;
+			isOnline = false;
+			NotifyAgentUpdated();
+			
+			TellAllInstances(new InstanceActor.SetStatusCommand(InstanceStatus.Offline));
+			
+			Logger.Information("Unregistered agent \"{Name}\" (GUID {Guid}).", configuration.AgentName, agentGuid);
+		}
 	}
 	
 	private void RefreshConnectionStatus(RefreshConnectionStatusCommand command) {
@@ -279,8 +277,6 @@ sealed class AgentActor : ReceiveActor<AgentActor.ICommand>, IWithTimers {
 		if (!isOnline) {
 			isOnline = true;
 			NotifyAgentUpdated();
-			
-			Logger.Warning("Restored connection to agent \"{Name}\" (GUID {Guid}).", configuration.AgentName, agentGuid);
 		}
 	}
 	
--- a/Controller/Phantom.Controller.Services/Agents/AgentConnection.cs
+++ b/Controller/Phantom.Controller.Services/Agents/AgentConnection.cs
@@ -19,16 +19,22 @@ sealed class AgentConnection(Guid agentGuid, string agentName) {
 	public void UpdateConnection(RpcServerToClientConnection<IMessageToController, IMessageToAgent> newConnection) {
 		lock (this) {
 			if (connection != null) {
-				_ = connection.CloseSession();
+				Task.Run(connection.ClientClosedSession);
 			}
 			
 			connection = newConnection;
 		}
 	}
 	
-	public void Close() {
+	public bool CloseIfSame(RpcServerToClientConnection<IMessageToController, IMessageToAgent> expected) {
 		lock (this) {
-			connection = null;
+			if (connection != null && ReferenceEquals(connection, expected)) {
+				Task.Run(connection.ClientClosedSession);
+				connection = null;
+				return true;
+			}
+			
+			return false;
 		}
 	}
 	
--- a/Controller/Phantom.Controller.Services/Agents/AgentDatabaseStorageActor.cs
+++ b/Controller/Phantom.Controller.Services/Agents/AgentDatabaseStorageActor.cs
@@ -1,5 +1,4 @@
-using Akka.Actor;
-using Phantom.Common.Data.Web.Agent;
+using Phantom.Common.Data.Web.Agent;
 using Phantom.Controller.Database;
 using Phantom.Utils.Actor;
 using Phantom.Utils.Logging;
@@ -7,7 +6,7 @@ using Serilog;

 namespace Phantom.Controller.Services.Agents;

-sealed class AgentDatabaseStorageActor : ReceiveActor<AgentDatabaseStorageActor.ICommand>, IWithTimers {
+sealed class AgentDatabaseStorageActor : ReceiveActor<AgentDatabaseStorageActor.ICommand> {
 	private static readonly ILogger Logger = PhantomLogger.Create<AgentDatabaseStorageActor>();
 	
 	public readonly record struct Init(Guid AgentGuid, IDbContextProvider DbProvider, CancellationToken CancellationToken);
@@ -16,8 +15,6 @@ sealed class AgentDatabaseStorageActor : ReceiveActor<AgentDatabaseStorageActor.
 		return Props<ICommand>.Create(() => new AgentDatabaseStorageActor(init), new ActorConfiguration { SupervisorStrategy = SupervisorStrategies.Resume });
 	}
 	
-	public ITimerScheduler Timers { get; set; } = null!;
-	
 	private readonly Guid agentGuid;
 	private readonly IDbContextProvider dbProvider;
 	private readonly CancellationToken cancellationToken;
@@ -34,7 +31,7 @@ sealed class AgentDatabaseStorageActor : ReceiveActor<AgentDatabaseStorageActor.
 		ReceiveAsync<FlushChangesCommand>(FlushChanges);
 	}
 	
-	public interface ICommand;
+	public interface ICommand {}
 	
 	public sealed record StoreAgentConfigurationCommand(AgentConfiguration Configuration) : ICommand;
 	
@@ -77,7 +74,7 @@ sealed class AgentDatabaseStorageActor : ReceiveActor<AgentDatabaseStorageActor.
 	private void ScheduleFlush(TimeSpan delay) {
 		if (!hasScheduledFlush) {
 			hasScheduledFlush = true;
-			Timers.StartSingleTimer("FlushChanges", new FlushChangesCommand(), delay, Self);
+			Context.System.Scheduler.ScheduleTellOnce(delay, Self, new FlushChangesCommand(), Self);
 		}
 	}
 }
--- a/Controller/Phantom.Controller.Services/ControllerServices.cs
+++ b/Controller/Phantom.Controller.Services/ControllerServices.cs
@@ -52,7 +52,7 @@ public sealed class ControllerServices : IDisposable {
 		this.UserManager = new UserManager(AuthenticatedUserCache, ControllerState, dbProvider);
 		this.RoleManager = new RoleManager(dbProvider);
 		this.UserRoleManager = new UserRoleManager(AuthenticatedUserCache, ControllerState, dbProvider);
-		this.UserLoginManager = new UserLoginManager(AuthenticatedUserCache, dbProvider);
+		this.UserLoginManager = new UserLoginManager(AuthenticatedUserCache, UserManager, dbProvider);
 		this.PermissionManager = new PermissionManager(dbProvider);
 		
 		this.AgentManager = new AgentManager(ActorSystem, ControllerState, MinecraftVersions, UserLoginManager, dbProvider, cancellationToken);
--- a/Controller/Phantom.Controller.Services/Events/EventLogDatabaseStorageActor.cs
+++ b/Controller/Phantom.Controller.Services/Events/EventLogDatabaseStorageActor.cs
@@ -1,5 +1,4 @@
-using Akka.Actor;
-using Phantom.Common.Data.Web.EventLog;
+using Phantom.Common.Data.Web.EventLog;
 using Phantom.Controller.Database;
 using Phantom.Controller.Database.Repositories;
 using Phantom.Utils.Actor;
@@ -8,7 +7,7 @@ using Serilog;

 namespace Phantom.Controller.Services.Events;

-sealed class EventLogDatabaseStorageActor : ReceiveActor<EventLogDatabaseStorageActor.ICommand>, IWithTimers {
+sealed class EventLogDatabaseStorageActor : ReceiveActor<EventLogDatabaseStorageActor.ICommand> {
 	private static readonly ILogger Logger = PhantomLogger.Create<EventLogDatabaseStorageActor>();
 	
 	public readonly record struct Init(IDbContextProvider DbProvider, CancellationToken CancellationToken);
@@ -17,12 +16,10 @@ sealed class EventLogDatabaseStorageActor : ReceiveActor<EventLogDatabaseStorage
 		return Props<ICommand>.Create(() => new EventLogDatabaseStorageActor(init), new ActorConfiguration { SupervisorStrategy = SupervisorStrategies.Resume });
 	}
 	
-	public ITimerScheduler Timers { get; set; } = null!;
-	
 	private readonly IDbContextProvider dbProvider;
 	private readonly CancellationToken cancellationToken;
 	
-	private readonly LinkedList<StoreEventCommand> pendingCommands = [];
+	private readonly LinkedList<StoreEventCommand> pendingCommands = new ();
 	private bool hasScheduledFlush = false;
 	
 	private EventLogDatabaseStorageActor(Init init) {
@@ -33,7 +30,7 @@ sealed class EventLogDatabaseStorageActor : ReceiveActor<EventLogDatabaseStorage
 		ReceiveAsync<FlushChangesCommand>(FlushChanges);
 	}
 	
-	public interface ICommand;
+	public interface ICommand {}
 	
 	public sealed record StoreEventCommand(Guid EventGuid, DateTime UtcTime, Guid? AgentGuid, EventLogEventType EventType, string SubjectId, Dictionary<string, object?>? Extra = null) : ICommand;
 	
@@ -74,7 +71,7 @@ sealed class EventLogDatabaseStorageActor : ReceiveActor<EventLogDatabaseStorage
 	private void ScheduleFlush(TimeSpan delay) {
 		if (!hasScheduledFlush) {
 			hasScheduledFlush = true;
-			Timers.StartSingleTimer("FlushChanges", new FlushChangesCommand(), delay, Self);
+			Context.System.Scheduler.ScheduleTellOnce(delay, Self, new FlushChangesCommand(), Self);
 		}
 	}
 }
--- a/Controller/Phantom.Controller.Services/Events/EventLogManager.InstanceEventVisitor.cs
+++ b/Controller/Phantom.Controller.Services/Events/EventLogManager.InstanceEventVisitor.cs
@@ -30,7 +30,7 @@ sealed partial class EventLogManager {
 		
 		public void OnLaunchFailed(InstanceLaunchFailedEvent e) {
 			eventLogManager.EnqueueItem(eventGuid, utcTime, agentGuid, EventLogEventType.InstanceLaunchFailed, instanceGuid.ToString(), new Dictionary<string, object?> {
-				{ "reason", e.Reason.ToString() },
+				{ "reason", e.Reason.ToString() }
 			});
 		}
 		
@@ -46,7 +46,7 @@ sealed partial class EventLogManager {
 			var eventType = e.Kind switch {
 				BackupCreationResultKind.Success when e.Warnings != BackupCreationWarnings.None => EventLogEventType.InstanceBackupSucceededWithWarnings,
 				BackupCreationResultKind.Success                                                => EventLogEventType.InstanceBackupSucceeded,
-				_                                                                               => EventLogEventType.InstanceBackupFailed,
+				_                                                                               => EventLogEventType.InstanceBackupFailed
 			};
 			
 			var dictionary = new Dictionary<string, object?>();
--- a/Controller/Phantom.Controller.Services/Instances/InstanceActor.cs
+++ b/Controller/Phantom.Controller.Services/Instances/InstanceActor.cs
@@ -64,7 +64,7 @@ sealed class InstanceActor : ReceiveActor<InstanceActor.ICommand> {
 		return reply ?? InstanceActionFailure.AgentIsNotResponding;
 	}
 	
-	public interface ICommand;
+	public interface ICommand {}
 	
 	public sealed record SetStatusCommand(IInstanceStatus Status) : ICommand;
 	
--- a/Controller/Phantom.Controller.Services/Instances/InstanceDatabaseStorageActor.cs
+++ b/Controller/Phantom.Controller.Services/Instances/InstanceDatabaseStorageActor.cs
@@ -35,10 +35,10 @@ sealed class InstanceDatabaseStorageActor : ReceiveActor<InstanceDatabaseStorage
 	}
 	
 	private ValueTask<InstanceEntity?> FindInstanceEntity(ILazyDbContext db) {
-		return db.Ctx.Instances.FindAsync([instanceGuid], cancellationToken);
+		return db.Ctx.Instances.FindAsync(new object[] { instanceGuid }, cancellationToken);
 	}
 	
-	public interface ICommand;
+	public interface ICommand {}
 	
 	public sealed record StoreInstanceConfigurationCommand(Guid AuditLogUserGuid, bool IsCreatingInstance, InstanceConfiguration Configuration) : ICommand;
 	
--- a/Controller/Phantom.Controller.Services/Rpc/AgentClientHandshake.cs
+++ b/Controller/Phantom.Controller.Services/Rpc/AgentClientHandshake.cs
@@ -1,10 +1,7 @@
-using System.Collections.Immutable;
-using Phantom.Common.Data.Agent;
+using Phantom.Common.Data.Agent;
 using Phantom.Common.Messages.Agent.Handshake;
-using Phantom.Common.Messages.Agent.ToAgent;
 using Phantom.Controller.Services.Agents;
 using Phantom.Utils.Monads;
-using Phantom.Utils.Rpc.Message;
 using Phantom.Utils.Rpc.Runtime;
 using Phantom.Utils.Rpc.Runtime.Server;

@@ -19,59 +16,34 @@ public sealed class AgentClientHandshake : IRpcServerClientHandshake<AgentInfo>
 		this.agentManager = agentManager;
 	}
 	
-	public async Task<Either<AgentInfo, Exception>> Perform(bool isNewSession, RpcStream stream, CancellationToken cancellationToken) {
-		RegistrationResult registrationResult;
-		switch (await RegisterAgent(stream, cancellationToken)) {
-			case Left<RegistrationResult, Exception>(var result):
-				await stream.WriteByte(value: 1, cancellationToken);
-				registrationResult = result;
-				break;
-			
-			case Right<RegistrationResult, Exception>(var exception):
-				await stream.WriteByte(value: 0, cancellationToken);
-				return Either.Right(exception);
-			
-			default:
-				await stream.WriteByte(value: 0, cancellationToken);
-				return Either.Right<Exception>(new InvalidOperationException("Invalid result type."));
-		}
-		
-		if (isNewSession) {
-			await stream.WriteUnsignedInt((uint) registrationResult.ConfigureInstanceMessages.Length, cancellationToken);
-			
-			foreach (var configureInstanceMessage in registrationResult.ConfigureInstanceMessages) {
-				ReadOnlyMemory<byte> serializedMessage = MessageSerialization.Serialize(configureInstanceMessage);
-				await stream.WriteSignedInt(serializedMessage.Length, cancellationToken);
-				await stream.WriteBytes(serializedMessage, cancellationToken);
-			}
-		}
-		else {
-			await stream.WriteUnsignedInt(value: 0, cancellationToken);
-		}
-		
-		await stream.Flush(cancellationToken);
-		
-		return Either.Left(registrationResult.AgentInfo);
-	}
-	
-	private async Task<Either<RegistrationResult, Exception>> RegisterAgent(RpcStream stream, CancellationToken cancellationToken) {
-		int serializedRegistrationLength = await stream.ReadSignedInt(cancellationToken);
+	public async Task<Either<AgentInfo, Exception>> Perform(Stream stream, CancellationToken cancellationToken) {
+		int serializedRegistrationLength = await RpcSerialization.ReadSignedInt(stream, cancellationToken);
 		if (serializedRegistrationLength is < 0 or > MaxRegistrationBytes) {
+			await RpcSerialization.WriteByte(value: 0, stream, cancellationToken);
 			return Either.Right<Exception>(new InvalidOperationException("Registration must be between 0 and " + MaxRegistrationBytes + " bytes."));
 		}
 		
-		var serializedRegistration = await stream.ReadBytes(serializedRegistrationLength, cancellationToken);
+		var serializedRegistration = await RpcSerialization.ReadBytes(serializedRegistrationLength, stream, cancellationToken);
 		
 		AgentRegistration registration;
 		try {
-			registration = MessageSerialization.Deserialize<AgentRegistration>(serializedRegistration);
+			registration = RpcSerialization.Deserialize<AgentRegistration>(serializedRegistration);
 		} catch (Exception e) {
+			await RpcSerialization.WriteByte(value: 0, stream, cancellationToken);
 			return Either.Right<Exception>(new InvalidOperationException("Caught exception during deserialization.", e));
 		}
 		
 		var configureInstanceMessages = await agentManager.RegisterAgent(registration);
-		return Either.Left(new RegistrationResult(registration.AgentInfo, configureInstanceMessages));
+		
+		await RpcSerialization.WriteByte(value: 1, stream, cancellationToken);
+		await RpcSerialization.WriteUnsignedInt((uint) configureInstanceMessages.Length, stream, cancellationToken);
+		
+		foreach (var configureInstanceMessage in configureInstanceMessages) {
+			ReadOnlyMemory<byte> serializedMessage = RpcSerialization.Serialize(configureInstanceMessage);
+			await RpcSerialization.WriteSignedInt(serializedMessage.Length, stream, cancellationToken);
+			await stream.WriteAsync(serializedMessage, cancellationToken);
+		}
+		
+		return Either.Left(registration.AgentInfo);
 	}
-	
-	private readonly record struct RegistrationResult(AgentInfo AgentInfo, ImmutableArray<ConfigureInstanceMessage> ConfigureInstanceMessages);
 }
--- a/Controller/Phantom.Controller.Services/Rpc/AgentClientRegistrar.cs
+++ b/Controller/Phantom.Controller.Services/Rpc/AgentClientRegistrar.cs
@@ -1,6 +1,4 @@
-using System.Collections.Concurrent;
-using System.Diagnostics.CodeAnalysis;
-using Akka.Actor;
+using Akka.Actor;
 using Phantom.Common.Data.Agent;
 using Phantom.Common.Messages.Agent;
 using Phantom.Controller.Services.Agents;
@@ -18,35 +16,16 @@ sealed class AgentClientRegistrar(
 	InstanceLogManager instanceLogManager,
 	EventLogManager eventLogManager
 ) : IRpcServerClientRegistrar<IMessageToController, IMessageToAgent, AgentInfo> {
-	private readonly ConcurrentDictionary<Guid, Receiver> receiversBySessionGuid = new ();
-	
-	[SuppressMessage("ReSharper", "LambdaShouldNotCaptureContext")]
 	public IMessageReceiver<IMessageToController> Register(RpcServerToClientConnection<IMessageToController, IMessageToAgent> connection, AgentInfo handshakeResult) {
 		var agentGuid = handshakeResult.AgentGuid;
 		agentManager.TellAgent(agentGuid, new AgentActor.SetConnectionCommand(connection));
 		
-		var receiver = receiversBySessionGuid.GetOrAdd(connection.SessionId, CreateReceiver, agentGuid);
-		if (receiver.AgentGuid != agentGuid) {
-			throw new InvalidOperationException("Cannot register two agents to the same session!");
-		}
-		
-		return receiver;
-	}
-	
-	private Receiver CreateReceiver(Guid sessionId, Guid agentGuid) {
-		var name = "AgentClient-" + sessionId;
-		var init = new AgentMessageHandlerActor.Init(agentGuid, agentManager, instanceLogManager, eventLogManager);
+		var name = "AgentClient-" + connection.SessionId;
+		var init = new AgentMessageHandlerActor.Init(agentGuid, connection, agentManager, instanceLogManager, eventLogManager);
 		return new Receiver(agentGuid, agentManager, actorSystem.ActorOf(AgentMessageHandlerActor.Factory(init), name));
 	}
 	
 	private sealed class Receiver(Guid agentGuid, AgentManager agentManager, ActorRef<IMessageToController> actor) : IMessageReceiver<IMessageToController>.Actor(actor) {
-		public Guid AgentGuid => agentGuid;
-		
-		public override Task OnSessionTerminated() {
-			agentManager.TellAgent(agentGuid, new AgentActor.UnregisterCommand());
-			return base.OnSessionTerminated();
-		}
-		
 		public override void OnPing() {
 			agentManager.TellAgent(agentGuid, new AgentActor.NotifyIsAliveCommand());
 		}
--- a/Controller/Phantom.Controller.Services/Rpc/AgentMessageHandlerActor.cs
+++ b/Controller/Phantom.Controller.Services/Rpc/AgentMessageHandlerActor.cs
@@ -4,27 +4,31 @@ using Phantom.Controller.Services.Agents;
 using Phantom.Controller.Services.Events;
 using Phantom.Controller.Services.Instances;
 using Phantom.Utils.Actor;
+using Phantom.Utils.Rpc.Runtime.Server;

 namespace Phantom.Controller.Services.Rpc;

 sealed class AgentMessageHandlerActor : ReceiveActor<IMessageToController> {
-	public readonly record struct Init(Guid AgentGuid, AgentManager AgentManager, InstanceLogManager InstanceLogManager, EventLogManager EventLogManager);
+	public readonly record struct Init(Guid AgentGuid, RpcServerToClientConnection<IMessageToController, IMessageToAgent> Connection, AgentManager AgentManager, InstanceLogManager InstanceLogManager, EventLogManager EventLogManager);
 	
 	public static Props<IMessageToController> Factory(Init init) {
 		return Props<IMessageToController>.Create(() => new AgentMessageHandlerActor(init), new ActorConfiguration { SupervisorStrategy = SupervisorStrategies.Resume });
 	}
 	
 	private readonly Guid agentGuid;
+	private readonly RpcServerToClientConnection<IMessageToController, IMessageToAgent> connection;
 	private readonly AgentManager agentManager;
 	private readonly InstanceLogManager instanceLogManager;
 	private readonly EventLogManager eventLogManager;
 	
 	private AgentMessageHandlerActor(Init init) {
 		this.agentGuid = init.AgentGuid;
+		this.connection = init.Connection;
 		this.agentManager = init.AgentManager;
 		this.instanceLogManager = init.InstanceLogManager;
 		this.eventLogManager = init.EventLogManager;
 		
+		ReceiveAsync<UnregisterAgentMessage>(HandleUnregisterAgent);
 		Receive<ReportAgentStatusMessage>(HandleReportAgentStatus);
 		Receive<ReportInstanceStatusMessage>(HandleReportInstanceStatus);
 		Receive<ReportInstancePlayerCountsMessage>(HandleReportInstancePlayerCounts);
@@ -32,6 +36,13 @@ sealed class AgentMessageHandlerActor : ReceiveActor<IMessageToController> {
 		Receive<InstanceOutputMessage>(HandleInstanceOutput);
 	}
 	
+	private Task HandleUnregisterAgent(UnregisterAgentMessage message) {
+		agentManager.TellAgent(agentGuid, new AgentActor.UnregisterCommand(connection));
+		
+		Context.Stop(Self);
+		return connection.ClientClosedSession();
+	}
+	
 	private void HandleReportAgentStatus(ReportAgentStatusMessage message) {
 		agentManager.TellAgent(agentGuid, new AgentActor.UpdateStatsCommand(message.RunningInstanceCount, message.RunningInstanceMemory));
 	}
--- a/Controller/Phantom.Controller.Services/Rpc/WebMessageDataUpdateSenderActor.cs
+++ b/Controller/Phantom.Controller.Services/Rpc/WebMessageDataUpdateSenderActor.cs
@@ -59,7 +59,7 @@ sealed class WebMessageDataUpdateSenderActor : ReceiveActor<WebMessageDataUpdate
 		selfCached.Tell(new ReceiveInstanceLogsCommand(e.InstanceGuid, e.Lines));
 	}
 	
-	public interface ICommand;
+	public interface ICommand {}
 	
 	private sealed record RefreshAgentsCommand(ImmutableDictionary<Guid, Agent> Agents) : ICommand;
 	
@@ -70,11 +70,11 @@ sealed class WebMessageDataUpdateSenderActor : ReceiveActor<WebMessageDataUpdate
 	private sealed record RefreshUserSessionCommand(Guid UserGuid) : ICommand;
 	
 	private Task RefreshAgents(RefreshAgentsCommand command) {
-		return messageSender.Send(new RefreshAgentsMessage([..command.Agents.Values])).AsTask();
+		return messageSender.Send(new RefreshAgentsMessage(command.Agents.Values.ToImmutableArray())).AsTask();
 	}
 	
 	private Task RefreshInstances(RefreshInstancesCommand command) {
-		return messageSender.Send(new RefreshInstancesMessage([..command.Instances.Values])).AsTask();
+		return messageSender.Send(new RefreshInstancesMessage(command.Instances.Values.ToImmutableArray())).AsTask();
 	}
 	
 	private Task ReceiveInstanceLogs(ReceiveInstanceLogsCommand command) {
--- a/Controller/Phantom.Controller.Services/Rpc/WebMessageHandlerActor.cs
+++ b/Controller/Phantom.Controller.Services/Rpc/WebMessageHandlerActor.cs
@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using Akka.Actor;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Java;
 using Phantom.Common.Data.Minecraft;
@@ -39,6 +40,7 @@ sealed class WebMessageHandlerActor : ReceiveActor<IMessageToController> {
 		return Props<IMessageToController>.Create(() => new WebMessageHandlerActor(init), new ActorConfiguration { SupervisorStrategy = SupervisorStrategies.Resume });
 	}
 	
+	private readonly RpcServerToClientConnection<IMessageToController, IMessageToWeb> connection;
 	private readonly ControllerState controllerState;
 	private readonly UserManager userManager;
 	private readonly RoleManager roleManager;
@@ -50,6 +52,7 @@ sealed class WebMessageHandlerActor : ReceiveActor<IMessageToController> {
 	private readonly EventLogManager eventLogManager;
 	
 	private WebMessageHandlerActor(Init init) {
+		this.connection = init.Connection;
 		this.controllerState = init.ControllerState;
 		this.userManager = init.UserManager;
 		this.roleManager = init.RoleManager;
@@ -60,9 +63,10 @@ sealed class WebMessageHandlerActor : ReceiveActor<IMessageToController> {
 		this.minecraftVersions = init.MinecraftVersions;
 		this.eventLogManager = init.EventLogManager;
 		
-		var senderActorInit = new WebMessageDataUpdateSenderActor.Init(init.Connection.MessageSender, controllerState, init.InstanceLogManager);
+		var senderActorInit = new WebMessageDataUpdateSenderActor.Init(connection.MessageSender, controllerState, init.InstanceLogManager);
 		Context.ActorOf(WebMessageDataUpdateSenderActor.Factory(senderActorInit), "DataUpdateSender");
 		
+		ReceiveAsync<UnregisterWebMessage>(HandleUnregisterWeb);
 		ReceiveAndReplyLater<LogInMessage, Optional<LogInSuccess>>(HandleLogIn);
 		Receive<LogOutMessage>(HandleLogOut);
 		ReceiveAndReply<GetAuthenticatedUser, Optional<AuthenticatedUserInfo>>(GetAuthenticatedUser);
@@ -83,6 +87,11 @@ sealed class WebMessageHandlerActor : ReceiveActor<IMessageToController> {
 		ReceiveAndReplyLater<GetEventLogMessage, Result<ImmutableArray<EventLogItem>, UserActionFailure>>(HandleGetEventLog);
 	}
 	
+	private Task HandleUnregisterWeb(UnregisterWebMessage message) {
+		Self.Tell(PoisonPill.Instance);
+		return connection.ClientClosedSession();
+	}
+	
 	private Task<Optional<LogInSuccess>> HandleLogIn(LogInMessage message) {
 		return userLoginManager.LogIn(message.Username, message.Password);
 	}
--- a/Controller/Phantom.Controller.Services/Users/PermissionManager.cs
+++ b/Controller/Phantom.Controller.Services/Users/PermissionManager.cs
@@ -37,6 +37,6 @@ sealed class PermissionManager {
 	}
 	
 	public static ImmutableArray<string> GetMissingPermissionsOrdered(IEnumerable<Permission> allPermissions, ImmutableHashSet<string> existingPermissionIds) {
-		return [..allPermissions.Select(static permission => permission.Id).Except(existingPermissionIds).Order()];
+		return allPermissions.Select(static permission => permission.Id).Except(existingPermissionIds).Order().ToImmutableArray();
 	}
 }
--- a/Controller/Phantom.Controller.Services/Users/Role.cs
+++ b/Controller/Phantom.Controller.Services/Users/Role.cs
@@ -4,7 +4,7 @@ using Phantom.Common.Data.Web.Users;
 namespace Phantom.Controller.Services.Users;

 public sealed record Role(Guid Guid, string Name, ImmutableArray<Permission> Permissions) {
-	private static readonly List<Role> AllRoles = [];
+	private static readonly List<Role> AllRoles = new ();
 	internal static IEnumerable<Role> All => AllRoles;
 	
 	private static Role Register(Guid guid, string name, ImmutableArray<Permission> permissions) {
@@ -14,9 +14,9 @@ public sealed record Role(Guid Guid, string Name, ImmutableArray<Permission> Per
 	}
 	
 	private static Guid SystemRoleGuid(byte id) {
-		return new Guid(a: 0, b: 0, c: 0, d: 0, e: 0, f: 0, g: 0, h: 0, i: 0, j: 0, id);
+		return new Guid(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, id);
 	}
 	
-	public static readonly Role Administrator = Register(SystemRoleGuid(1), "Administrator", [..Permission.All]);
-	public static readonly Role InstanceManager = Register(SystemRoleGuid(2), "Instance Manager", [Permission.ViewInstances, Permission.ViewInstanceLogs, Permission.CreateInstances, Permission.ControlInstances, Permission.ViewEvents]);
+	public static readonly Role Administrator = Register(SystemRoleGuid(1), "Administrator", Permission.All.ToImmutableArray());
+	public static readonly Role InstanceManager = Register(SystemRoleGuid(2), "Instance Manager", ImmutableArray.Create(Permission.ViewInstances, Permission.ViewInstanceLogs, Permission.CreateInstances, Permission.ControlInstances, Permission.ViewEvents));
 }
--- a/Controller/Phantom.Controller.Services/Users/RoleManager.cs
+++ b/Controller/Phantom.Controller.Services/Users/RoleManager.cs
@@ -57,6 +57,6 @@ sealed class RoleManager {
 		var roleRepository = new RoleRepository(db);
 		
 		var allRoles = await roleRepository.GetAll();
-		return [..allRoles.Select(static role => role.ToRoleInfo())];
+		return allRoles.Select(static role => role.ToRoleInfo()).ToImmutableArray();
 	}
 }
--- a/Controller/Phantom.Controller.Services/Users/Sessions/UserLoginManager.cs
+++ b/Controller/Phantom.Controller.Services/Users/Sessions/UserLoginManager.cs
@@ -11,12 +11,14 @@ sealed class UserLoginManager {
 	private const int SessionIdBytes = 20;
 	
 	private readonly AuthenticatedUserCache authenticatedUserCache;
+	private readonly UserManager userManager;
 	private readonly IDbContextProvider dbProvider;
 	
 	private readonly UserSessionBucket[] sessionBuckets = new UserSessionBucket[256];
 	
-	public UserLoginManager(AuthenticatedUserCache authenticatedUserCache, IDbContextProvider dbProvider) {
+	public UserLoginManager(AuthenticatedUserCache authenticatedUserCache, UserManager userManager, IDbContextProvider dbProvider) {
 		this.authenticatedUserCache = authenticatedUserCache;
+		this.userManager = userManager;
 		this.dbProvider = dbProvider;
 		
 		for (int i = 0; i < sessionBuckets.GetLength(0); i++) {
@@ -124,7 +126,7 @@ sealed class UserLoginManager {
 		}
 		
 		public bool Equals(UserSession? other) {
-			if (other is null) {
+			if (ReferenceEquals(null, other)) {
 				return false;
 			}
 			
--- a/Controller/Phantom.Controller.Services/Users/UserManager.cs
+++ b/Controller/Phantom.Controller.Services/Users/UserManager.cs
@@ -1,6 +1,7 @@
 using System.Collections.Immutable;
 using Phantom.Common.Data;
 using Phantom.Common.Data.Web.Users;
+using Phantom.Common.Data.Web.Users.CreateOrUpdateAdministratorUserResults;
 using Phantom.Controller.Database;
 using Phantom.Controller.Database.Entities;
 using Phantom.Controller.Database.Repositories;
@@ -28,7 +29,7 @@ sealed class UserManager {
 		var userRepository = new UserRepository(db);
 		
 		var allUsers = await userRepository.GetAll();
-		return [..allUsers.Select(static user => user.ToUserInfo())];
+		return allUsers.Select(static user => user.ToUserInfo()).ToImmutableArray();
 	}
 	
 	public async Task<UserEntity?> GetAuthenticated(string username, string password) {
@@ -56,12 +57,12 @@ sealed class UserManager {
 					wasCreated = true;
 				}
 				else {
-					return new CreateOrUpdateAdministratorUserResult.CreationFailed(result.Error);
+					return new CreationFailed(result.Error);
 				}
 			}
 			else {
 				if (userRepository.SetUserPassword(user, password).TryGetError(out var error)) {
-					return new CreateOrUpdateAdministratorUserResult.UpdatingFailed(error);
+					return new UpdatingFailed(error);
 				}
 				
 				auditLogWriter.AdministratorUserModified(user);
@@ -70,7 +71,7 @@ sealed class UserManager {
 			
 			var role = await new RoleRepository(db).GetByGuid(Role.Administrator.Guid);
 			if (role == null) {
-				return new CreateOrUpdateAdministratorUserResult.AddingToRoleFailed();
+				return new AddingToRoleFailed();
 			}
 			
 			await new UserRoleRepository(db).Add(user, role);
@@ -84,10 +85,10 @@ sealed class UserManager {
 				Logger.Information("Updated administrator user \"{Username}\" (GUID {Guid}).", username, user.UserGuid);
 			}
 			
-			return new CreateOrUpdateAdministratorUserResult.Success(user.ToUserInfo());
+			return new Success(user.ToUserInfo());
 		} catch (Exception e) {
 			Logger.Error(e, "Could not create or update administrator user \"{Username}\".", username);
-			return new CreateOrUpdateAdministratorUserResult.UnknownError();
+			return new UnknownError();
 		}
 	}
 	
@@ -103,7 +104,7 @@ sealed class UserManager {
 		try {
 			var result = await userRepository.CreateUser(username, password);
 			if (!result) {
-				return new CreateUserResult.CreationFailed(result.Error);
+				return new Common.Data.Web.Users.CreateUserResults.CreationFailed(result.Error);
 			}
 			
 			var user = result.Value;
@@ -112,10 +113,10 @@ sealed class UserManager {
 			await db.Ctx.SaveChangesAsync();
 			
 			Logger.Information("Created user \"{Username}\" (GUID {Guid}).", username, user.UserGuid);
-			return new CreateUserResult.Success(user.ToUserInfo());
+			return new Common.Data.Web.Users.CreateUserResults.Success(user.ToUserInfo());
 		} catch (Exception e) {
 			Logger.Error(e, "Could not create user \"{Username}\".", username);
-			return new CreateUserResult.UnknownError();
+			return new Common.Data.Web.Users.CreateUserResults.UnknownError();
 		}
 	}
 	
--- a/Controller/Phantom.Controller/ConnectionKeyData.cs
+++ b/Controller/Phantom.Controller/ConnectionKeyData.cs
@@ -1,4 +1,4 @@
-using Phantom.Utils.Rpc;
+using Phantom.Utils.Rpc.Handshake;
 using Phantom.Utils.Rpc.Runtime.Tls;

 namespace Phantom.Controller;
--- a/Controller/Phantom.Controller/ConnectionKeyFiles.cs
+++ b/Controller/Phantom.Controller/ConnectionKeyFiles.cs
@@ -3,7 +3,7 @@ using Phantom.Utils.Cryptography;
 using Phantom.Utils.IO;
 using Phantom.Utils.Logging;
 using Phantom.Utils.Monads;
-using Phantom.Utils.Rpc;
+using Phantom.Utils.Rpc.Handshake;
 using Phantom.Utils.Rpc.Runtime.Tls;
 using Serilog;

--- a/Controller/Phantom.Controller/Program.cs
+++ b/Controller/Phantom.Controller/Program.cs
@@ -6,6 +6,7 @@ using Phantom.Controller.Database.Postgres;
 using Phantom.Controller.Services;
 using Phantom.Utils.IO;
 using Phantom.Utils.Logging;
+using Phantom.Utils.Rpc.Runtime;
 using Phantom.Utils.Rpc.Runtime.Server;
 using Phantom.Utils.Runtime;
 using Phantom.Utils.Tasks;
@@ -64,25 +65,29 @@ try {
 		EndPoint: agentRpcServerHost,
 		Certificate: agentKeyData.Certificate,
 		AuthToken: agentKeyData.AuthToken,
-		PingIntervalSeconds: 10,
-		MessageQueueCapacity: 50,
-		FrameQueueCapacity: 100,
-		MaxConcurrentlyHandledMessages: 20
+		CommonParameters: new RpcCommonConnectionParameters(
+			MessageQueueCapacity: 50,
+			FrameQueueCapacity: 100,
+			MaxConcurrentlyHandledMessages: 20,
+			PingInterval: TimeSpan.FromSeconds(10)
+		)
 	);
 	
 	var webConnectionParameters = new RpcServerConnectionParameters(
 		EndPoint: webRpcServerHost,
 		Certificate: webKeyData.Certificate,
 		AuthToken: webKeyData.AuthToken,
-		PingIntervalSeconds: 60,
-		MessageQueueCapacity: 250,
-		FrameQueueCapacity: 500,
-		MaxConcurrentlyHandledMessages: 100
+		CommonParameters: new RpcCommonConnectionParameters(
+			MessageQueueCapacity: 250,
+			FrameQueueCapacity: 500,
+			MaxConcurrentlyHandledMessages: 100,
+			PingInterval: TimeSpan.FromMinutes(1)
+		)
 	);
 	
-	var rpcServerTasks = new LinkedTasks<bool>([
-		new RpcAgentServer("Agent", agentConnectionParameters, AgentMessageRegistries.Registries, controllerServices.AgentHandshake, controllerServices.AgentRegistrar).Run(shutdownCancellationToken),
-		new RpcWebServer("Web", webConnectionParameters, WebMessageRegistries.Registries, new RpcServerClientHandshake.NoOp(), controllerServices.WebRegistrar).Run(shutdownCancellationToken),
+	LinkedTasks<bool> rpcServerTasks = new LinkedTasks<bool>([
+		new RpcAgentServer("Agent", agentConnectionParameters, AgentMessageRegistries.Definitions, controllerServices.AgentHandshake, controllerServices.AgentRegistrar).Run(shutdownCancellationToken),
+		new RpcWebServer("Web", webConnectionParameters, WebMessageRegistries.Definitions, new RpcServerClientHandshake.NoOp(), controllerServices.WebRegistrar).Run(shutdownCancellationToken),
 	]);
 	
 	// If either RPC server crashes, stop the whole process.
--- a/Controller/Phantom.Controller/Variables.cs
+++ b/Controller/Phantom.Controller/Variables.cs
@@ -16,7 +16,7 @@ sealed record Variables(
 			Port = EnvironmentVariables.GetPortNumber("PG_PORT").Require,
 			Username = EnvironmentVariables.GetString("PG_USER").Require,
 			Password = EnvironmentVariables.GetString("PG_PASS").Require,
-			Database = EnvironmentVariables.GetString("PG_DATABASE").Require,
+			Database = EnvironmentVariables.GetString("PG_DATABASE").Require
 		};
 		
 		EndPoint agentRpcServerHost = new IPEndPoint(
@@ -40,7 +40,7 @@ sealed record Variables(
 		try {
 			return LoadOrThrow();
 		} catch (Exception e) {
-			PhantomLogger.Root.Fatal("{Error}", e.Message);
+			PhantomLogger.Root.Fatal(e.Message);
 			throw StopProcedureException.Instance;
 		}
 	}
--- a/Packages.props
+++ b/Packages.props
@@ -1,31 +1,35 @@
 <Project>
  
  <ItemGroup>
-    <PackageReference Update="Microsoft.AspNetCore.Components.Authorization" Version="9.0.9" />
-    <PackageReference Update="Microsoft.AspNetCore.Components.Web"           Version="9.0.9" />
+    <PackageReference Update="Microsoft.AspNetCore.Components.Authorization" Version="8.0.0" />
+    <PackageReference Update="Microsoft.AspNetCore.Components.Web"           Version="8.0.0" />
  </ItemGroup>
  
  <ItemGroup>
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Tools"      Version="9.0.9" />
-    <PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL"    Version="9.0.4" />
-    <PackageReference Update="System.Linq.Async"                        Version="6.0.3" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Tools"      Version="8.0.0" />
+    <PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL"    Version="8.0.0" />
+    <PackageReference Update="System.Linq.Async"                        Version="6.0.1" />
  </ItemGroup>
  
  <ItemGroup>
-    <PackageReference Update="Akka" Version="1.5.51" />
+    <PackageReference Update="Kajabity.Tools.Java" Version="0.3.8607.38728" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Update="Akka"                       Version="1.5.17.1" />
  </ItemGroup>
  
  <ItemGroup>
    <PackageReference Update="BCrypt.Net-Next.StrongName" Version="4.0.3" />
-    <PackageReference Update="MemoryPack"                 Version="1.21.4" />
+    <PackageReference Update="MemoryPack"                 Version="1.10.0" />
  </ItemGroup>
  
  <ItemGroup>
-    <PackageReference Update="Serilog"               Version="4.3.0" />
-    <PackageReference Update="Serilog.AspNetCore"    Version="9.0.0" />
-    <PackageReference Update="Serilog.Sinks.Async"   Version="2.1.0" />
-    <PackageReference Update="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageReference Update="Serilog"               Version="3.1.1" />
+    <PackageReference Update="Serilog.AspNetCore"    Version="8.0.0" />
+    <PackageReference Update="Serilog.Sinks.Async"   Version="1.5.0" />
+    <PackageReference Update="Serilog.Sinks.Console" Version="5.0.1" />
  </ItemGroup>
  
  <ItemGroup>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
chylex	9887860f3d	Replace NetMQ with custom TCP networking	2025-09-23 07:48:07 +02:00
chylex	f660cf440b	Replace NetMQ with custom TCP networking	2025-09-23 02:29:21 +02:00
chylex	42de35dfe6	Replace NetMQ with custom TCP networking	2025-09-23 02:05:35 +02:00
chylex	4210619d54	Replace NetMQ with custom TCP networking	2025-09-22 14:45:39 +02:00
chylex	089cfb203a	Replace NetMQ with custom TCP networking	2025-09-22 13:31:59 +02:00