WIP

This reverts commit e699513036.

.run/Agent 1.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Agent 1" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/bin/Debug/net7.0/Phantom.Agent.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Agent/debug/Phantom.Agent.exe" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent1" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -9,10 +9,10 @@
       <env name="AGENT_NAME" value="Agent 1" />
       <env name="ALLOWED_RCON_PORTS" value="25575,27000,27001" />
       <env name="ALLOWED_SERVER_PORTS" value="25565,26000,26001" />
+      <env name="CONTROLLER_HOST" value="localhost" />
       <env name="JAVA_SEARCH_PATH" value="~/.jdks" />
       <env name="MAX_INSTANCES" value="3" />
       <env name="MAX_MEMORY" value="12G" />
-      <env name="SERVER_HOST" value="localhost" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -22,7 +22,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net7.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Agent 2.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Agent 2" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/bin/Debug/net7.0/Phantom.Agent.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Agent/debug/Phantom.Agent.exe" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent2" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -9,10 +9,10 @@
       <env name="AGENT_NAME" value="Agent 2" />
       <env name="ALLOWED_RCON_PORTS" value="27002-27006" />
       <env name="ALLOWED_SERVER_PORTS" value="26002-26006" />
+      <env name="CONTROLLER_HOST" value="localhost" />
       <env name="JAVA_SEARCH_PATH" value="~/.jdks" />
       <env name="MAX_INSTANCES" value="5" />
       <env name="MAX_MEMORY" value="10G" />
-      <env name="SERVER_HOST" value="localhost" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -22,7 +22,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net7.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Agent 3.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Agent 3" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/bin/Debug/net7.0/Phantom.Agent.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Agent/debug/Phantom.Agent.exe" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent3" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -9,10 +9,10 @@
       <env name="AGENT_NAME" value="Agent 3" />
       <env name="ALLOWED_RCON_PORTS" value="27007" />
       <env name="ALLOWED_SERVER_PORTS" value="26007" />
+      <env name="CONTROLLER_HOST" value="localhost" />
       <env name="JAVA_SEARCH_PATH" value="~/.jdks" />
       <env name="MAX_INSTANCES" value="1" />
       <env name="MAX_MEMORY" value="2560M" />
-      <env name="SERVER_HOST" value="localhost" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -22,7 +22,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net7.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Compile Bootstrap.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Compile Bootstrap" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/Server/Phantom.Server.Web.Bootstrap/package.json" />
+    <package-json value="$PROJECT_DIR$/Web/Phantom.Web.Bootstrap/package.json" />
     <command value="run" />
     <scripts>
       <script value="compile" />

.run/Controller.run.xml

@@ -1,28 +1,27 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Server" type="DotNetProject" factoryName=".NET Project">
+  <configuration default="false" name="Controller" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/Server/Phantom.Server/bin/Debug/net7.0/Phantom.Server.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Controller/debug/Phantom.Controller.exe" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Server" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Controller" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
-      <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
+      <env name="AGENT_RPC_SERVER_HOST" value="localhost" />
       <env name="PG_DATABASE" value="postgres" />
       <env name="PG_HOST" value="localhost" />
       <env name="PG_PASS" value="development" />
-      <env name="PG_PORT" value="9402" />
+      <env name="PG_PORT" value="9403" />
       <env name="PG_USER" value="postgres" />
-      <env name="RPC_SERVER_HOST" value="localhost" />
+      <env name="WEB_RPC_SERVER_HOST" value="localhost" />
-      <env name="WEB_SERVER_HOST" value="localhost" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/Server/Phantom.Server/Phantom.Server.csproj" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/Controller/Phantom.Controller/Phantom.Controller.csproj" />
     <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net7.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <method v="2">
       <option name="Build" />
     </method>

.run/Web.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Web" type="DotNetProject" factoryName=".NET Project">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Web/debug/Phantom.Web.exe" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Web" />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <envs>
+      <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
+      <env name="WEB_SERVER_HOST" value="localhost" />
+    </envs>
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/Web/Phantom.Web/Phantom.Web.csproj" />
+    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
+    <option name="PROJECT_KIND" value="DotNetCore" />
+    <option name="PROJECT_TFM" value="net8.0" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>

.workdir/Controller/.gitignore

@@ -0,0 +1 @@
+

.workdir/Controller/secrets/web.key

@@ -0,0 +1,2 @@
+<EFBFBD><EFBFBD>h?Ο<05>Bx
+<02>

.workdir/Controller/secrets/web.secret

@@ -0,0 +1 @@
+T<EFBFBD>./g<11><>N<EFBFBD><4E>t<EFBFBD>$<24>!<21>(<28><>#<23>~<7E><>}<14><:

AddMigration.bat

@@ -5,4 +5,4 @@ if [%1]==[] (
     exit
 )
 
-dotnet ef migrations add %~1 --project Server/Phantom.Server.Database.Postgres
+dotnet ef migrations add %~1 --project Controller/Phantom.Controller.Database.Postgres --msbuildprojectextensionspath .artifacts/obj/Phantom.Controller.Database.Postgres

AddMigration.sh

@@ -3,4 +3,4 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
-dotnet ef migrations add "$1" --project Server/Phantom.Server.Database.Postgres
+dotnet ef migrations add "$1" --project Controller/Phantom.Controller.Database.Postgres --msbuildprojectextensionspath .artifacts/obj/Phantom.Controller.Database.Postgres

Agent/Phantom.Agent.Minecraft/Instance/InstanceProcess.cs

@@ -1,13 +1,12 @@
 using Phantom.Utils.Collections;
-using Phantom.Utils.Runtime;
+using Phantom.Utils.Processes;
 
 namespace Phantom.Agent.Minecraft.Instance; 
 
 public sealed class InstanceProcess : IDisposable {
 	public InstanceProperties InstanceProperties { get; }
-	public CancellableSemaphore BackupSemaphore { get; } = new (1, 1);
 	
-	private readonly RingBuffer<string> outputBuffer = new (10000);
+	private readonly RingBuffer<string> outputBuffer = new (100);
 	private event EventHandler<string>? OutputEvent;
 
 	public event EventHandler? Ended;
@@ -61,7 +60,6 @@ public sealed class InstanceProcess : IDisposable {
 
 	public void Dispose() {
 		process.Dispose();
-		BackupSemaphore.Dispose();
 		OutputEvent = null;
 		Ended = null;
 	}

Agent/Phantom.Agent.Minecraft/Java/JavaPropertiesFileEditor.cs

@@ -0,0 +1,92 @@
+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) {
+		if (File.Exists(filePath)) {
+			string tmpFilePath = filePath + ".tmp";
+			File.Copy(filePath, tmpFilePath, overwrite: true);
+			await EditFromCopyOrCreate(filePath, tmpFilePath);
+			File.Move(tmpFilePath, filePath, overwrite: true);
+		}
+		else {
+			await EditFromCopyOrCreate(null, filePath);
+		}
+	}
+
+	private async Task EditFromCopyOrCreate(string? sourceFilePath, string targetFilePath) {
+		var properties = new JavaProperties();
+
+		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 (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 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;
+			}
+		}
+	}
+}

Agent/Phantom.Agent.Minecraft/Java/JavaRuntimeDiscovery.cs

@@ -79,10 +79,9 @@ public sealed class JavaRuntimeDiscovery {
 			WorkingDirectory = Path.GetDirectoryName(javaExecutablePath),
 			Arguments = "-XshowSettings:properties -version",
 			RedirectStandardInput = false,
-			RedirectStandardOutput = true,
+			RedirectStandardOutput = false,
 			RedirectStandardError = true,
-			UseShellExecute = false,
+			UseShellExecute = false
-			CreateNoWindow = false
 		};
 
 		var process = new Process { StartInfo = startInfo };

Agent/Phantom.Agent.Minecraft/Java/JvmArgumentBuilder.cs

@@ -1,5 +1,4 @@
-using System.Collections.Immutable;
+using System.Collections.ObjectModel;
-using System.Collections.ObjectModel;
 
 namespace Phantom.Agent.Minecraft.Java;
 
@@ -7,12 +6,12 @@ sealed class JvmArgumentBuilder {
 	private readonly JvmProperties basicProperties;
 	private readonly List<string> customArguments = new ();
 
-	public JvmArgumentBuilder(JvmProperties basicProperties, ImmutableArray<string> customArguments) {
+	public JvmArgumentBuilder(JvmProperties basicProperties) {
 		this.basicProperties = basicProperties;
+	}
 
-		foreach (var jvmArgument in customArguments) {
+	public void Add(string argument) {
-			this.customArguments.Add(jvmArgument);
+		customArguments.Add(argument);
-		}
 	}
 
 	public void AddProperty(string key, string value) {
@@ -24,8 +23,8 @@ sealed class JvmArgumentBuilder {
 			target.Add(property);
 		}
 
+		// In case of duplicate JVM arguments, typically the last one wins.
 		target.Add("-Xms" + basicProperties.InitialHeapMegabytes + "M");
 		target.Add("-Xmx" + basicProperties.MaximumHeapMegabytes + "M");
-		target.Add("-Xrs");
 	}
 }

Agent/Phantom.Agent.Minecraft/Launcher/BaseLauncher.cs

@@ -1,10 +1,8 @@
 using System.Text;
-using Kajabity.Tools.Java;
 using Phantom.Agent.Minecraft.Instance;
 using Phantom.Agent.Minecraft.Java;
 using Phantom.Agent.Minecraft.Server;
-using Phantom.Common.Minecraft;
+using Phantom.Utils.Processes;
-using Phantom.Utils.Runtime;
 using Serilog;
 
 namespace Phantom.Agent.Minecraft.Launcher;
@@ -23,10 +21,6 @@ public abstract class BaseLauncher : IServerLauncher {
 			return new LaunchResult.InvalidJavaRuntime();
 		}
 
-		if (JvmArgumentsHelper.Validate(instanceProperties.JvmArguments) != null) {
-			return new LaunchResult.InvalidJvmArguments();
-		}
-
 		var vanillaServerJarPath = await services.ServerExecutables.DownloadAndGetPath(instanceProperties.LaunchProperties.ServerDownloadInfo, MinecraftVersion, downloadProgressEventHandler, cancellationToken);
 		if (vanillaServerJarPath == null) {
 			return new LaunchResult.CouldNotDownloadMinecraftServer();
@@ -62,16 +56,8 @@ public abstract class BaseLauncher : IServerLauncher {
 			UseShellExecute = false
 		};
 		
-		var jvmArguments = new JvmArgumentBuilder(instanceProperties.JvmProperties, instanceProperties.JvmArguments);
-		CustomizeJvmArguments(jvmArguments);
-
 		var processArguments = processConfigurator.ArgumentList;
-		jvmArguments.Build(processArguments);
+		PrepareJvmArguments(serverJar).Build(processArguments);
-		
-		foreach (var extraArgument in serverJar.ExtraArgs) {
-			processArguments.Add(extraArgument);
-		}
-		
 		processArguments.Add("-jar");
 		processArguments.Add(serverJar.FilePath);
 		processArguments.Add("nogui");
@@ -96,6 +82,21 @@ public abstract class BaseLauncher : IServerLauncher {
 		return new LaunchResult.Success(instanceProcess);
 	}
 
+	private JvmArgumentBuilder PrepareJvmArguments(ServerJarInfo serverJar) {
+		var builder = new JvmArgumentBuilder(instanceProperties.JvmProperties);
+
+		foreach (string argument in instanceProperties.JvmArguments) {
+			builder.Add(argument);
+		}
+
+		foreach (var argument in serverJar.ExtraArgs) {
+			builder.Add(argument);
+		}
+
+		CustomizeJvmArguments(builder);
+		return builder;
+	}
+
 	private protected virtual void CustomizeJvmArguments(JvmArgumentBuilder arguments) {}
 
 	private protected virtual Task<ServerJarInfo> PrepareServerJar(ILogger logger, string serverJarPath, CancellationToken cancellationToken) {
@@ -108,21 +109,8 @@ public abstract class BaseLauncher : IServerLauncher {
 	}
 
 	private static async Task UpdateServerProperties(InstanceProperties instanceProperties) {
-		var serverPropertiesFilePath = Path.Combine(instanceProperties.InstanceFolder, "server.properties");
+		var serverPropertiesEditor = new JavaPropertiesFileEditor();
-		var serverPropertiesData = new JavaProperties();
+		instanceProperties.ServerProperties.SetTo(serverPropertiesEditor);
-
+		await serverPropertiesEditor.EditOrCreate(Path.Combine(instanceProperties.InstanceFolder, "server.properties"));
-		await using var fileStream = new FileStream(serverPropertiesFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-		try {
-			serverPropertiesData.Load(fileStream);
-		} catch (ParseException e) {
-			throw new Exception("Could not parse server.properties file: " + serverPropertiesFilePath, e);
-		}
-		
-		instanceProperties.ServerProperties.SetTo(serverPropertiesData);
-
-		fileStream.Seek(0L, SeekOrigin.Begin);
-		fileStream.SetLength(0L);
-		
-		serverPropertiesData.Store(fileStream, true);
 	}
 }

Agent/Phantom.Agent.Minecraft/Launcher/LaunchResult.cs

@@ -9,8 +9,6 @@ public abstract record LaunchResult {
 
 	public sealed record InvalidJavaRuntime : LaunchResult;
 
-	public sealed record InvalidJvmArguments : LaunchResult;
-
 	public sealed record CouldNotDownloadMinecraftServer : LaunchResult;
 	
 	public sealed record CouldNotPrepareMinecraftServerLauncher : LaunchResult;

Agent/Phantom.Agent.Minecraft/Phantom.Agent.Minecraft.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -13,11 +12,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Common\Phantom.Common.Data\Phantom.Common.Data.csproj" />
     <ProjectReference Include="..\..\Common\Phantom.Common.Logging\Phantom.Common.Logging.csproj" />
-    <ProjectReference Include="..\..\Common\Phantom.Common.Minecraft\Phantom.Common.Minecraft.csproj" />
+    <ProjectReference Include="..\..\Utils\Phantom.Utils\Phantom.Utils.csproj" />
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.Collections\Phantom.Utils.Collections.csproj" />
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.Cryptography\Phantom.Utils.Cryptography.csproj" />
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.IO\Phantom.Utils.IO.csproj" />
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.Runtime\Phantom.Utils.Runtime.csproj" />
   </ItemGroup>
 
 </Project>

Agent/Phantom.Agent.Minecraft/Properties/MinecraftServerProperty.cs

@@ -1,4 +1,4 @@
-using Kajabity.Tools.Java;
+using Phantom.Agent.Minecraft.Java;
 
 namespace Phantom.Agent.Minecraft.Properties; 
 
@@ -12,7 +12,7 @@ abstract class MinecraftServerProperty<T> {
 	protected abstract T Read(string value);
 	protected abstract string Write(T value);
 
-	public void Set(JavaProperties properties, T value) {
+	public void Set(JavaPropertiesFileEditor properties, T value) {
-		properties.SetProperty(key, Write(value));
+		properties.Set(key, Write(value));
 	}
 }

Agent/Phantom.Agent.Minecraft/Properties/ServerProperties.cs

@@ -1,4 +1,4 @@
-using Kajabity.Tools.Java;
+using Phantom.Agent.Minecraft.Java;
 
 namespace Phantom.Agent.Minecraft.Properties;
 
@@ -7,7 +7,7 @@ public sealed record ServerProperties(
 	ushort RconPort,
 	bool EnableRcon = true
 ) {
-	internal void SetTo(JavaProperties properties) {
+	internal void SetTo(JavaPropertiesFileEditor properties) {
 		MinecraftServerProperties.ServerPort.Set(properties, ServerPort);
 		MinecraftServerProperties.RconPort.Set(properties, RconPort);
 		MinecraftServerProperties.EnableRcon.Set(properties, EnableRcon);

Agent/Phantom.Agent.Minecraft/Server/MinecraftServerExecutables.cs

@@ -10,7 +10,7 @@ public sealed partial class MinecraftServerExecutables {
 	private static readonly ILogger Logger = PhantomLogger.Create<MinecraftServerExecutables>();
 
 	[GeneratedRegex(@"[^a-zA-Z0-9_\-\.]", RegexOptions.Compiled)]
-	private static partial Regex VersionFolderSanitizeRegex();
+	private static partial Regex SanitizePathRegex();
 
 	private readonly string basePath;
 	private readonly Dictionary<string, MinecraftServerExecutableDownloader> runningDownloadersByVersion = new ();
@@ -20,7 +20,7 @@ public sealed partial class MinecraftServerExecutables {
 	}
 
 	internal async Task<string?> DownloadAndGetPath(FileDownloadInfo? fileDownloadInfo, string minecraftVersion, EventHandler<DownloadProgressEventArgs> progressEventHandler, CancellationToken cancellationToken) {
-		string serverExecutableFolderPath = Path.Combine(basePath, VersionFolderSanitizeRegex().Replace(minecraftVersion, "_"));
+		string serverExecutableFolderPath = Path.Combine(basePath, SanitizePathRegex().IsMatch(minecraftVersion) ? SanitizePathRegex().Replace(minecraftVersion, "_") : minecraftVersion);
 		string serverExecutableFilePath = Path.Combine(serverExecutableFolderPath, "server.jar");
 
 		if (File.Exists(serverExecutableFilePath)) {

Agent/Phantom.Agent.Minecraft/Server/ServerStatusProtocol.cs

@@ -78,7 +78,7 @@ public sealed class ServerStatusProtocol {
 				return null;
 			}
 
-			string onlinePlayerCountStr = Encoding.BigEndianUnicode.GetString(messageBuffer[(separator1 + 1)..(separator2 - 1)]);
+			string onlinePlayerCountStr = Encoding.BigEndianUnicode.GetString(messageBuffer.AsSpan((separator1 + 1)..(separator2 - 1)));
 			if (!int.TryParse(onlinePlayerCountStr, out int onlinePlayerCount)) {
 				logger.Error("Could not parse online player count in response from server: {OnlinePlayerCount}.", onlinePlayerCountStr);
 				return null;

Agent/Phantom.Agent.Rpc/KeepAliveLoop.cs

@@ -1,5 +1,5 @@
 using Phantom.Common.Logging;
-using Phantom.Common.Messages.ToServer;
+using Phantom.Common.Messages.Agent.ToController;
 using Serilog;
 
 namespace Phantom.Agent.Rpc;

Agent/Phantom.Agent.Rpc/Phantom.Agent.Rpc.csproj

@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\Common\Phantom.Common.Messages\Phantom.Common.Messages.csproj" />
+    <ProjectReference Include="..\..\Common\Phantom.Common.Messages.Agent\Phantom.Common.Messages.Agent.csproj" />
   </ItemGroup>
 
 </Project>

Agent/Phantom.Agent.Rpc/RpcLauncher.cs

@@ -1,27 +1,27 @@
 using NetMQ;
 using NetMQ.Sockets;
 using Phantom.Common.Data.Agent;
-using Phantom.Common.Messages;
+using Phantom.Common.Messages.Agent;
-using Phantom.Common.Messages.BiDirectional;
+using Phantom.Common.Messages.Agent.BiDirectional;
-using Phantom.Common.Messages.ToServer;
+using Phantom.Common.Messages.Agent.ToController;
 using Phantom.Utils.Rpc;
 using Phantom.Utils.Rpc.Message;
-using Phantom.Utils.Runtime;
+using Phantom.Utils.Tasks;
 using Serilog;
 using Serilog.Events;
 
 namespace Phantom.Agent.Rpc;
 
 public sealed class RpcLauncher : RpcRuntime<ClientSocket> {
-	public static async Task Launch(RpcConfiguration config, AgentAuthToken authToken, AgentInfo agentInfo, Func<RpcServerConnection, IMessageToAgentListener> listenerFactory, SemaphoreSlim disconnectSemaphore, CancellationToken receiveCancellationToken) {
+	public static Task Launch(RpcConfiguration config, AuthToken authToken, AgentInfo agentInfo, Func<RpcServerConnection, IMessageToAgentListener> listenerFactory, SemaphoreSlim disconnectSemaphore, CancellationToken receiveCancellationToken) {
 		var socket = new ClientSocket();
 		var options = socket.Options;
 
 		options.CurveServerCertificate = config.ServerCertificate;
 		options.CurveCertificate = new NetMQCertificate();
-		options.HelloMessage = MessageRegistries.ToServer.Write(new RegisterAgentMessage(authToken, agentInfo)).ToArray();
+		options.HelloMessage = AgentMessageRegistries.ToController.Write(new RegisterAgentMessage(authToken, agentInfo)).ToArray();
 
-		await new RpcLauncher(config, socket, agentInfo.Guid, listenerFactory, disconnectSemaphore, receiveCancellationToken).Launch();
+		return new RpcLauncher(config, socket, agentInfo.Guid, listenerFactory, disconnectSemaphore, receiveCancellationToken).Launch();
 	}
 
 	private readonly RpcConfiguration config;
@@ -63,7 +63,7 @@ public sealed class RpcLauncher : RpcRuntime<ClientSocket> {
 				LogMessageType(logger, data);
 				
 				if (data.Length > 0) {
-					MessageRegistries.ToAgent.Handle(data, handler);
+					AgentMessageRegistries.ToAgent.Handle(data, handler);
 				}
 			}
 		} catch (OperationCanceledException) {
@@ -81,11 +81,11 @@ public sealed class RpcLauncher : RpcRuntime<ClientSocket> {
 			return;
 		}
 
-		if (data.Length > 0 && MessageRegistries.ToAgent.TryGetType(data, out var type)) {
+		if (data.Length > 0 && AgentMessageRegistries.ToAgent.TryGetType(data, out var type)) {
-			logger.Verbose("Received {MessageType} ({Bytes} B) from server.", type.Name, data.Length);
+			logger.Verbose("Received {MessageType} ({Bytes} B) from controller.", type.Name, data.Length);
 		}
 		else {
-			logger.Verbose("Received {Bytes} B message from server.", data.Length);
+			logger.Verbose("Received {Bytes} B message from controller.", data.Length);
 		}
 	}
 
@@ -93,7 +93,7 @@ public sealed class RpcLauncher : RpcRuntime<ClientSocket> {
 		var unregisterTimeoutTask = Task.Delay(TimeSpan.FromSeconds(5), CancellationToken.None);
 		var finishedTask = await Task.WhenAny(ServerMessaging.Send(new UnregisterAgentMessage(agentGuid)), unregisterTimeoutTask);
 		if (finishedTask == unregisterTimeoutTask) {
-			config.RuntimeLogger.Error("Timed out communicating agent shutdown with the server.");
+			config.RuntimeLogger.Error("Timed out communicating agent shutdown with the controller.");
 		}
 	}
 

Agent/Phantom.Agent.Rpc/RpcServerConnection.cs

@@ -1,7 +1,7 @@
 using NetMQ;
 using NetMQ.Sockets;
-using Phantom.Common.Messages;
+using Phantom.Common.Messages.Agent;
-using Phantom.Common.Messages.BiDirectional;
+using Phantom.Common.Messages.Agent.BiDirectional;
 using Phantom.Utils.Rpc.Message;
 
 namespace Phantom.Agent.Rpc; 
@@ -15,17 +15,17 @@ public sealed class RpcServerConnection {
 		this.replyTracker = replyTracker;
 	}
 
-	internal async Task Send<TMessage>(TMessage message) where TMessage : IMessageToServer {
+	internal async Task Send<TMessage>(TMessage message) where TMessage : IMessageToController {
-		var bytes = MessageRegistries.ToServer.Write(message).ToArray();
+		var bytes = AgentMessageRegistries.ToController.Write(message).ToArray();
 		if (bytes.Length > 0) {
 			await socket.SendAsync(bytes);
 		}
 	}
 
-	internal async Task<TReply?> Send<TMessage, TReply>(TMessage message, TimeSpan waitForReplyTime, CancellationToken waitForReplyCancellationToken) where TMessage : IMessageToServer<TReply> where TReply : class {
+	internal async Task<TReply?> Send<TMessage, TReply>(TMessage message, TimeSpan waitForReplyTime, CancellationToken waitForReplyCancellationToken) where TMessage : IMessageToController<TReply> where TReply : class {
 		var sequenceId = replyTracker.RegisterReply();
 		
-		var bytes = MessageRegistries.ToServer.Write<TMessage, TReply>(sequenceId, message).ToArray();
+		var bytes = AgentMessageRegistries.ToController.Write<TMessage, TReply>(sequenceId, message).ToArray();
 		if (bytes.Length == 0) {
 			replyTracker.ForgetReply(sequenceId);
 			return null;

Agent/Phantom.Agent.Rpc/ServerMessaging.cs

@@ -1,5 +1,5 @@
 using Phantom.Common.Logging;
-using Phantom.Common.Messages;
+using Phantom.Common.Messages.Agent;
 using Serilog;
 
 namespace Phantom.Agent.Rpc;
@@ -24,11 +24,11 @@ public static class ServerMessaging {
 		Logger.Information("Server connection ready.");
 	}
 
-	public static Task Send<TMessage>(TMessage message) where TMessage : IMessageToServer {
+	public static Task Send<TMessage>(TMessage message) where TMessage : IMessageToController {
 		return CurrentConnectionOrThrow.Send(message);
 	}
 
-	public static Task<TReply?> Send<TMessage, TReply>(TMessage message, TimeSpan waitForReplyTime, CancellationToken waitForReplyCancellationToken) where TMessage : IMessageToServer<TReply> where TReply : class {
+	public static Task<TReply?> Send<TMessage, TReply>(TMessage message, TimeSpan waitForReplyTime, CancellationToken waitForReplyCancellationToken) where TMessage : IMessageToController<TReply> where TReply : class {
 		return CurrentConnectionOrThrow.Send<TMessage, TReply>(message, waitForReplyTime, waitForReplyCancellationToken);
 	}
 }

Agent/Phantom.Agent.Services/AgentServiceConfiguration.cs

@@ -0,0 +1,3 @@
+namespace Phantom.Agent.Services; 
+
+public readonly record struct AgentServiceConfiguration(int MaxConcurrentCompressionTasks);

Agent/Phantom.Agent.Services/AgentServices.cs

@@ -3,7 +3,7 @@ using Phantom.Agent.Services.Backups;
 using Phantom.Agent.Services.Instances;
 using Phantom.Common.Data.Agent;
 using Phantom.Common.Logging;
-using Phantom.Utils.Runtime;
+using Phantom.Utils.Tasks;
 using Serilog;
 
 namespace Phantom.Agent.Services;
@@ -18,10 +18,10 @@ public sealed class AgentServices {
 	internal JavaRuntimeRepository JavaRuntimeRepository { get; }
 	internal InstanceSessionManager InstanceSessionManager { get; }
 
-	public AgentServices(AgentInfo agentInfo, AgentFolders agentFolders) {
+	public AgentServices(AgentInfo agentInfo, AgentFolders agentFolders, AgentServiceConfiguration serviceConfiguration) {
 		this.AgentFolders = agentFolders;
 		this.TaskManager = new TaskManager(PhantomLogger.Create<TaskManager, AgentServices>());
-		this.BackupManager = new BackupManager(agentFolders);
+		this.BackupManager = new BackupManager(agentFolders, serviceConfiguration.MaxConcurrentCompressionTasks);
 		this.JavaRuntimeRepository = new JavaRuntimeRepository();
 		this.InstanceSessionManager = new InstanceSessionManager(agentInfo, agentFolders, JavaRuntimeRepository, TaskManager, BackupManager);
 	}
@@ -35,11 +35,11 @@ public sealed class AgentServices {
 	public async Task Shutdown() {
 		Logger.Information("Stopping services...");
 		
-		await InstanceSessionManager.StopAll();
+		await InstanceSessionManager.DisposeAsync();
-		InstanceSessionManager.Dispose();
-		
 		await TaskManager.Stop();
 		
+		BackupManager.Dispose();
+		
 		Logger.Information("Services stopped.");
 	}
 }

Agent/Phantom.Agent.Services/Backups/BackupCompressor.cs

@@ -1,5 +1,5 @@
 using Phantom.Common.Logging;
-using Phantom.Utils.Runtime;
+using Phantom.Utils.Processes;
 using Serilog;
 
 namespace Phantom.Agent.Services.Backups; 
@@ -47,10 +47,8 @@ static class BackupCompressor {
 				Quality,
 				Memory,
 				Threads,
-				"-c",
 				"--rm",
 				"--no-progress",
-				"-c",
 				"-o", destinationFilePath,
 				"--", sourceFilePath
 			}

Agent/Phantom.Agent.Services/Backups/BackupManager.cs

@@ -5,44 +5,34 @@ using Serilog;
 
 namespace Phantom.Agent.Services.Backups;
 
-sealed class BackupManager {
+sealed class BackupManager : IDisposable {
 	private readonly string destinationBasePath;
 	private readonly string temporaryBasePath;
+	private readonly SemaphoreSlim compressionSemaphore;
 
-	public BackupManager(AgentFolders agentFolders) {
+	public BackupManager(AgentFolders agentFolders, int maxConcurrentCompressionTasks) {
 		this.destinationBasePath = agentFolders.BackupsFolderPath;
 		this.temporaryBasePath = Path.Combine(agentFolders.TemporaryFolderPath, "backups");
+		this.compressionSemaphore = new SemaphoreSlim(maxConcurrentCompressionTasks, maxConcurrentCompressionTasks);
 	}
 
-	public async Task<BackupCreationResult> CreateBackup(string loggerName, InstanceProcess process, CancellationToken cancellationToken) {
+	public Task<BackupCreationResult> CreateBackup(string loggerName, InstanceProcess process, CancellationToken cancellationToken) {
-		try {
+		return new BackupCreator(this, loggerName, process, cancellationToken).CreateBackup();
-			if (!await process.BackupSemaphore.Wait(TimeSpan.FromSeconds(1), cancellationToken)) {
+	}
-				return new BackupCreationResult(BackupCreationResultKind.BackupAlreadyRunning);
-			}
-		} catch (ObjectDisposedException) {
-			return new BackupCreationResult(BackupCreationResultKind.InstanceNotRunning);
-		} catch (OperationCanceledException) {
-			return new BackupCreationResult(BackupCreationResultKind.InstanceNotRunning);
-		}
 
-		try {
+	public void Dispose() {
-			return await new BackupCreator(destinationBasePath, temporaryBasePath, loggerName, process, cancellationToken).CreateBackup();
+		compressionSemaphore.Dispose();
-		} finally {
-			process.BackupSemaphore.Release();
-		}
 	}
 
 	private sealed class BackupCreator {
-		private readonly string destinationBasePath;
+		private readonly BackupManager manager;
-		private readonly string temporaryBasePath;
 		private readonly string loggerName;
 		private readonly ILogger logger;
 		private readonly InstanceProcess process;
 		private readonly CancellationToken cancellationToken;
 
-		public BackupCreator(string destinationBasePath, string temporaryBasePath, string loggerName, InstanceProcess process, CancellationToken cancellationToken) {
+		public BackupCreator(BackupManager manager, string loggerName, InstanceProcess process, CancellationToken cancellationToken) {
-			this.destinationBasePath = destinationBasePath;
+			this.manager = manager;
-			this.temporaryBasePath = temporaryBasePath;
 			this.loggerName = loggerName;
 			this.logger = PhantomLogger.Create<BackupManager>(loggerName);
 			this.process = process;
@@ -72,7 +62,7 @@ sealed class BackupManager {
 			try {
 				await dispatcher.DisableAutomaticSaving();
 				await dispatcher.SaveAllChunks();
-				return await new BackupArchiver(destinationBasePath, temporaryBasePath, loggerName, process.InstanceProperties, cancellationToken).ArchiveWorld(resultBuilder);
+				return await new BackupArchiver(manager.destinationBasePath, manager.temporaryBasePath, loggerName, process.InstanceProperties, cancellationToken).ArchiveWorld(resultBuilder);
 			} catch (OperationCanceledException) {
 				resultBuilder.Kind = BackupCreationResultKind.BackupCancelled;
 				logger.Warning("Backup creation was cancelled.");
@@ -85,7 +75,7 @@ sealed class BackupManager {
 				try {
 					await dispatcher.EnableAutomaticSaving();
 				} catch (OperationCanceledException) {
-					// ignore
+					// Ignore.
 				} catch (Exception e) {
 					resultBuilder.Warnings |= BackupCreationWarnings.CouldNotRestoreAutomaticSaving;
 					logger.Error(e, "Caught exception while enabling automatic saving after creating an instance backup.");
@@ -94,9 +84,19 @@ sealed class BackupManager {
 		}
 		
 		private async Task CompressWorldArchive(string filePath, BackupCreationResult.Builder resultBuilder) {
-			var compressedFilePath = await BackupCompressor.Compress(filePath, cancellationToken);
+			if (!await manager.compressionSemaphore.WaitAsync(TimeSpan.FromSeconds(1), cancellationToken)) {
-			if (compressedFilePath == null) {
+				logger.Information("Too many compression tasks running, waiting for one of them to complete...");
-				resultBuilder.Warnings |= BackupCreationWarnings.CouldNotCompressWorldArchive;
+				await manager.compressionSemaphore.WaitAsync(cancellationToken);
+			}
+
+			logger.Information("Compressing backup...");
+			try {
+				var compressedFilePath = await BackupCompressor.Compress(filePath, cancellationToken);
+				if (compressedFilePath == null) {
+					resultBuilder.Warnings |= BackupCreationWarnings.CouldNotCompressWorldArchive;
+				}
+			} finally {
+				manager.compressionSemaphore.Release();
 			}
 		}
 

Agent/Phantom.Agent.Services/Backups/BackupScheduler.cs

@@ -1,8 +1,11 @@
 using Phantom.Agent.Minecraft.Instance;
 using Phantom.Agent.Minecraft.Server;
+using Phantom.Agent.Services.Instances;
+using Phantom.Agent.Services.Instances.Procedures;
 using Phantom.Common.Data.Backups;
 using Phantom.Common.Logging;
-using Phantom.Utils.Runtime;
+using Phantom.Utils.Tasks;
+using Phantom.Utils.Threading;
 
 namespace Phantom.Agent.Services.Backups;
 
@@ -12,21 +15,23 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 	private static readonly TimeSpan BackupInterval = TimeSpan.FromMinutes(30);
 	private static readonly TimeSpan BackupFailureRetryDelay = TimeSpan.FromMinutes(5);
 
-	private readonly string loggerName;
 	private readonly BackupManager backupManager;
 	private readonly InstanceProcess process;
+	private readonly IInstanceContext context;
+	private readonly SemaphoreSlim backupSemaphore = new (1, 1);
 	private readonly int serverPort;
 	private readonly ServerStatusProtocol serverStatusProtocol;
 	private readonly ManualResetEventSlim serverOutputWhileWaitingForOnlinePlayers = new ();
 	
 	public event EventHandler<BackupCreationResult>? BackupCompleted; 
 
-	public BackupScheduler(TaskManager taskManager, BackupManager backupManager, InstanceProcess process, int serverPort, string loggerName) : base(PhantomLogger.Create<BackupScheduler>(loggerName), taskManager, "Backup scheduler for " + loggerName) {
+	public BackupScheduler(TaskManager taskManager, BackupManager backupManager, InstanceProcess process, IInstanceContext context, int serverPort) : base(PhantomLogger.Create<BackupScheduler>(context.ShortName), taskManager, "Backup scheduler for " + context.ShortName) {
-		this.loggerName = loggerName;
 		this.backupManager = backupManager;
 		this.process = process;
+		this.context = context;
 		this.serverPort = serverPort;
-		this.serverStatusProtocol = new ServerStatusProtocol(loggerName);
+		this.serverStatusProtocol = new ServerStatusProtocol(context.ShortName);
+		Start();
 	}
 
 	protected override async Task RunTask() {
@@ -50,7 +55,17 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 	}
 
 	private async Task<BackupCreationResult> CreateBackup() {
-		return await backupManager.CreateBackup(loggerName, process, CancellationToken.None);
+		if (!await backupSemaphore.WaitAsync(TimeSpan.FromSeconds(1))) {
+			return new BackupCreationResult(BackupCreationResultKind.BackupAlreadyRunning);
+		}
+		
+		try {
+			var procedure = new BackupInstanceProcedure(backupManager);
+			context.EnqueueProcedure(procedure);
+			return await procedure.Result;
+		} finally {
+			backupSemaphore.Release();
+		}
 	}
 
 	private async Task WaitForOnlinePlayers() {
@@ -93,4 +108,9 @@ sealed class BackupScheduler : CancellableBackgroundTask {
 			Logger.Debug("Detected server output, signalling to check for online players again.");
 		}
 	}
+
+	protected override void Dispose() {
+		backupSemaphore.Dispose();
+		serverOutputWhileWaitingForOnlinePlayers.Dispose();
+	}
 }

Agent/Phantom.Agent.Services/Backups/BackupServerCommandDispatcher.cs

@@ -1,7 +1,7 @@
 using System.Text.RegularExpressions;
 using Phantom.Agent.Minecraft.Command;
 using Phantom.Agent.Minecraft.Instance;
-using Phantom.Utils.Runtime;
+using Phantom.Utils.Tasks;
 using Serilog;
 
 namespace Phantom.Agent.Services.Backups;
@@ -14,9 +14,9 @@ sealed partial class BackupServerCommandDispatcher : IDisposable {
 	private readonly InstanceProcess process;
 	private readonly CancellationToken cancellationToken;
 
-	private readonly TaskCompletionSource automaticSavingDisabled = Tasks.CreateCompletionSource();
+	private readonly TaskCompletionSource automaticSavingDisabled = AsyncTasks.CreateCompletionSource();
-	private readonly TaskCompletionSource savedTheGame = Tasks.CreateCompletionSource();
+	private readonly TaskCompletionSource savedTheGame = AsyncTasks.CreateCompletionSource();
-	private readonly TaskCompletionSource automaticSavingEnabled = Tasks.CreateCompletionSource();
+	private readonly TaskCompletionSource automaticSavingEnabled = AsyncTasks.CreateCompletionSource();
 
 	public BackupServerCommandDispatcher(ILogger logger, InstanceProcess process, CancellationToken cancellationToken) {
 		this.logger = logger;

Agent/Phantom.Agent.Services/Instances/IInstanceContext.cs

@@ -0,0 +1,25 @@
+using Phantom.Agent.Services.Instances.Procedures;
+using Phantom.Agent.Services.Instances.States;
+using Phantom.Common.Data.Instance;
+using Serilog;
+
+namespace Phantom.Agent.Services.Instances; 
+
+interface IInstanceContext {
+	string ShortName { get; }
+	ILogger Logger { get; }
+	
+	InstanceServices Services { get; }
+	IInstanceState CurrentState { get; }
+
+	void SetStatus(IInstanceStatus newStatus);
+	void ReportEvent(IInstanceEvent instanceEvent);
+	void EnqueueProcedure(IInstanceProcedure procedure, bool immediate = false);
+}
+
+static class InstanceContextExtensions {
+	public static void SetLaunchFailedStatusAndReportEvent(this IInstanceContext context, InstanceLaunchFailReason reason) {
+		context.SetStatus(InstanceStatus.Failed(reason));
+		context.ReportEvent(new InstanceLaunchFailedEvent(reason));
+	}
+}

Agent/Phantom.Agent.Services/Instances/Instance.cs

@@ -1,27 +1,22 @@
 using Phantom.Agent.Minecraft.Launcher;
 using Phantom.Agent.Rpc;
+using Phantom.Agent.Services.Instances.Procedures;
 using Phantom.Agent.Services.Instances.States;
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Replies;
 using Phantom.Common.Logging;
-using Phantom.Common.Messages.ToServer;
+using Phantom.Common.Messages.Agent.ToController;
 using Serilog;
 
 namespace Phantom.Agent.Services.Instances;
 
-sealed class Instance : IDisposable {
+sealed class Instance : IAsyncDisposable {
-	private static uint loggerSequenceId = 0;
-
-	private static string GetLoggerName(Guid guid) {
-		var prefix = guid.ToString();
-		return prefix[..prefix.IndexOf('-')] + "/" + Interlocked.Increment(ref loggerSequenceId);
-	}
-
 	private InstanceServices Services { get; }
 	
 	public InstanceConfiguration Configuration { get; private set; }
 	private IServerLauncher Launcher { get; set; }
+	private readonly SemaphoreSlim configurationSemaphore = new (1, 1);
 
 	private readonly string shortName;
 	private readonly ILogger logger;
@@ -30,14 +25,14 @@ sealed class Instance : IDisposable {
 	private int statusUpdateCounter;
 	
 	private IInstanceState currentState;
-	private readonly SemaphoreSlim stateTransitioningActionSemaphore = new (1, 1);
-
 	public bool IsRunning => currentState is not InstanceNotRunningState;
 	
 	public event EventHandler? IsRunningChanged; 
 	
-	public Instance(InstanceServices services, InstanceConfiguration configuration, IServerLauncher launcher) {
+	private readonly InstanceProcedureManager procedureManager;
-		this.shortName = GetLoggerName(configuration.InstanceGuid);
+
+	public Instance(string shortName, InstanceServices services, InstanceConfiguration configuration, IServerLauncher launcher) {
+		this.shortName = shortName;
 		this.logger = PhantomLogger.Create<Instance>(shortName);
 
 		this.Services = services;
@@ -46,6 +41,8 @@ sealed class Instance : IDisposable {
 		
 		this.currentState = new InstanceNotRunningState();
 		this.currentStatus = InstanceStatus.NotRunning;
+		
+		this.procedureManager = new InstanceProcedureManager(this, new Context(this), services.TaskManager);
 	}
 
 	private void TryUpdateStatus(string taskName, Func<Task> getUpdateTask) {
@@ -66,8 +63,10 @@ sealed class Instance : IDisposable {
 
 	private void ReportAndSetStatus(IInstanceStatus status) {
 		TryUpdateStatus("Report status of instance " + shortName + " as " + status.GetType().Name, async () => {
-			currentStatus = status;
+			if (status != currentStatus) {
-			await ServerMessaging.Send(new ReportInstanceStatusMessage(Configuration.InstanceGuid, status));
+				currentStatus = status;
+				await ServerMessaging.Send(new ReportInstanceStatusMessage(Configuration.InstanceGuid, status));
+			}
 		});
 	}
 
@@ -76,7 +75,7 @@ sealed class Instance : IDisposable {
 		Services.TaskManager.Run("Report event for instance " + shortName, async () => await ServerMessaging.Send(message));
 	}
 	
-	private void TransitionState(IInstanceState newState) {
+	internal void TransitionState(IInstanceState newState) {
 		if (currentState == newState) {
 			return;
 		}
@@ -96,114 +95,94 @@ sealed class Instance : IDisposable {
 		}
 	}
 
-	private T TransitionStateAndReturn<T>((IInstanceState State, T Result) newStateAndResult) {
-		TransitionState(newStateAndResult.State);
-		return newStateAndResult.Result;
-	}
-
 	public async Task Reconfigure(InstanceConfiguration configuration, IServerLauncher launcher, CancellationToken cancellationToken) {
-		await stateTransitioningActionSemaphore.WaitAsync(cancellationToken);
+		await configurationSemaphore.WaitAsync(cancellationToken);
 		try {
 			Configuration = configuration;
 			Launcher = launcher;
 		} finally {
-			stateTransitioningActionSemaphore.Release();
+			configurationSemaphore.Release();
 		}
 	}
 
-	public async Task<LaunchInstanceResult> Launch(CancellationToken shutdownCancellationToken) {
+	public async Task<LaunchInstanceResult> Launch(CancellationToken cancellationToken) {
-		await stateTransitioningActionSemaphore.WaitAsync(shutdownCancellationToken);
+		if (IsRunning) {
+			return LaunchInstanceResult.InstanceAlreadyRunning;
+		}
+
+		if (await procedureManager.GetCurrentProcedure(cancellationToken) is LaunchInstanceProcedure) {
+			return LaunchInstanceResult.InstanceAlreadyLaunching;
+		}
+		
+		LaunchInstanceProcedure procedure;
+		
+		await configurationSemaphore.WaitAsync(cancellationToken);
 		try {
-			return TransitionStateAndReturn(currentState.Launch(new InstanceContextImpl(this, shutdownCancellationToken)));
+			procedure = new LaunchInstanceProcedure(Configuration, Launcher);
-		} catch (Exception e) {
-			logger.Error(e, "Caught exception while launching instance.");
-			return LaunchInstanceResult.UnknownError;
 		} finally {
-			stateTransitioningActionSemaphore.Release();
+			configurationSemaphore.Release();
 		}
+		
+		ReportAndSetStatus(InstanceStatus.Launching);
+		await procedureManager.Enqueue(procedure);
+		return LaunchInstanceResult.LaunchInitiated;
 	}
 
-	public async Task<StopInstanceResult> Stop(MinecraftStopStrategy stopStrategy) {
+	public async Task<StopInstanceResult> Stop(MinecraftStopStrategy stopStrategy, CancellationToken cancellationToken) {
-		await stateTransitioningActionSemaphore.WaitAsync();
+		if (!IsRunning) {
-		try {
+			return StopInstanceResult.InstanceAlreadyStopped;
-			return TransitionStateAndReturn(currentState.Stop(stopStrategy));
-		} catch (Exception e) {
-			logger.Error(e, "Caught exception while stopping instance.");
-			return StopInstanceResult.UnknownError;
-		} finally {
-			stateTransitioningActionSemaphore.Release();
 		}
-	}
 		
-	public async Task StopAndWait(TimeSpan waitTime) {
+		if (await procedureManager.GetCurrentProcedure(cancellationToken) is StopInstanceProcedure) {
-		await Stop(MinecraftStopStrategy.Instant);
+			return StopInstanceResult.InstanceAlreadyStopping;
-
-		using var waitTokenSource = new CancellationTokenSource(waitTime);
-		var waitToken = waitTokenSource.Token;
-
-		while (currentState is not InstanceNotRunningState) {
-			await Task.Delay(TimeSpan.FromMilliseconds(250), waitToken);
 		}
+		
+		ReportAndSetStatus(InstanceStatus.Stopping);
+		await procedureManager.Enqueue(new StopInstanceProcedure(stopStrategy));
+		return StopInstanceResult.StopInitiated;
 	}
 
 	public async Task<bool> SendCommand(string command, CancellationToken cancellationToken) {
 		return await currentState.SendCommand(command, cancellationToken);
 	}
 
-	private sealed class InstanceContextImpl : InstanceContext {
+	public async ValueTask DisposeAsync() {
-		private readonly Instance instance;
+		await procedureManager.DisposeAsync();
-		private readonly CancellationToken shutdownCancellationToken;
 
-		public InstanceContextImpl(Instance instance, CancellationToken shutdownCancellationToken) : base(instance.Services, instance.Configuration, instance.Launcher) {
+		while (currentState is not InstanceNotRunningState) {
-			this.instance = instance;
+			await Task.Delay(TimeSpan.FromMilliseconds(250), CancellationToken.None);
-			this.shutdownCancellationToken = shutdownCancellationToken;
 		}
 
-		public override ILogger Logger => instance.logger;
-		public override string ShortName => instance.shortName;
-
-		public override void SetStatus(IInstanceStatus newStatus) {
-			instance.ReportAndSetStatus(newStatus);
-		}
-
-		public override void ReportEvent(IInstanceEvent instanceEvent) {
-			instance.ReportEvent(instanceEvent);
-		}
-
-		public override void TransitionState(Func<(IInstanceState, IInstanceStatus?)> newStateAndStatus) {
-			instance.stateTransitioningActionSemaphore.Wait(CancellationToken.None);
-			try {
-				var (state, status) = newStateAndStatus();
-				
-				if (!instance.IsRunning) {
-					// Only InstanceSessionManager is allowed to transition an instance out of a non-running state.
-					instance.logger.Debug("Cancelled state transition to {State} because instance is not running.", state.GetType().Name);
-					return;
-				}
-				
-				if (state is not InstanceNotRunningState && shutdownCancellationToken.IsCancellationRequested) {
-					instance.logger.Debug("Cancelled state transition to {State} due to Agent shutdown.", state.GetType().Name);
-					return;
-				}
-
-				if (status != null) {
-					SetStatus(status);
-				}
-
-				instance.TransitionState(state);
-			} catch (Exception e) {
-				instance.logger.Error(e, "Caught exception during state transition.");
-			} finally {
-				instance.stateTransitioningActionSemaphore.Release();
-			}
-		}
-	}
-
-	public void Dispose() {
-		stateTransitioningActionSemaphore.Dispose();
-		
 		if (currentState is IDisposable disposable) {
 			disposable.Dispose();
 		}
+		
+		configurationSemaphore.Dispose();
+	}
+
+	private sealed class Context : IInstanceContext {
+		public string ShortName => instance.shortName;
+		public ILogger Logger => instance.logger;
+		
+		public InstanceServices Services => instance.Services;
+		public IInstanceState CurrentState => instance.currentState;
+
+		private readonly Instance instance;
+		
+		public Context(Instance instance) {
+			this.instance = instance;
+		}
+
+		public void SetStatus(IInstanceStatus newStatus) {
+			instance.ReportAndSetStatus(newStatus);
+		}
+
+		public void ReportEvent(IInstanceEvent instanceEvent) {
+			instance.ReportEvent(instanceEvent);
+		}
+
+		public void EnqueueProcedure(IInstanceProcedure procedure, bool immediate) {
+			Services.TaskManager.Run("Enqueue procedure for instance " + instance.shortName, () => instance.procedureManager.Enqueue(procedure, immediate));
+		}
 	}
 }

Agent/Phantom.Agent.Services/Instances/InstanceContext.cs

@@ -1,35 +0,0 @@
-using Phantom.Agent.Minecraft.Launcher;
-using Phantom.Agent.Services.Instances.States;
-using Phantom.Common.Data.Instance;
-using Serilog;
-
-namespace Phantom.Agent.Services.Instances;
-
-abstract class InstanceContext {
-	public InstanceServices Services { get; }
-	public InstanceConfiguration Configuration { get; }
-	public IServerLauncher Launcher { get; }
-	
-	public abstract ILogger Logger { get; }
-	public abstract string ShortName { get; }
-
-	protected InstanceContext(InstanceServices services, InstanceConfiguration configuration, IServerLauncher launcher) {
-		Services = services;
-		Configuration = configuration;
-		Launcher = launcher;
-	}
-
-	public abstract void SetStatus(IInstanceStatus newStatus);
-
-	public void SetLaunchFailedStatusAndReportEvent(InstanceLaunchFailReason reason) {
-		SetStatus(InstanceStatus.Failed(reason));
-		ReportEvent(new InstanceLaunchFailedEvent(reason));
-	}
-
-	public abstract void ReportEvent(IInstanceEvent instanceEvent);
-	public abstract void TransitionState(Func<(IInstanceState, IInstanceStatus?)> newStateAndStatus);
-
-	public void TransitionState(IInstanceState newState, IInstanceStatus? newStatus = null) {
-		TransitionState(() => (newState, newStatus));
-	}
-}

Agent/Phantom.Agent.Services/Instances/InstanceLogSender.cs

@@ -1,36 +1,62 @@
 using System.Collections.Immutable;
+using System.Threading.Channels;
 using Phantom.Agent.Rpc;
 using Phantom.Common.Logging;
-using Phantom.Common.Messages.ToServer;
+using Phantom.Common.Messages.Agent.ToController;
-using Phantom.Utils.Collections;
+using Phantom.Utils.Tasks;
-using Phantom.Utils.Runtime;
 
 namespace Phantom.Agent.Services.Instances;
 
 sealed class InstanceLogSender : CancellableBackgroundTask {
+	private static readonly BoundedChannelOptions BufferOptions = new (capacity: 64) {
+		SingleReader = true,
+		SingleWriter = true,
+		FullMode = BoundedChannelFullMode.DropNewest
+	};
+	
 	private static readonly TimeSpan SendDelay = TimeSpan.FromMilliseconds(200);
 
 	private readonly Guid instanceGuid;
+	private readonly Channel<string> outputChannel;
 	
-	private readonly SemaphoreSlim semaphore = new (1, 1);
+	private int droppedLinesSinceLastSend;
-	private readonly RingBuffer<string> buffer = new (1000);
 
 	public InstanceLogSender(TaskManager taskManager, Guid instanceGuid, string loggerName) : base(PhantomLogger.Create<InstanceLogSender>(loggerName), taskManager, "Instance log sender for " + loggerName) {
 		this.instanceGuid = instanceGuid;
+		this.outputChannel = Channel.CreateBounded<string>(BufferOptions, OnLineDropped);
+		Start();
 	}
 	
 	protected override async Task RunTask() {
+		var lineReader = outputChannel.Reader;
+		var lineBuilder = ImmutableArray.CreateBuilder<string>();
+		
 		try {
-			while (!CancellationToken.IsCancellationRequested) {
+			while (await lineReader.WaitToReadAsync(CancellationToken)) {
-				await SendOutputToServer(await DequeueOrThrow());
 				await Task.Delay(SendDelay, CancellationToken);
+				await SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder));
 			}
 		} catch (OperationCanceledException) {
 			// Ignore.
 		}
 
 		// Flush remaining lines.
-		await SendOutputToServer(DequeueWithoutSemaphore());
+		await SendOutputToServer(ReadLinesFromChannel(lineReader, lineBuilder));
+	}
+
+	private ImmutableArray<string> ReadLinesFromChannel(ChannelReader<string> reader, ImmutableArray<string>.Builder builder) {
+		builder.Clear();
+		
+		while (reader.TryRead(out string? line)) {
+			builder.Add(line);
+		}
+		
+		int droppedLines = Interlocked.Exchange(ref droppedLinesSinceLastSend, 0);
+		if (droppedLines > 0) {
+			builder.Add($"Dropped {droppedLines} {(droppedLines == 1 ? "line" : "lines")} due to buffer overflow.");
+		}
+		
+		return builder.ToImmutable();
 	}
 
 	private async Task SendOutputToServer(ImmutableArray<string> lines) {
@@ -39,33 +65,18 @@ sealed class InstanceLogSender : CancellableBackgroundTask {
 		}
 	}
 
-	private ImmutableArray<string> DequeueWithoutSemaphore() {
+	private void OnLineDropped(string line) {
-		ImmutableArray<string> lines = buffer.Count > 0 ? buffer.EnumerateLast(uint.MaxValue).ToImmutableArray() : ImmutableArray<string>.Empty;
+		Logger.Warning("Buffer is full, dropped line: {Line}", line);
-		buffer.Clear();
+		Interlocked.Increment(ref droppedLinesSinceLastSend);
-		return lines;
-	}
-
-	private async Task<ImmutableArray<string>> DequeueOrThrow() {
-		await semaphore.WaitAsync(CancellationToken);
-
-		try {
-			return DequeueWithoutSemaphore();
-		} finally {
-			semaphore.Release();
-		}
 	}
 
 	public void Enqueue(string line) {
-		try {
+		outputChannel.Writer.TryWrite(line);
-			semaphore.Wait(CancellationToken);
+	}
-		} catch (Exception) {
-			return;
-		}
 
-		try {
+	protected override void Dispose() {
-			buffer.Add(line);
+		if (!outputChannel.Writer.TryComplete()) {
-		} finally {
+			Logger.Error("Could not mark channel as completed.");
-			semaphore.Release();
 		}
 	}
 }

Agent/Phantom.Agent.Services/Instances/InstanceProcedureManager.cs

@@ -0,0 +1,85 @@
+using Phantom.Agent.Services.Instances.Procedures;
+using Phantom.Common.Data.Minecraft;
+using Phantom.Utils.Tasks;
+using Phantom.Utils.Threading;
+
+namespace Phantom.Agent.Services.Instances;
+
+sealed class InstanceProcedureManager : IAsyncDisposable {
+	private readonly record struct CurrentProcedure(IInstanceProcedure Procedure, CancellationTokenSource CancellationTokenSource);
+
+	private readonly ThreadSafeStructRef<CurrentProcedure> currentProcedure = new ();
+	private readonly ThreadSafeLinkedList<IInstanceProcedure> procedureQueue = new ();
+	private readonly AutoResetEvent procedureQueueReady = new (false);
+	private readonly ManualResetEventSlim procedureQueueFinished = new (false);
+
+	private readonly Instance instance;
+	private readonly IInstanceContext context;
+	private readonly CancellationTokenSource shutdownCancellationTokenSource = new ();
+
+	public InstanceProcedureManager(Instance instance, IInstanceContext context, TaskManager taskManager) {
+		this.instance = instance;
+		this.context = context;
+		taskManager.Run("Procedure manager for instance " + context.ShortName, Run);
+	}
+
+	public async Task Enqueue(IInstanceProcedure procedure, bool immediate = false) {
+		await procedureQueue.Add(procedure, toFront: immediate, shutdownCancellationTokenSource.Token);
+		procedureQueueReady.Set();
+	}
+
+	public async Task<IInstanceProcedure?> GetCurrentProcedure(CancellationToken cancellationToken) {
+		return (await currentProcedure.Get(cancellationToken))?.Procedure;
+	}
+
+	private async Task Run() {
+		try {
+			var shutdownCancellationToken = shutdownCancellationTokenSource.Token;
+			while (true) {
+				await procedureQueueReady.WaitOneAsync(shutdownCancellationToken);
+				while (await procedureQueue.TryTakeFromFront(shutdownCancellationToken) is {} nextProcedure) {
+					using var procedureCancellationTokenSource = new CancellationTokenSource();
+					await currentProcedure.Set(new CurrentProcedure(nextProcedure, procedureCancellationTokenSource), shutdownCancellationToken);
+					await RunProcedure(nextProcedure, procedureCancellationTokenSource.Token);
+					await currentProcedure.Set(null, shutdownCancellationToken);
+				}
+			}
+		} catch (OperationCanceledException) {
+			// Ignore.
+		}
+
+		await RunProcedure(new StopInstanceProcedure(MinecraftStopStrategy.Instant), CancellationToken.None);
+		procedureQueueFinished.Set();
+	}
+
+	private async Task RunProcedure(IInstanceProcedure procedure, CancellationToken cancellationToken) {
+		var procedureName = procedure.GetType().Name;
+
+		context.Logger.Debug("Started procedure: {Procedure}", procedureName);
+		try {
+			var newState = await procedure.Run(context, cancellationToken);
+			context.Logger.Debug("Finished procedure: {Procedure}", procedureName);
+
+			if (newState != null) {
+				instance.TransitionState(newState);
+			}
+		} catch (OperationCanceledException) {
+			context.Logger.Debug("Cancelled procedure: {Procedure}", procedureName);
+		} catch (Exception e) {
+			context.Logger.Error(e, "Caught exception while running procedure: {Procedure}", procedureName);
+		}
+	}
+
+	public async ValueTask DisposeAsync() {
+		shutdownCancellationTokenSource.Cancel();
+
+		(await currentProcedure.Get(CancellationToken.None))?.CancellationTokenSource.Cancel();
+		await procedureQueueFinished.WaitHandle.WaitOneAsync();
+
+		currentProcedure.Dispose();
+		procedureQueue.Dispose();
+		procedureQueueReady.Dispose();
+		procedureQueueFinished.Dispose();
+		shutdownCancellationTokenSource.Dispose();
+	}
+}

Agent/Phantom.Agent.Services/Instances/InstanceServices.cs

@@ -1,6 +1,6 @@
 using Phantom.Agent.Minecraft.Launcher;
 using Phantom.Agent.Services.Backups;
-using Phantom.Utils.Runtime;
+using Phantom.Utils.Tasks;
 
 namespace Phantom.Agent.Services.Instances; 
 

Agent/Phantom.Agent.Services/Instances/InstanceSessionManager.cs

@@ -14,14 +14,14 @@ using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Replies;
 using Phantom.Common.Logging;
-using Phantom.Common.Messages.ToServer;
+using Phantom.Common.Messages.Agent.ToController;
 using Phantom.Utils.IO;
-using Phantom.Utils.Runtime;
+using Phantom.Utils.Tasks;
 using Serilog;
 
 namespace Phantom.Agent.Services.Instances;
 
-sealed class InstanceSessionManager : IDisposable {
+sealed class InstanceSessionManager : IAsyncDisposable {
 	private static readonly ILogger Logger = PhantomLogger.Create<InstanceSessionManager>();
 
 	private readonly AgentInfo agentInfo;
@@ -34,6 +34,8 @@ sealed class InstanceSessionManager : IDisposable {
 	private readonly CancellationToken shutdownCancellationToken;
 	private readonly SemaphoreSlim semaphore = new (1, 1);
 
+	private uint instanceLoggerSequenceId = 0;
+
 	public InstanceSessionManager(AgentInfo agentInfo, AgentFolders agentFolders, JavaRuntimeRepository javaRuntimeRepository, TaskManager taskManager, BackupManager backupManager) {
 		this.agentInfo = agentInfo;
 		this.basePath = agentFolders.InstancesFolderPath;
@@ -109,7 +111,7 @@ sealed class InstanceSessionManager : IDisposable {
 				}
 			}
 			else {
-				instances[instanceGuid] = instance = new Instance(instanceServices, configuration, launcher);
+				instances[instanceGuid] = instance = new Instance(GetInstanceLoggerName(instanceGuid), instanceServices, configuration, launcher);
 				Logger.Information("Created instance \"{Name}\" (GUID {Guid}).", configuration.InstanceName, configuration.InstanceGuid);
 
 				instance.ReportLastStatus();
@@ -124,6 +126,11 @@ sealed class InstanceSessionManager : IDisposable {
 		});
 	}
 
+	private string GetInstanceLoggerName(Guid guid) {
+		var prefix = guid.ToString();
+		return prefix[..prefix.IndexOf('-')] + "/" + Interlocked.Increment(ref instanceLoggerSequenceId);
+	}
+
 	private ImmutableArray<Instance> GetRunningInstancesInternal() {
 		return instances.Values.Where(static instance => instance.IsRunning).ToImmutableArray();
 	}
@@ -167,38 +174,23 @@ sealed class InstanceSessionManager : IDisposable {
 	}
 
 	public Task<InstanceActionResult<StopInstanceResult>> Stop(Guid instanceGuid, MinecraftStopStrategy stopStrategy) {
-		return AcquireSemaphoreAndRunWithInstance(instanceGuid, instance => instance.Stop(stopStrategy));
+		return AcquireSemaphoreAndRunWithInstance(instanceGuid, instance => instance.Stop(stopStrategy, shutdownCancellationToken));
 	}
 
 	public Task<InstanceActionResult<SendCommandToInstanceResult>> SendCommand(Guid instanceGuid, string command) {
 		return AcquireSemaphoreAndRunWithInstance(instanceGuid, async instance => await instance.SendCommand(command, shutdownCancellationToken) ? SendCommandToInstanceResult.Success : SendCommandToInstanceResult.UnknownError);
 	}
 
-	public async Task StopAll() {
+	public async ValueTask DisposeAsync() {
-		shutdownCancellationTokenSource.Cancel();
-		
 		Logger.Information("Stopping all instances...");
 		
-		await semaphore.WaitAsync(CancellationToken.None);
+		shutdownCancellationTokenSource.Cancel();
-		try {
+
-			await Task.WhenAll(instances.Values.Select(static instance => instance.StopAndWait(TimeSpan.FromSeconds(30))));
+		await semaphore.WaitAsync(CancellationToken.None);
-			DisposeAllInstances();
+		await Task.WhenAll(instances.Values.Select(static instance => instance.DisposeAsync().AsTask()));
-		} finally {
+		instances.Clear();
-			semaphore.Release();
-		}
-	}
 		
-	public void Dispose() {
-		DisposeAllInstances();
 		shutdownCancellationTokenSource.Dispose();
 		semaphore.Dispose();
 	}
-
-	private void DisposeAllInstances() {
-		foreach (var (_, instance) in instances) {
-			instance.Dispose();
-		}
-
-		instances.Clear();
-	}
 }

Agent/Phantom.Agent.Services/Instances/Procedures/BackupInstanceProcedure.cs

@@ -0,0 +1,29 @@
+using Phantom.Agent.Services.Backups;
+using Phantom.Agent.Services.Instances.States;
+using Phantom.Common.Data.Backups;
+
+namespace Phantom.Agent.Services.Instances.Procedures;
+
+sealed record BackupInstanceProcedure(BackupManager BackupManager) : IInstanceProcedure {
+	private readonly TaskCompletionSource<BackupCreationResult> resultCompletionSource = new ();
+
+	public Task<BackupCreationResult> Result => resultCompletionSource.Task;
+
+	public async Task<IInstanceState?> Run(IInstanceContext context, CancellationToken cancellationToken) {
+		if (context.CurrentState is not InstanceRunningState runningState || runningState.Process.HasEnded) {
+			resultCompletionSource.SetResult(new BackupCreationResult(BackupCreationResultKind.InstanceNotRunning));
+			return null;
+		}
+
+		try {
+			var result = await BackupManager.CreateBackup(context.ShortName, runningState.Process, cancellationToken);
+			resultCompletionSource.SetResult(result);
+		} catch (OperationCanceledException) {
+			resultCompletionSource.SetCanceled(cancellationToken);
+		} catch (Exception e) {
+			resultCompletionSource.SetException(e);
+		}
+
+		return null;
+	}
+}

Agent/Phantom.Agent.Services/Instances/Procedures/IInstanceProcedure.cs

@@ -0,0 +1,7 @@
+using Phantom.Agent.Services.Instances.States;
+
+namespace Phantom.Agent.Services.Instances.Procedures; 
+
+interface IInstanceProcedure {
+	Task<IInstanceState?> Run(IInstanceContext context, CancellationToken cancellationToken);
+}

Agent/Phantom.Agent.Services/Instances/Procedures/LaunchInstanceProcedure.cs

@@ -0,0 +1,97 @@
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Launcher;
+using Phantom.Agent.Minecraft.Server;
+using Phantom.Agent.Services.Instances.States;
+using Phantom.Common.Data.Instance;
+
+namespace Phantom.Agent.Services.Instances.Procedures;
+
+sealed record LaunchInstanceProcedure(InstanceConfiguration Configuration, IServerLauncher Launcher, bool IsRestarting = false) : IInstanceProcedure {
+	public async Task<IInstanceState?> Run(IInstanceContext context, CancellationToken cancellationToken) {
+		if (!IsRestarting && context.CurrentState is InstanceRunningState) {
+			return null;
+		}
+		
+		context.SetStatus(IsRestarting ? InstanceStatus.Restarting : InstanceStatus.Launching);
+
+		InstanceLaunchFailReason? failReason = context.Services.PortManager.Reserve(Configuration) switch {
+			PortManager.Result.ServerPortNotAllowed   => InstanceLaunchFailReason.ServerPortNotAllowed,
+			PortManager.Result.ServerPortAlreadyInUse => InstanceLaunchFailReason.ServerPortAlreadyInUse,
+			PortManager.Result.RconPortNotAllowed     => InstanceLaunchFailReason.RconPortNotAllowed,
+			PortManager.Result.RconPortAlreadyInUse   => InstanceLaunchFailReason.RconPortAlreadyInUse,
+			_                                         => null
+		};
+
+		if (failReason is {} reason) {
+			context.SetLaunchFailedStatusAndReportEvent(reason);
+			return new InstanceNotRunningState();
+		}
+		
+		context.Logger.Information("Session starting...");
+		try {
+			InstanceProcess process = await DoLaunch(context, cancellationToken);
+			return new InstanceRunningState(Configuration, Launcher, process, context);
+		} catch (OperationCanceledException) {
+			context.SetStatus(InstanceStatus.NotRunning);
+		} catch (LaunchFailureException e) {
+			context.Logger.Error(e.LogMessage);
+			context.SetLaunchFailedStatusAndReportEvent(e.Reason);
+		} catch (Exception e) {
+			context.Logger.Error(e, "Caught exception while launching instance.");
+			context.SetLaunchFailedStatusAndReportEvent(InstanceLaunchFailReason.UnknownError);
+		}
+		
+		context.Services.PortManager.Release(Configuration);
+		return new InstanceNotRunningState();
+	}
+
+	private async Task<InstanceProcess> DoLaunch(IInstanceContext context, CancellationToken cancellationToken) {
+		cancellationToken.ThrowIfCancellationRequested();
+
+		byte lastDownloadProgress = byte.MaxValue;
+
+		void OnDownloadProgress(object? sender, DownloadProgressEventArgs args) {
+			byte progress = (byte) Math.Min(args.DownloadedBytes * 100 / args.TotalBytes, 100);
+
+			if (lastDownloadProgress != progress) {
+				lastDownloadProgress = progress;
+				context.SetStatus(InstanceStatus.Downloading(progress));
+			}
+		}
+
+		var launchResult = await Launcher.Launch(context.Logger, context.Services.LaunchServices, OnDownloadProgress, cancellationToken);
+		if (launchResult is LaunchResult.InvalidJavaRuntime) {
+			throw new LaunchFailureException(InstanceLaunchFailReason.JavaRuntimeNotFound, "Session failed to launch, invalid Java runtime.");
+		}
+		else if (launchResult is LaunchResult.CouldNotDownloadMinecraftServer) {
+			throw new LaunchFailureException(InstanceLaunchFailReason.CouldNotDownloadMinecraftServer, "Session failed to launch, could not download Minecraft server.");
+		}
+		else if (launchResult is LaunchResult.CouldNotPrepareMinecraftServerLauncher) {
+			throw new LaunchFailureException(InstanceLaunchFailReason.CouldNotPrepareMinecraftServerLauncher, "Session failed to launch, could not prepare Minecraft server launcher.");
+		}
+		else if (launchResult is LaunchResult.CouldNotConfigureMinecraftServer) {
+			throw new LaunchFailureException(InstanceLaunchFailReason.CouldNotConfigureMinecraftServer, "Session failed to launch, could not configure Minecraft server.");
+		}
+		else if (launchResult is LaunchResult.CouldNotStartMinecraftServer) {
+			throw new LaunchFailureException(InstanceLaunchFailReason.CouldNotStartMinecraftServer, "Session failed to launch, could not start Minecraft server.");
+		}
+
+		if (launchResult is not LaunchResult.Success launchSuccess) {
+			throw new LaunchFailureException(InstanceLaunchFailReason.UnknownError, "Session failed to launch.");
+		}
+
+		context.SetStatus(InstanceStatus.Running);
+		context.ReportEvent(InstanceEvent.LaunchSucceded);
+		return launchSuccess.Process;
+	}
+
+	private sealed class LaunchFailureException : Exception {
+		public InstanceLaunchFailReason Reason { get; }
+		public string LogMessage { get; }
+
+		public LaunchFailureException(InstanceLaunchFailReason reason, string logMessage) {
+			this.Reason = reason;
+			this.LogMessage = logMessage;
+		}
+	}
+}

Agent/Phantom.Agent.Services/Instances/Procedures/SetInstanceToNotRunningStateProcedure.cs

@@ -0,0 +1,17 @@
+using Phantom.Agent.Services.Instances.States;
+using Phantom.Common.Data.Instance;
+
+namespace Phantom.Agent.Services.Instances.Procedures;
+
+sealed record SetInstanceToNotRunningStateProcedure(IInstanceStatus Status) : IInstanceProcedure {
+	public Task<IInstanceState?> Run(IInstanceContext context, CancellationToken cancellationToken) {
+		if (context.CurrentState is InstanceRunningState { Process.HasEnded: true }) {
+			context.SetStatus(Status);
+			context.ReportEvent(InstanceEvent.Stopped);
+			return Task.FromResult<IInstanceState?>(new InstanceNotRunningState());
+		}
+		else {
+			return Task.FromResult<IInstanceState?>(null);
+		}
+	}
+}

Agent/Phantom.Agent.Services/Instances/Procedures/StopInstanceProcedure.cs

@@ -0,0 +1,103 @@
+using System.Diagnostics;
+using Phantom.Agent.Minecraft.Command;
+using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Services.Instances.States;
+using Phantom.Common.Data.Instance;
+using Phantom.Common.Data.Minecraft;
+
+namespace Phantom.Agent.Services.Instances.Procedures;
+
+sealed record StopInstanceProcedure(MinecraftStopStrategy StopStrategy) : IInstanceProcedure {
+	private static readonly ushort[] Stops = { 60, 30, 10, 5, 4, 3, 2, 1, 0 };
+
+	public async Task<IInstanceState?> Run(IInstanceContext context, CancellationToken cancellationToken) {
+		if (context.CurrentState is not InstanceRunningState runningState) {
+			return null;
+		}
+
+		var process = runningState.Process;
+
+		runningState.IsStopping = true;
+		context.SetStatus(InstanceStatus.Stopping);
+
+		var seconds = StopStrategy.Seconds;
+		if (seconds > 0) {
+			try {
+				await CountDownWithAnnouncements(context, process, seconds, cancellationToken);
+			} catch (OperationCanceledException) {
+				runningState.IsStopping = false;
+				return null;
+			}
+		}
+
+		try {
+			// Too late to cancel the stop procedure now.
+			if (!process.HasEnded) {
+				context.Logger.Information("Session stopping now.");
+				await DoStop(context, process);
+			}
+		} finally {
+			context.Logger.Information("Session stopped.");
+			context.SetStatus(InstanceStatus.NotRunning);
+			context.ReportEvent(InstanceEvent.Stopped);
+		}
+
+		return new InstanceNotRunningState();
+	}
+
+	private async Task CountDownWithAnnouncements(IInstanceContext context, InstanceProcess process, ushort seconds, CancellationToken cancellationToken) {
+		context.Logger.Information("Session stopping in {Seconds} seconds.", seconds);
+
+		foreach (var stop in Stops) {
+			// TODO change to event-based cancellation
+			if (process.HasEnded) {
+				return;
+			}
+
+			if (seconds > stop) {
+				await process.SendCommand(GetCountDownAnnouncementCommand(seconds), cancellationToken);
+				await Task.Delay(TimeSpan.FromSeconds(seconds - stop), cancellationToken);
+				seconds = stop;
+			}
+		}
+	}
+
+	private static string GetCountDownAnnouncementCommand(ushort seconds) {
+		return MinecraftCommand.Say("Server shutting down in " + seconds + (seconds == 1 ? " second." : " seconds."));
+	}
+
+	private async Task DoStop(IInstanceContext context, InstanceProcess process) {
+		context.Logger.Information("Sending stop command...");
+		await TrySendStopCommand(context, process);
+
+		context.Logger.Information("Waiting for session to end...");
+		await WaitForSessionToEnd(context, process);
+	}
+
+	private async Task TrySendStopCommand(IInstanceContext context, InstanceProcess process) {
+		using var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(5));
+		try {
+			await process.SendCommand(MinecraftCommand.Stop, timeout.Token);
+		} catch (OperationCanceledException) {
+			// Ignore.
+		} catch (ObjectDisposedException e) when (e.ObjectName == typeof(Process).FullName && process.HasEnded) {
+			// Ignore.
+		} catch (Exception e) {
+			context.Logger.Warning(e, "Caught exception while sending stop command.");
+		}
+	}
+
+	private async Task WaitForSessionToEnd(IInstanceContext context, InstanceProcess process) {
+		using var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(55));
+		try {
+			await process.WaitForExit(timeout.Token);
+		} catch (OperationCanceledException) {
+			try {
+				context.Logger.Warning("Waiting timed out, killing session...");
+				process.Kill();
+			} catch (Exception e) {
+				context.Logger.Error(e, "Caught exception while killing session.");
+			}
+		}
+	}
+}

Agent/Phantom.Agent.Services/Instances/Sessions/InstanceSession.cs

@@ -1,28 +0,0 @@
-using Phantom.Agent.Minecraft.Instance;
-
-namespace Phantom.Agent.Services.Instances.Sessions; 
-
-sealed class InstanceSession : IDisposable {
-	private readonly InstanceProcess process;
-	private readonly InstanceContext context;
-	private readonly InstanceLogSender logSender;
-
-	public InstanceSession(InstanceProcess process, InstanceContext context) {
-		this.process = process;
-		this.context = context;
-		this.logSender = new InstanceLogSender(context.Services.TaskManager, context.Configuration.InstanceGuid, context.ShortName);
-		
-		this.process.AddOutputListener(SessionOutput);
-	}
-	
-	private void SessionOutput(object? sender, string line) {
-		context.Logger.Debug("[Server] {Line}", line);
-		logSender.Enqueue(line);
-	}
-	
-	public void Dispose() {
-		logSender.Stop();
-		process.Dispose();
-		context.Services.PortManager.Release(context.Configuration);
-	}
-}

Agent/Phantom.Agent.Services/Instances/States/IInstanceState.cs

@@ -1,11 +1,6 @@
-using Phantom.Common.Data.Minecraft;
+namespace Phantom.Agent.Services.Instances.States; 
-using Phantom.Common.Data.Replies;
-
-namespace Phantom.Agent.Services.Instances.States; 
 
 interface IInstanceState {
 	void Initialize();
-	(IInstanceState, LaunchInstanceResult) Launch(InstanceContext context);
-	(IInstanceState, StopInstanceResult) Stop(MinecraftStopStrategy stopStrategy);
 	Task<bool> SendCommand(string command, CancellationToken cancellationToken);
 }

Agent/Phantom.Agent.Services/Instances/States/InstanceLaunchingState.cs

@@ -1,127 +0,0 @@
-using Phantom.Agent.Minecraft.Instance;
-using Phantom.Agent.Minecraft.Launcher;
-using Phantom.Agent.Minecraft.Server;
-using Phantom.Agent.Services.Instances.Sessions;
-using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Data.Replies;
-
-namespace Phantom.Agent.Services.Instances.States;
-
-sealed class InstanceLaunchingState : IInstanceState, IDisposable {
-	private readonly InstanceContext context;
-	private readonly CancellationTokenSource cancellationTokenSource = new ();
-	private byte lastDownloadProgress = byte.MaxValue;
-
-	public InstanceLaunchingState(InstanceContext context) {
-		this.context = context;
-	}
-
-	public void Initialize() {
-		context.Logger.Information("Session starting...");
-
-		var launchTask = context.Services.TaskManager.Run("Launch procedure for instance " + context.ShortName, DoLaunch);
-		launchTask.ContinueWith(OnLaunchSuccess, CancellationToken.None, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Default);
-		launchTask.ContinueWith(OnLaunchFailure, CancellationToken.None, TaskContinuationOptions.NotOnRanToCompletion, TaskScheduler.Default);
-	}
-
-	private async Task<InstanceProcess> DoLaunch() {
-		var cancellationToken = cancellationTokenSource.Token;
-		cancellationToken.ThrowIfCancellationRequested();
-
-		void OnDownloadProgress(object? sender, DownloadProgressEventArgs args) {
-			byte progress = (byte) Math.Min(args.DownloadedBytes * 100 / args.TotalBytes, 100);
-
-			if (lastDownloadProgress != progress) {
-				lastDownloadProgress = progress;
-				context.SetStatus(InstanceStatus.Downloading(progress));
-			}
-		}
-
-		var launchResult = await context.Launcher.Launch(context.Logger, context.Services.LaunchServices, OnDownloadProgress, cancellationToken);
-		if (launchResult is LaunchResult.InvalidJavaRuntime) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.JavaRuntimeNotFound, "Session failed to launch, invalid Java runtime.");
-		}
-		else if (launchResult is LaunchResult.InvalidJvmArguments) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.InvalidJvmArguments, "Session failed to launch, invalid JVM arguments.");
-		}
-		else if (launchResult is LaunchResult.CouldNotDownloadMinecraftServer) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.CouldNotDownloadMinecraftServer, "Session failed to launch, could not download Minecraft server.");
-		}
-		else if (launchResult is LaunchResult.CouldNotPrepareMinecraftServerLauncher) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.CouldNotPrepareMinecraftServerLauncher, "Session failed to launch, could not prepare Minecraft server launcher.");
-		}
-		else if (launchResult is LaunchResult.CouldNotConfigureMinecraftServer) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.CouldNotConfigureMinecraftServer, "Session failed to launch, could not configure Minecraft server.");
-		}
-		else if (launchResult is LaunchResult.CouldNotStartMinecraftServer) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.CouldNotStartMinecraftServer, "Session failed to launch, could not start Minecraft server.");
-		}
-
-		if (launchResult is not LaunchResult.Success launchSuccess) {
-			throw new LaunchFailureException(InstanceLaunchFailReason.UnknownError, "Session failed to launch.");
-		}
-
-		context.SetStatus(InstanceStatus.Launching);
-		return launchSuccess.Process;
-	}
-
-	private void OnLaunchSuccess(Task<InstanceProcess> task) {
-		context.TransitionState(() => {
-			context.ReportEvent(InstanceEvent.LaunchSucceded);
-			
-			var process = task.Result;
-			var session = new InstanceSession(process, context);
-			
-			if (cancellationTokenSource.IsCancellationRequested) {
-				return (new InstanceStoppingState(context, process, session), InstanceStatus.Stopping);
-			}
-			else {
-				return (new InstanceRunningState(context, process, session), null);
-			}
-		});
-	}
-
-	private void OnLaunchFailure(Task task) {
-		if (task.IsFaulted) {
-			if (task.Exception is { InnerException: LaunchFailureException e }) {
-				context.Logger.Error(e.LogMessage);
-				context.SetLaunchFailedStatusAndReportEvent(e.Reason);
-			}
-			else {
-				context.Logger.Error(task.Exception, "Caught exception while launching instance.");
-				context.SetLaunchFailedStatusAndReportEvent(InstanceLaunchFailReason.UnknownError);
-			}
-		}
-
-		context.Services.PortManager.Release(context.Configuration);
-		context.TransitionState(new InstanceNotRunningState());
-	}
-
-	private sealed class LaunchFailureException : Exception {
-		public InstanceLaunchFailReason Reason { get; }
-		public string LogMessage { get; }
-
-		public LaunchFailureException(InstanceLaunchFailReason reason, string logMessage) {
-			this.Reason = reason;
-			this.LogMessage = logMessage;
-		}
-	}
-
-	public (IInstanceState, LaunchInstanceResult) Launch(InstanceContext context) {
-		return (this, LaunchInstanceResult.InstanceAlreadyLaunching);
-	}
-
-	public (IInstanceState, StopInstanceResult) Stop(MinecraftStopStrategy stopStrategy) {
-		cancellationTokenSource.Cancel();
-		return (this, StopInstanceResult.StopInitiated);
-	}
-
-	public Task<bool> SendCommand(string command, CancellationToken cancellationToken) {
-		return Task.FromResult(false);
-	}
-
-	public void Dispose() {
-		cancellationTokenSource.Dispose();
-	}
-}

Agent/Phantom.Agent.Services/Instances/States/InstanceNotRunningState.cs

@@ -1,34 +1,8 @@
-using Phantom.Common.Data.Instance;
+namespace Phantom.Agent.Services.Instances.States; 
-using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Data.Replies;
-
-namespace Phantom.Agent.Services.Instances.States; 
 
 sealed class InstanceNotRunningState : IInstanceState {
 	public void Initialize() {}
 
-	public (IInstanceState, LaunchInstanceResult) Launch(InstanceContext context) {
-		InstanceLaunchFailReason? failReason = context.Services.PortManager.Reserve(context.Configuration) switch {
-			PortManager.Result.ServerPortNotAllowed   => InstanceLaunchFailReason.ServerPortNotAllowed,
-			PortManager.Result.ServerPortAlreadyInUse => InstanceLaunchFailReason.ServerPortAlreadyInUse,
-			PortManager.Result.RconPortNotAllowed     => InstanceLaunchFailReason.RconPortNotAllowed,
-			PortManager.Result.RconPortAlreadyInUse   => InstanceLaunchFailReason.RconPortAlreadyInUse,
-			_                                         => null
-		};
-
-		if (failReason is {} reason) {
-			context.SetLaunchFailedStatusAndReportEvent(reason);
-			return (this, LaunchInstanceResult.LaunchInitiated);
-		}
-		
-		context.SetStatus(InstanceStatus.Launching);
-		return (new InstanceLaunchingState(context), LaunchInstanceResult.LaunchInitiated);
-	}
-
-	public (IInstanceState, StopInstanceResult) Stop(MinecraftStopStrategy stopStrategy) {
-		return (this, StopInstanceResult.InstanceAlreadyStopped);
-	}
-
 	public Task<bool> SendCommand(string command, CancellationToken cancellationToken) {
 		return Task.FromResult(false);
 	}

Agent/Phantom.Agent.Services/Instances/States/InstanceRunningState.cs

@@ -1,133 +1,81 @@
-using Phantom.Agent.Minecraft.Command;
+using Phantom.Agent.Minecraft.Instance;
-using Phantom.Agent.Minecraft.Instance;
+using Phantom.Agent.Minecraft.Launcher;
 using Phantom.Agent.Services.Backups;
-using Phantom.Agent.Services.Instances.Sessions;
+using Phantom.Agent.Services.Instances.Procedures;
 using Phantom.Common.Data.Backups;
 using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Data.Replies;
 
 namespace Phantom.Agent.Services.Instances.States;
 
-sealed class InstanceRunningState : IInstanceState {
+sealed class InstanceRunningState : IInstanceState, IDisposable {
-	private readonly InstanceContext context;
+	public InstanceProcess Process { get; }
-	private readonly InstanceProcess process;
+
+	internal bool IsStopping { get; set; }
+
+	private readonly InstanceConfiguration configuration;
+	private readonly IServerLauncher launcher;
+	private readonly IInstanceContext context;
+
+	private readonly InstanceLogSender logSender;
 	private readonly BackupScheduler backupScheduler;
-	private readonly RunningSessionDisposer runningSessionDisposer;
 
-	private readonly CancellationTokenSource delayedStopCancellationTokenSource = new ();
+	private bool isDisposed;
-	private bool stateOwnsDelayedStopCancellationTokenSource = true;
-	private bool isStopping;
 
-	public InstanceRunningState(InstanceContext context, InstanceProcess process, InstanceSession session) {
+	public InstanceRunningState(InstanceConfiguration configuration, IServerLauncher launcher, InstanceProcess process, IInstanceContext context) {
+		this.configuration = configuration;
+		this.launcher = launcher;
 		this.context = context;
-		this.process = process;
+		this.Process = process;
-		this.backupScheduler = new BackupScheduler(context.Services.TaskManager, context.Services.BackupManager, process, context.Configuration.ServerPort, context.ShortName);
+
+		this.logSender = new InstanceLogSender(context.Services.TaskManager, configuration.InstanceGuid, context.ShortName);
+
+		this.backupScheduler = new BackupScheduler(context.Services.TaskManager, context.Services.BackupManager, process, context, configuration.ServerPort);
 		this.backupScheduler.BackupCompleted += OnScheduledBackupCompleted;
-		this.runningSessionDisposer = new RunningSessionDisposer(this, session);
 	}
 
 	public void Initialize() {
-		process.Ended += ProcessEnded;
+		Process.Ended += ProcessEnded;
 
-		if (process.HasEnded) {
+		if (Process.HasEnded) {
-			if (runningSessionDisposer.Dispose()) {
+			if (TryDispose()) {
 				context.Logger.Warning("Session ended immediately after it was started.");
-				context.ReportEvent(InstanceEvent.Stopped);
+				context.EnqueueProcedure(new SetInstanceToNotRunningStateProcedure(InstanceStatus.Failed(InstanceLaunchFailReason.UnknownError)), immediate: true);
-				context.Services.TaskManager.Run("Transition state of instance " + context.ShortName + " to not running", () => context.TransitionState(new InstanceNotRunningState(), InstanceStatus.Failed(InstanceLaunchFailReason.UnknownError)));
 			}
 		}
 		else {
-			context.SetStatus(InstanceStatus.Running);
 			context.Logger.Information("Session started.");
+			Process.AddOutputListener(SessionOutput);
 		}
 	}
 
+	private void SessionOutput(object? sender, string line) {
+		context.Logger.Debug("[Server] {Line}", line);
+		logSender.Enqueue(line);
+	}
+
 	private void ProcessEnded(object? sender, EventArgs e) {
-		if (!runningSessionDisposer.Dispose()) {
+		if (!TryDispose()) {
 			return;
 		}
 
-		if (isStopping) {
+		if (IsStopping) {
-			context.Logger.Information("Session ended.");
+			context.EnqueueProcedure(new SetInstanceToNotRunningStateProcedure(InstanceStatus.NotRunning), immediate: true);
-			context.ReportEvent(InstanceEvent.Stopped);
-			context.TransitionState(new InstanceNotRunningState(), InstanceStatus.NotRunning);
 		}
 		else {
 			context.Logger.Information("Session ended unexpectedly, restarting...");
 			context.ReportEvent(InstanceEvent.Crashed);
-			context.TransitionState(new InstanceLaunchingState(context), InstanceStatus.Restarting);
+			context.EnqueueProcedure(new LaunchInstanceProcedure(configuration, launcher, IsRestarting: true));
 		}
 	}
 
-	public (IInstanceState, LaunchInstanceResult) Launch(InstanceContext context) {
+	private void OnScheduledBackupCompleted(object? sender, BackupCreationResult e) {
-		return (this, LaunchInstanceResult.InstanceAlreadyRunning);
+		context.ReportEvent(new InstanceBackupCompletedEvent(e.Kind, e.Warnings));
-	}
-
-	public (IInstanceState, StopInstanceResult) Stop(MinecraftStopStrategy stopStrategy) {
-		if (stopStrategy == MinecraftStopStrategy.Instant) {
-			CancelDelayedStop();
-			return (PrepareStoppedState(), StopInstanceResult.StopInitiated);
-		}
-
-		if (isStopping) {
-			// TODO change delay or something
-			return (this, StopInstanceResult.InstanceAlreadyStopping);
-		}
-		
-		isStopping = true;
-		context.Services.TaskManager.Run("Delayed stop timer for instance " + context.ShortName, () => StopLater(stopStrategy.Seconds));
-		return (this, StopInstanceResult.StopInitiated);
-	}
-
-	private IInstanceState PrepareStoppedState() {
-		process.Ended -= ProcessEnded;
-		backupScheduler.Stop();
-		return new InstanceStoppingState(context, process, runningSessionDisposer);
-	}
-
-	private void CancelDelayedStop() {
-		try {
-			delayedStopCancellationTokenSource.Cancel();
-		} catch (ObjectDisposedException) {
-			// ignore
-		}
-	}
-
-	private async Task StopLater(int seconds) {
-		var cancellationToken = delayedStopCancellationTokenSource.Token;
-
-		try {
-			stateOwnsDelayedStopCancellationTokenSource = false;
-
-			int[] stops = { 60, 30, 10, 5, 4, 3, 2, 1, 0 };
-			
-			foreach (var stop in stops) {
-				if (seconds > stop) {
-					await SendCommand(MinecraftCommand.Say("Server shutting down in " + seconds + (seconds == 1 ? " second." : " seconds.")), cancellationToken);
-					await Task.Delay(TimeSpan.FromSeconds(seconds - stop), cancellationToken);
-					seconds = stop;
-				}
-			}
-		} catch (OperationCanceledException) {
-			context.Logger.Debug("Cancelled delayed stop.");
-			return;
-		} catch (ObjectDisposedException) {
-			return;
-		} catch (Exception e) {
-			context.Logger.Warning(e, "Caught exception during delayed stop.");
-			return;
-		} finally {
-			delayedStopCancellationTokenSource.Dispose();
-		}
-
-		context.TransitionState(PrepareStoppedState());
 	}
 
 	public async Task<bool> SendCommand(string command, CancellationToken cancellationToken) {
 		try {
 			context.Logger.Information("Sending command: {Command}", command);
-			await process.SendCommand(command, cancellationToken);
+			await Process.SendCommand(command, cancellationToken);
 			return true;
 		} catch (OperationCanceledException) {
 			return false;
@@ -137,42 +85,25 @@ sealed class InstanceRunningState : IInstanceState {
 		}
 	}
 
-	private void OnScheduledBackupCompleted(object? sender, BackupCreationResult e) {
+	private bool TryDispose() {
-		context.ReportEvent(new InstanceBackupCompletedEvent(e.Kind, e.Warnings));
+		lock (this) {
+			if (isDisposed) {
+				return false;
+			}
+
+			isDisposed = true;
+		}
+
+		logSender.Stop();
+		backupScheduler.Stop();
+		
+		Process.Dispose();
+		context.Services.PortManager.Release(configuration);
+		
+		return true;
 	}
 
-	private sealed class RunningSessionDisposer : IDisposable {
+	public void Dispose() {
-		private readonly InstanceRunningState state;
+		TryDispose();
-		private readonly InstanceSession session;
-		private bool isDisposed;
-
-		public RunningSessionDisposer(InstanceRunningState state, InstanceSession session) {
-			this.state = state;
-			this.session = session;
-		}
-
-		public bool Dispose() {
-			lock (this) {
-				if (isDisposed) {
-					return false;
-				}
-
-				isDisposed = true;
-			}
-
-			if (state.stateOwnsDelayedStopCancellationTokenSource) {
-				state.delayedStopCancellationTokenSource.Dispose();
-			}
-			else {
-				state.CancelDelayedStop();
-			}
-			
-			session.Dispose();
-			return true;
-		}
-
-		void IDisposable.Dispose() {
-			Dispose();
-		}
 	}
 }

Agent/Phantom.Agent.Services/Instances/States/InstanceStoppingState.cs

@@ -1,89 +0,0 @@
-using System.Diagnostics;
-using Phantom.Agent.Minecraft.Command;
-using Phantom.Agent.Minecraft.Instance;
-using Phantom.Common.Data.Instance;
-using Phantom.Common.Data.Minecraft;
-using Phantom.Common.Data.Replies;
-
-namespace Phantom.Agent.Services.Instances.States; 
-
-sealed class InstanceStoppingState : IInstanceState, IDisposable {
-	private readonly InstanceContext context;
-	private readonly InstanceProcess process;
-	private readonly IDisposable sessionDisposer;
-
-	public InstanceStoppingState(InstanceContext context, InstanceProcess process, IDisposable sessionDisposer) {
-		this.context = context;
-		this.process = process;
-		this.sessionDisposer = sessionDisposer;
-	}
-
-	public void Initialize() {
-		context.Logger.Information("Session stopping.");
-		context.SetStatus(InstanceStatus.Stopping);
-		context.Services.TaskManager.Run("Stop procedure for instance " + context.ShortName, DoStop);
-	}
-
-	private async Task DoStop() {
-		try {
-			// Do not release the semaphore after this point.
-			if (!await process.BackupSemaphore.CancelAndWait(TimeSpan.FromSeconds(1))) {
-				context.Logger.Information("Waiting for backup to finish...");
-				await process.BackupSemaphore.CancelAndWait(Timeout.InfiniteTimeSpan);
-			}
-			
-			context.Logger.Information("Sending stop command...");
-			await DoSendStopCommand();
-
-			context.Logger.Information("Waiting for session to end...");
-			await DoWaitForSessionToEnd();
-		} finally {
-			context.Logger.Information("Session stopped.");
-			context.ReportEvent(InstanceEvent.Stopped);
-			context.TransitionState(new InstanceNotRunningState(), InstanceStatus.NotRunning);
-		}
-	}
-
-	private async Task DoSendStopCommand() {
-		using var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-		try {
-			await process.SendCommand(MinecraftCommand.Stop, timeout.Token);
-		} catch (OperationCanceledException) {
-			// ignore
-		} catch (ObjectDisposedException e) when (e.ObjectName == typeof(Process).FullName && process.HasEnded) {
-			// ignore
-		} catch (Exception e) {
-			context.Logger.Warning(e, "Caught exception while sending stop command.");
-		}
-	}
-
-	private async Task DoWaitForSessionToEnd() {
-		using var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(55));
-		try {
-			await process.WaitForExit(timeout.Token);
-		} catch (OperationCanceledException) {
-			try {
-				context.Logger.Warning("Waiting timed out, killing session...");
-				process.Kill();
-			} catch (Exception e) {
-				context.Logger.Error(e, "Caught exception while killing session.");
-			}
-		}
-	}
-
-	public (IInstanceState, LaunchInstanceResult) Launch(InstanceContext context) {
-		return (this, LaunchInstanceResult.InstanceIsStopping);
-	}
-
-	public (IInstanceState, StopInstanceResult) Stop(MinecraftStopStrategy stopStrategy) {
-		return (this, StopInstanceResult.InstanceAlreadyStopping); // TODO maybe provide a way to kill?
-	}
-
-	public Task<bool> SendCommand(string command, CancellationToken cancellationToken) {
-		return Task.FromResult(false);
-	}
-
-	public void Dispose() {
-		sessionDisposer.Dispose();
-	}
-}

Agent/Phantom.Agent.Services/Phantom.Agent.Services.csproj

@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\Common\Phantom.Common.Messages\Phantom.Common.Messages.csproj" />
+    <ProjectReference Include="..\..\Common\Phantom.Common.Messages.Agent\Phantom.Common.Messages.Agent.csproj" />
     <ProjectReference Include="..\Phantom.Agent.Minecraft\Phantom.Agent.Minecraft.csproj" />
     <ProjectReference Include="..\Phantom.Agent.Rpc\Phantom.Agent.Rpc.csproj" />
   </ItemGroup>

Agent/Phantom.Agent.Services/Rpc/MessageListener.cs

@@ -2,10 +2,10 @@
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Replies;
 using Phantom.Common.Logging;
-using Phantom.Common.Messages;
+using Phantom.Common.Messages.Agent;
-using Phantom.Common.Messages.BiDirectional;
+using Phantom.Common.Messages.Agent.BiDirectional;
-using Phantom.Common.Messages.ToAgent;
+using Phantom.Common.Messages.Agent.ToAgent;
-using Phantom.Common.Messages.ToServer;
+using Phantom.Common.Messages.Agent.ToController;
 using Phantom.Utils.Rpc.Message;
 using Serilog;
 
@@ -54,6 +54,8 @@ public sealed class MessageListener : IMessageToAgentListener {
 		};
 
 		Logger.Fatal("Agent authentication failed: {Error}", errorMessage);
+		
+		PhantomLogger.Dispose();
 		Environment.Exit(1);
 
 		return Task.FromResult(NoReply.Instance);

Agent/Phantom.Agent/AgentKey.cs

@@ -10,7 +10,7 @@ namespace Phantom.Agent;
 static class AgentKey {
 	private static ILogger Logger { get; } = PhantomLogger.Create(nameof(AgentKey));
 
-	public static Task<(NetMQCertificate, AgentAuthToken)?> Load(string? agentKeyToken, string? agentKeyFilePath) {
+	public static Task<(NetMQCertificate, AuthToken)?> Load(string? agentKeyToken, string? agentKeyFilePath) {
 		if (agentKeyFilePath != null) {
 			return LoadFromFile(agentKeyFilePath);
 		}
@@ -22,7 +22,7 @@ static class AgentKey {
 		}
 	}
 
-	private static async Task<(NetMQCertificate, AgentAuthToken)?> LoadFromFile(string agentKeyFilePath) {
+	private static async Task<(NetMQCertificate, AuthToken)?> LoadFromFile(string agentKeyFilePath) {
 		if (!File.Exists(agentKeyFilePath)) {
 			Logger.Fatal("Missing agent key file: {AgentKeyFilePath}", agentKeyFilePath);
 			return null;
@@ -41,7 +41,7 @@ static class AgentKey {
 		}
 	}
 
-	private static (NetMQCertificate, AgentAuthToken)? LoadFromToken(string agentKey) {
+	private static (NetMQCertificate, AuthToken)? LoadFromToken(string agentKey) {
 		try {
 			return LoadFromBytes(TokenGenerator.DecodeBytes(agentKey));
 		} catch (Exception) {
@@ -50,11 +50,11 @@ static class AgentKey {
 		}
 	}
 
-	private static (NetMQCertificate, AgentAuthToken)? LoadFromBytes(byte[] agentKey) {
+	private static (NetMQCertificate, AuthToken)? LoadFromBytes(byte[] agentKey) {
-		var (publicKey, agentToken) = AgentKeyData.FromBytes(agentKey);
+		var (publicKey, agentToken) = ConnectionCommonKey.FromBytes(agentKey);
-		var serverCertificate = NetMQCertificate.FromPublicKey(publicKey);
+		var controllerCertificate = NetMQCertificate.FromPublicKey(publicKey);
 		
 		Logger.Information("Loaded agent key.");
-		return (serverCertificate, agentToken);
+		return (controllerCertificate, agentToken);
 	}
 }

Agent/Phantom.Agent/Phantom.Agent.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -12,8 +11,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.IO\Phantom.Utils.IO.csproj" />
+    <ProjectReference Include="..\..\Utils\Phantom.Utils\Phantom.Utils.csproj" />
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.Runtime\Phantom.Utils.Runtime.csproj" />
     <ProjectReference Include="..\Phantom.Agent.Minecraft\Phantom.Agent.Minecraft.csproj" />
     <ProjectReference Include="..\Phantom.Agent.Services\Phantom.Agent.Services.csproj" />
   </ItemGroup>

Agent/Phantom.Agent/Program.cs

@@ -7,6 +7,7 @@ using Phantom.Common.Data.Agent;
 using Phantom.Common.Logging;
 using Phantom.Utils.Rpc;
 using Phantom.Utils.Runtime;
+using Phantom.Utils.Tasks;
 
 const int ProtocolVersion = 1;
 
@@ -17,32 +18,34 @@ PosixSignals.RegisterCancellation(shutdownCancellationTokenSource, static () =>
 	PhantomLogger.Root.InformationHeading("Stopping Phantom Panel agent...");
 });
 
+ThreadPool.SetMinThreads(workerThreads: 2, completionPortThreads: 1);
+
 try {
 	var fullVersion = AssemblyAttributes.GetFullVersion(Assembly.GetExecutingAssembly());
 
 	PhantomLogger.Root.InformationHeading("Initializing Phantom Panel agent...");
 	PhantomLogger.Root.Information("Agent version: {Version}", fullVersion);
 
-	var (serverHost, serverPort, javaSearchPath, agentKeyToken, agentKeyFilePath, agentName, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts) = Variables.LoadOrExit();
+	var (controllerHost, controllerPort, javaSearchPath, agentKeyToken, agentKeyFilePath, agentName, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts, maxConcurrentBackupCompressionTasks) = Variables.LoadOrStop();
 
 	var agentKey = await AgentKey.Load(agentKeyToken, agentKeyFilePath);
 	if (agentKey == null) {
-		Environment.Exit(1);
+		return 1;
 	}
 
 	var folders = new AgentFolders("./data", "./temp", javaSearchPath);
 	if (!folders.TryCreate()) {
-		Environment.Exit(1);
+		return 1;
 	}
 
 	var agentGuid = await GuidFile.CreateOrLoad(folders.DataFolderPath);
 	if (agentGuid == null) {
-		Environment.Exit(1);
+		return 1;
 	}
 
-	var (serverCertificate, agentToken) = agentKey.Value;
+	var (controllerCertificate, agentToken) = agentKey.Value;
 	var agentInfo = new AgentInfo(agentGuid.Value, agentName, ProtocolVersion, fullVersion, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts);
-	var agentServices = new AgentServices(agentInfo, folders);
+	var agentServices = new AgentServices(agentInfo, folders, new AgentServiceConfiguration(maxConcurrentBackupCompressionTasks));
 
 	MessageListener MessageListenerFactory(RpcServerConnection connection) {
 		return new MessageListener(connection, agentServices, shutdownCancellationTokenSource);
@@ -53,7 +56,7 @@ try {
 	await agentServices.Initialize();
 
 	var rpcDisconnectSemaphore = new SemaphoreSlim(0, 1);
-	var rpcConfiguration = new RpcConfiguration(PhantomLogger.Create("Rpc"), PhantomLogger.Create<TaskManager>("Rpc"), serverHost, serverPort, serverCertificate);
+	var rpcConfiguration = new RpcConfiguration(PhantomLogger.Create("Rpc"), PhantomLogger.Create<TaskManager>("Rpc"), controllerHost, controllerPort, controllerCertificate);
 	var rpcTask = RpcLauncher.Launch(rpcConfiguration, agentToken, agentInfo, MessageListenerFactory, rpcDisconnectSemaphore, shutdownCancellationToken);
 	try {
 		await rpcTask.WaitAsync(shutdownCancellationToken);
@@ -65,10 +68,15 @@ try {
 		await rpcTask;
 		rpcDisconnectSemaphore.Dispose();
 	}
+
+	return 0;
 } catch (OperationCanceledException) {
-	// Ignore.
+	return 0;
+} catch (StopProcedureException) {
+	return 1;
 } catch (Exception e) {
 	PhantomLogger.Root.Fatal(e, "Caught exception in entry point.");
+	return 1;
 } finally {
 	shutdownCancellationTokenSource.Dispose();
 

Agent/Phantom.Agent/Variables.cs

@@ -6,8 +6,8 @@ using Phantom.Utils.Runtime;
 namespace Phantom.Agent;
 
 sealed record Variables(
-	string ServerHost,
+	string ControllerHost,
-	ushort ServerPort,
+	ushort ControllerPort,
 	string JavaSearchPath,
 	string? AgentKeyToken,
 	string? AgentKeyFilePath,
@@ -15,15 +15,16 @@ sealed record Variables(
 	ushort MaxInstances,
 	RamAllocationUnits MaxMemory,
 	AllowedPorts AllowedServerPorts,
-	AllowedPorts AllowedRconPorts
+	AllowedPorts AllowedRconPorts,
+	ushort MaxConcurrentBackupCompressionTasks
 ) {
 	private static Variables LoadOrThrow() {
 		var (agentKeyToken, agentKeyFilePath) = EnvironmentVariables.GetEitherString("AGENT_KEY", "AGENT_KEY_FILE").Require;
 		var javaSearchPath = EnvironmentVariables.GetString("JAVA_SEARCH_PATH").WithDefaultGetter(GetDefaultJavaSearchPath);
 
 		return new Variables(
-			EnvironmentVariables.GetString("SERVER_HOST").Require,
+			EnvironmentVariables.GetString("CONTROLLER_HOST").Require,
-			EnvironmentVariables.GetPortNumber("SERVER_PORT").WithDefault(9401),
+			EnvironmentVariables.GetPortNumber("CONTROLLER_PORT").WithDefault(9401),
 			javaSearchPath,
 			agentKeyToken,
 			agentKeyFilePath,
@@ -31,7 +32,8 @@ sealed record Variables(
 			(ushort) EnvironmentVariables.GetInteger("MAX_INSTANCES", min: 1, max: 10000).Require,
 			EnvironmentVariables.GetString("MAX_MEMORY").MapParse(RamAllocationUnits.FromString).Require,
 			EnvironmentVariables.GetString("ALLOWED_SERVER_PORTS").MapParse(AllowedPorts.FromString).Require,
-			EnvironmentVariables.GetString("ALLOWED_RCON_PORTS").MapParse(AllowedPorts.FromString).Require
+			EnvironmentVariables.GetString("ALLOWED_RCON_PORTS").MapParse(AllowedPorts.FromString).Require,
+			(ushort) EnvironmentVariables.GetInteger("MAX_CONCURRENT_BACKUP_COMPRESSION_TASKS", min: 1, max: 10000).WithDefault(1)
 		);
 	}
 
@@ -39,13 +41,12 @@ sealed record Variables(
 		return JavaRuntimeDiscovery.GetSystemSearchPath() ?? throw new Exception("Could not automatically determine the path to Java installations on this system. Please set the JAVA_SEARCH_PATH environment variable to the folder containing Java installations.");
 	}
 
-	public static Variables LoadOrExit() {
+	public static Variables LoadOrStop() {
 		try {
 			return LoadOrThrow();
 		} catch (Exception e) {
 			PhantomLogger.Root.Fatal(e.Message);
-			Environment.Exit(1);
+			throw StopProcedureException.Instance;
-			throw;
 		}
 	}
 }

Common/Phantom.Common.Data.Tests/Phantom.Common.Data.Tests.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -15,7 +14,6 @@
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit3TestAdapter" />
     <PackageReference Include="NUnit.Analyzers" />
-    <PackageReference Include="coverlet.collector" />
   </ItemGroup>
   
   <ItemGroup>

Common/Phantom.Common.Data/Agent/AgentInfo.cs

@@ -2,7 +2,7 @@
 
 namespace Phantom.Common.Data.Agent;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record AgentInfo(
 	[property: MemoryPackOrder(0)] Guid Guid,
 	[property: MemoryPackOrder(1)] string Name,

Common/Phantom.Common.Data/Agent/AgentKeyData.cs

@@ -1,18 +0,0 @@
-namespace Phantom.Common.Data.Agent;
-
-public static class AgentKeyData {
-	private const byte TokenLength = AgentAuthToken.Length;
-
-	public static byte[] ToBytes(byte[] publicKey, AgentAuthToken agentToken) {
-		Span<byte> agentKey = stackalloc byte[TokenLength + publicKey.Length];
-		agentToken.WriteTo(agentKey[..TokenLength]);
-		publicKey.CopyTo(agentKey[TokenLength..]);
-		return agentKey.ToArray();
-	}
-
-	public static (byte[] PublicKey, AgentAuthToken AgentToken) FromBytes(byte[] agentKey) {
-		var token = new AgentAuthToken(agentKey[..TokenLength]);
-		var publicKey = agentKey[TokenLength..];
-		return (publicKey, token);
-	}
-}

Common/Phantom.Common.Data/Agent/AuthToken.cs

@@ -4,16 +4,16 @@ using MemoryPack;
 
 namespace Phantom.Common.Data.Agent;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-public sealed partial class AgentAuthToken {
+public sealed partial class AuthToken {
 	internal const int Length = 12;
 
 	[MemoryPackOrder(0)]
 	[MemoryPackInclude]
 	private readonly byte[] bytes;
 
-	internal AgentAuthToken(byte[]? bytes) {
+	internal AuthToken(byte[]? bytes) {
 		if (bytes == null) {
 			throw new ArgumentNullException(nameof(bytes));
 		}
@@ -25,7 +25,7 @@ public sealed partial class AgentAuthToken {
 		this.bytes = bytes;
 	}
 
-	public bool FixedTimeEquals(AgentAuthToken providedAuthToken) {
+	public bool FixedTimeEquals(AuthToken providedAuthToken) {
 		return CryptographicOperations.FixedTimeEquals(bytes, providedAuthToken.bytes);
 	}
 
@@ -33,7 +33,7 @@ public sealed partial class AgentAuthToken {
 		bytes.CopyTo(span);
 	}
 
-	public static AgentAuthToken Generate() {
+	public static AuthToken Generate() {
-		return new AgentAuthToken(RandomNumberGenerator.GetBytes(Length));
+		return new AuthToken(RandomNumberGenerator.GetBytes(Length));
 	}
 }

Common/Phantom.Common.Data/Agent/ConnectionCommonKey.cs

@@ -0,0 +1,18 @@
+namespace Phantom.Common.Data.Agent;
+
+public readonly record struct ConnectionCommonKey(byte[] CertificatePublicKey, AuthToken AuthToken) {
+	private const byte TokenLength = AuthToken.Length;
+
+	public byte[] ToBytes() {
+		Span<byte> result = stackalloc byte[TokenLength + CertificatePublicKey.Length];
+		AuthToken.WriteTo(result[..TokenLength]);
+		CertificatePublicKey.CopyTo(result[TokenLength..]);
+		return result.ToArray();
+	}
+
+	public static ConnectionCommonKey FromBytes(byte[] agentKey) {
+		var authToken = new AuthToken(agentKey[..TokenLength]);
+		var certificatePublicKey = agentKey[TokenLength..];
+		return new ConnectionCommonKey(certificatePublicKey, authToken);
+	}
+}

Common/Phantom.Common.Data/AllowedPorts.cs

@@ -4,7 +4,7 @@ using MemoryPack;
 
 namespace Phantom.Common.Data;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial class AllowedPorts {
 	[MemoryPackOrder(0)]
 	[MemoryPackInclude]
@@ -53,6 +53,6 @@ public sealed partial class AllowedPorts {
 	}
 
 	public static AllowedPorts FromString(string definitions) {
-		return FromString((ReadOnlySpan<char>) definitions);
+		return FromString(definitions.AsSpan());
 	}
 }

Common/Phantom.Common.Data/Backups/BackupCreationResult.cs

@@ -2,7 +2,7 @@
 
 namespace Phantom.Common.Data.Backups;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record BackupCreationResult(
 	[property: MemoryPackOrder(0)] BackupCreationResultKind Kind,
 	[property: MemoryPackOrder(1)] BackupCreationWarnings Warnings = BackupCreationWarnings.None

Common/Phantom.Common.Data/Instance/IInstanceEvent.cs

@@ -13,35 +13,35 @@ public partial interface IInstanceEvent {
 	void Accept(IInstanceEventVisitor visitor);
 }
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceLaunchSuccededEvent : IInstanceEvent {
 	public void Accept(IInstanceEventVisitor visitor) {
 		visitor.OnLaunchSucceeded(this);
 	}
 }
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceLaunchFailedEvent([property: MemoryPackOrder(0)] InstanceLaunchFailReason Reason) : IInstanceEvent {
 	public void Accept(IInstanceEventVisitor visitor) {
 		visitor.OnLaunchFailed(this);
 	}
 }
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceCrashedEvent : IInstanceEvent {
 	public void Accept(IInstanceEventVisitor visitor) {
 		visitor.OnCrashed(this);
 	}
 }
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceStoppedEvent : IInstanceEvent {
 	public void Accept(IInstanceEventVisitor visitor) {
 		visitor.OnStopped(this);
 	}
 }
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceBackupCompletedEvent([property: MemoryPackOrder(0)] BackupCreationResultKind Kind, [property: MemoryPackOrder(1)] BackupCreationWarnings Warnings) : IInstanceEvent {
 	public void Accept(IInstanceEventVisitor visitor) {
 		visitor.OnBackupCompleted(this);

Common/Phantom.Common.Data/Instance/IInstanceStatus.cs

@@ -14,31 +14,31 @@ namespace Phantom.Common.Data.Instance;
 [MemoryPackUnion(8, typeof(InstanceIsFailed))]
 public partial interface IInstanceStatus {}
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceIsOffline : IInstanceStatus;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceIsInvalid([property: MemoryPackOrder(0)] string Reason) : IInstanceStatus;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceIsNotRunning : IInstanceStatus;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceIsDownloading([property: MemoryPackOrder(0)] byte Progress) : IInstanceStatus;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceIsLaunching : IInstanceStatus;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceIsRunning : IInstanceStatus;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceIsRestarting : IInstanceStatus;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceIsStopping : IInstanceStatus;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceIsFailed([property: MemoryPackOrder(0)] InstanceLaunchFailReason Reason) : IInstanceStatus;
 
 public static class InstanceStatus {

Common/Phantom.Common.Data/Instance/InstanceConfiguration.cs

@@ -4,7 +4,7 @@ using Phantom.Common.Data.Minecraft;
 
 namespace Phantom.Common.Data.Instance;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceConfiguration(
 	[property: MemoryPackOrder(0)] Guid AgentGuid,
 	[property: MemoryPackOrder(1)] Guid InstanceGuid,

Common/Phantom.Common.Data/Instance/InstanceLaunchFailReason.cs

@@ -1,17 +1,16 @@
 namespace Phantom.Common.Data.Instance;
 
 public enum InstanceLaunchFailReason : byte {
-	UnknownError,
+	UnknownError                           = 0,
-	ServerPortNotAllowed,
+	ServerPortNotAllowed                   = 1,
-	ServerPortAlreadyInUse,
+	ServerPortAlreadyInUse                 = 2,
-	RconPortNotAllowed,
+	RconPortNotAllowed                     = 3,
-	RconPortAlreadyInUse,
+	RconPortAlreadyInUse                   = 4,
-	JavaRuntimeNotFound,
+	JavaRuntimeNotFound                    = 5,
-	InvalidJvmArguments,
+	CouldNotDownloadMinecraftServer        = 6,
-	CouldNotDownloadMinecraftServer,
+	CouldNotConfigureMinecraftServer       = 7,
-	CouldNotConfigureMinecraftServer,
+	CouldNotPrepareMinecraftServerLauncher = 8,
-	CouldNotPrepareMinecraftServerLauncher,
+	CouldNotStartMinecraftServer           = 9
-	CouldNotStartMinecraftServer
 }
 
 public static class InstanceLaunchFailReasonExtensions {
@@ -22,7 +21,6 @@ public static class InstanceLaunchFailReasonExtensions {
 			InstanceLaunchFailReason.RconPortNotAllowed                     => "Rcon port not allowed.",
 			InstanceLaunchFailReason.RconPortAlreadyInUse                   => "Rcon port already in use.",
 			InstanceLaunchFailReason.JavaRuntimeNotFound                    => "Java runtime not found.",
-			InstanceLaunchFailReason.InvalidJvmArguments                    => "Invalid JVM arguments.",
 			InstanceLaunchFailReason.CouldNotDownloadMinecraftServer        => "Could not download Minecraft server.",
 			InstanceLaunchFailReason.CouldNotConfigureMinecraftServer       => "Could not configure Minecraft server.",
 			InstanceLaunchFailReason.CouldNotPrepareMinecraftServerLauncher => "Could not prepare Minecraft server launcher.",

Common/Phantom.Common.Data/Instance/InstanceLaunchProperties.cs

@@ -3,7 +3,7 @@ using Phantom.Common.Data.Minecraft;
 
 namespace Phantom.Common.Data.Instance; 
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceLaunchProperties(
 	[property: MemoryPackOrder(0)] FileDownloadInfo? ServerDownloadInfo
 );

Common/Phantom.Common.Data/Java/JavaRuntime.cs

@@ -3,7 +3,7 @@ using MemoryPack;
 
 namespace Phantom.Common.Data.Java;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record JavaRuntime(
 	[property: MemoryPackOrder(0)] string MainVersion,
 	[property: MemoryPackOrder(1)] string FullVersion,

Common/Phantom.Common.Data/Java/TaggedJavaRuntime.cs

@@ -2,7 +2,7 @@
 
 namespace Phantom.Common.Data.Java; 
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record TaggedJavaRuntime(
 	[property: MemoryPackOrder(0)] Guid Guid,
 	[property: MemoryPackOrder(1)] JavaRuntime Runtime

Common/Phantom.Common.Data/Minecraft/FileDownloadInfo.cs

@@ -4,7 +4,7 @@ using Phantom.Utils.IO;
 
 namespace Phantom.Common.Data.Minecraft; 
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial class FileDownloadInfo {
 	[MemoryPackOrder(0)]
 	public string DownloadUrl { get; }

Common/Phantom.Common.Data/Minecraft/MinecraftStopStrategy.cs

@@ -2,7 +2,7 @@
 
 namespace Phantom.Common.Data.Minecraft;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public readonly partial record struct MinecraftStopStrategy(
 	[property: MemoryPackOrder(0)] ushort Seconds
 ) {

Common/Phantom.Common.Data/Phantom.Common.Data.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -11,8 +10,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.Cryptography\Phantom.Utils.Cryptography.csproj" />
+    <ProjectReference Include="..\..\Utils\Phantom.Utils\Phantom.Utils.csproj" />
-    <ProjectReference Include="..\..\Utils\Phantom.Utils.IO\Phantom.Utils.IO.csproj" />
   </ItemGroup>
 
 </Project>

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

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
@@ -98,6 +98,6 @@ public readonly partial record struct RamAllocationUnits(
 	/// </summary>
 	/// <exception cref="ArgumentOutOfRangeException">If the <paramref name="definition"/> is in the incorrect format, or the value cannot be converted via <see cref="FromMegabytes"/>.</exception>
 	public static RamAllocationUnits FromString(string definition) {
-		return FromString((ReadOnlySpan<char>) definition);
+		return FromString(definition.AsSpan());
 	}
 }

Common/Phantom.Common.Data/Replies/InstanceActionResult.cs

@@ -2,7 +2,7 @@
 
 namespace Phantom.Common.Data.Replies;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceActionResult<T>(
 	[property: MemoryPackOrder(0)] InstanceActionGeneralResult GeneralResult,
 	[property: MemoryPackOrder(1)] T? ConcreteResult

Common/Phantom.Common.Data/Replies/LaunchInstanceResult.cs

@@ -1,13 +1,11 @@
 namespace Phantom.Common.Data.Replies;
 
 public enum LaunchInstanceResult : byte {
-	UnknownError,
+	LaunchInitiated          = 1,
-	LaunchInitiated,
+	InstanceAlreadyLaunching = 2,
-	InstanceAlreadyLaunching,
+	InstanceAlreadyRunning   = 3,
-	InstanceAlreadyRunning,
+	InstanceLimitExceeded    = 4,
-	InstanceIsStopping,
+	MemoryLimitExceeded      = 5
-	InstanceLimitExceeded,
-	MemoryLimitExceeded
 }
 
 public static class LaunchInstanceResultExtensions {
@@ -16,7 +14,6 @@ public static class LaunchInstanceResultExtensions {
 			LaunchInstanceResult.LaunchInitiated          => "Launch initiated.",
 			LaunchInstanceResult.InstanceAlreadyLaunching => "Instance is already launching.",
 			LaunchInstanceResult.InstanceAlreadyRunning   => "Instance is already running.",
-			LaunchInstanceResult.InstanceIsStopping       => "Instance is stopping.",
 			LaunchInstanceResult.InstanceLimitExceeded    => "Agent does not have any more available instances.",
 			LaunchInstanceResult.MemoryLimitExceeded      => "Agent does not have enough available memory.",
 			_                                             => "Unknown error."

Common/Phantom.Common.Data/Replies/StopInstanceResult.cs

@@ -1,10 +1,9 @@
 namespace Phantom.Common.Data.Replies;
 
 public enum StopInstanceResult : byte {
-	UnknownError,
+	StopInitiated           = 1,
-	StopInitiated,
+	InstanceAlreadyStopping = 2,
-	InstanceAlreadyStopping,
+	InstanceAlreadyStopped  = 3
-	InstanceAlreadyStopped
 }
 
 public static class StopInstanceResultExtensions {

Common/Phantom.Common.Logging/Phantom.Common.Logging.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Common/Phantom.Common.Logging/PhantomLogger.cs

@@ -27,7 +27,7 @@ public static class PhantomLogger {
 	}
 
 	public static ILogger Create(string name1, string name2) {
-		return Create(name1 + ":" + name2);
+		return Create(ConcatNames(name1, name2));
 	}
 
 	public static ILogger Create<T>() {
@@ -38,10 +38,18 @@ public static class PhantomLogger {
 		return Create(typeof(T).Name, name);
 	}
 	
+	public static ILogger Create<T>(string name1, string name2) {
+		return Create(typeof(T).Name, ConcatNames(name1, name2));
+	}
+
 	public static ILogger Create<T1, T2>() {
 		return Create(typeof(T1).Name, typeof(T2).Name);
 	}
 
+	private static string ConcatNames(string name1, string name2) {
+		return name1 + ":" + name2;
+	}
+
 	public static void Dispose() {
 		Root.Dispose();
 		Base.Dispose();

Common/Phantom.Common.Messages.Agent/AgentMessageRegistries.cs

@@ -0,0 +1,48 @@
+using Phantom.Common.Data.Replies;
+using Phantom.Common.Logging;
+using Phantom.Common.Messages.Agent.BiDirectional;
+using Phantom.Common.Messages.Agent.ToAgent;
+using Phantom.Common.Messages.Agent.ToController;
+using Phantom.Utils.Rpc.Message;
+
+namespace Phantom.Common.Messages.Agent; 
+
+public static class AgentMessageRegistries {
+	public static MessageRegistry<IMessageToAgentListener> ToAgent { get; } = new (PhantomLogger.Create("MessageRegistry", nameof(ToAgent)));
+	public static MessageRegistry<IMessageToControllerListener> ToController { get; } = new (PhantomLogger.Create("MessageRegistry", nameof(ToController)));
+	
+	public static IMessageDefinitions<IMessageToAgentListener, IMessageToControllerListener> Definitions { get; } = new MessageDefinitions();
+
+	static AgentMessageRegistries() {
+		ToAgent.Add<RegisterAgentSuccessMessage>(0);
+		ToAgent.Add<RegisterAgentFailureMessage>(1);
+		ToAgent.Add<ConfigureInstanceMessage, InstanceActionResult<ConfigureInstanceResult>>(2);
+		ToAgent.Add<LaunchInstanceMessage, InstanceActionResult<LaunchInstanceResult>>(3);
+		ToAgent.Add<StopInstanceMessage, InstanceActionResult<StopInstanceResult>>(4);
+		ToAgent.Add<SendCommandToInstanceMessage, InstanceActionResult<SendCommandToInstanceResult>>(5);
+		ToAgent.Add<ReplyMessage>(127);
+		
+		ToController.Add<RegisterAgentMessage>(0);
+		ToController.Add<UnregisterAgentMessage>(1);
+		ToController.Add<AgentIsAliveMessage>(2);
+		ToController.Add<AdvertiseJavaRuntimesMessage>(3);
+		ToController.Add<ReportInstanceStatusMessage>(4);
+		ToController.Add<InstanceOutputMessage>(5);
+		ToController.Add<ReportAgentStatusMessage>(6);
+		ToController.Add<ReportInstanceEventMessage>(7);
+		ToController.Add<ReplyMessage>(127);
+	}
+
+	private sealed class MessageDefinitions : IMessageDefinitions<IMessageToAgentListener, IMessageToControllerListener> {
+		public MessageRegistry<IMessageToAgentListener> Outgoing => ToAgent;
+		public MessageRegistry<IMessageToControllerListener> Incoming => ToController;
+
+		public bool IsRegistrationMessage(Type messageType) {
+			return messageType == typeof(RegisterAgentMessage);
+		}
+
+		public IMessage<IMessageToAgentListener, NoReply> CreateReplyMessage( uint sequenceId, byte[] serializedReply) {
+			return new ReplyMessage(sequenceId, serializedReply);
+		}
+	}
+}

Common/Phantom.Common.Messages.Agent/BiDirectional/ReplyMessage.cs

@@ -1,14 +1,14 @@
 using MemoryPack;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages.BiDirectional;
+namespace Phantom.Common.Messages.Agent.BiDirectional;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record ReplyMessage(
 	[property: MemoryPackOrder(0)] uint SequenceId,
 	[property: MemoryPackOrder(1)] byte[] SerializedReply
-) : IMessageToServer, IMessageToAgent {
+) : IMessageToController, IMessageToAgent {
-	public Task<NoReply> Accept(IMessageToServerListener listener) {
+	public Task<NoReply> Accept(IMessageToControllerListener listener) {
 		return listener.HandleReply(this);
 	}
 

Common/Phantom.Common.Messages.Agent/IMessageToAgent.cs

@@ -1,6 +1,6 @@
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages;
+namespace Phantom.Common.Messages.Agent;
 
 public interface IMessageToAgent<TReply> : IMessage<IMessageToAgentListener, TReply> {}
 

Common/Phantom.Common.Messages.Agent/IMessageToAgentListener.cs

@@ -1,9 +1,9 @@
 using Phantom.Common.Data.Replies;
-using Phantom.Common.Messages.BiDirectional;
+using Phantom.Common.Messages.Agent.BiDirectional;
-using Phantom.Common.Messages.ToAgent;
+using Phantom.Common.Messages.Agent.ToAgent;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages;
+namespace Phantom.Common.Messages.Agent;
 
 public interface IMessageToAgentListener {
 	Task<NoReply> HandleRegisterAgentSuccess(RegisterAgentSuccessMessage message);

Common/Phantom.Common.Messages.Agent/IMessageToController.cs

@@ -0,0 +1,7 @@
+using Phantom.Utils.Rpc.Message;
+
+namespace Phantom.Common.Messages.Agent;
+
+public interface IMessageToController<TReply> : IMessage<IMessageToControllerListener, TReply> {}
+
+public interface IMessageToController : IMessageToController<NoReply> {}

Common/Phantom.Common.Messages.Agent/IMessageToControllerListener.cs

@@ -1,11 +1,10 @@
-using Phantom.Common.Messages.BiDirectional;
+using Phantom.Common.Messages.Agent.BiDirectional;
-using Phantom.Common.Messages.ToServer;
+using Phantom.Common.Messages.Agent.ToController;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages; 
+namespace Phantom.Common.Messages.Agent; 
 
-public interface IMessageToServerListener {
+public interface IMessageToControllerListener {
-	bool IsDisposed { get; }
 	Task<NoReply> HandleRegisterAgent(RegisterAgentMessage message);
 	Task<NoReply> HandleUnregisterAgent(UnregisterAgentMessage message);
 	Task<NoReply> HandleAgentIsAlive(AgentIsAliveMessage message);

Common/Phantom.Common.Messages.Agent/Phantom.Common.Messages.Agent.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Common/Phantom.Common.Messages.Agent/ToAgent/ConfigureInstanceMessage.cs

@@ -2,9 +2,9 @@
 using Phantom.Common.Data.Instance;
 using Phantom.Common.Data.Replies;
 
-namespace Phantom.Common.Messages.ToAgent;
+namespace Phantom.Common.Messages.Agent.ToAgent;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record ConfigureInstanceMessage(
 	[property: MemoryPackOrder(0)] InstanceConfiguration Configuration,
 	[property: MemoryPackOrder(1)] InstanceLaunchProperties LaunchProperties,

Common/Phantom.Common.Messages.Agent/ToAgent/LaunchInstanceMessage.cs

@@ -1,9 +1,9 @@
 using MemoryPack;
 using Phantom.Common.Data.Replies;
 
-namespace Phantom.Common.Messages.ToAgent; 
+namespace Phantom.Common.Messages.Agent.ToAgent; 
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record LaunchInstanceMessage(
 	[property: MemoryPackOrder(0)] Guid InstanceGuid
 ) : IMessageToAgent<InstanceActionResult<LaunchInstanceResult>> {

Common/Phantom.Common.Messages.Agent/ToAgent/RegisterAgentFailureMessage.cs

@@ -2,9 +2,9 @@
 using Phantom.Common.Data.Replies;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages.ToAgent;
+namespace Phantom.Common.Messages.Agent.ToAgent;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record RegisterAgentFailureMessage(
 	[property: MemoryPackOrder(0)] RegisterAgentFailure FailureKind
 ) : IMessageToAgent {

Common/Phantom.Common.Messages.Agent/ToAgent/RegisterAgentSuccessMessage.cs

@@ -2,9 +2,9 @@
 using MemoryPack;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages.ToAgent;
+namespace Phantom.Common.Messages.Agent.ToAgent;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record RegisterAgentSuccessMessage(
 	[property: MemoryPackOrder(0)] ImmutableArray<ConfigureInstanceMessage> InitialInstanceConfigurations
 ) : IMessageToAgent {

Common/Phantom.Common.Messages.Agent/ToAgent/SendCommandToInstanceMessage.cs

@@ -1,9 +1,9 @@
 using MemoryPack;
 using Phantom.Common.Data.Replies;
 
-namespace Phantom.Common.Messages.ToAgent; 
+namespace Phantom.Common.Messages.Agent.ToAgent; 
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record SendCommandToInstanceMessage(
 	[property: MemoryPackOrder(0)] Guid InstanceGuid,
 	[property: MemoryPackOrder(1)] string Command

Common/Phantom.Common.Messages.Agent/ToAgent/StopInstanceMessage.cs

@@ -2,9 +2,9 @@
 using Phantom.Common.Data.Minecraft;
 using Phantom.Common.Data.Replies;
 
-namespace Phantom.Common.Messages.ToAgent; 
+namespace Phantom.Common.Messages.Agent.ToAgent; 
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record StopInstanceMessage(
 	[property: MemoryPackOrder(0)] Guid InstanceGuid,
 	[property: MemoryPackOrder(1)] MinecraftStopStrategy StopStrategy

Common/Phantom.Common.Messages.Agent/ToController/AdvertiseJavaRuntimesMessage.cs

@@ -3,13 +3,13 @@ using MemoryPack;
 using Phantom.Common.Data.Java;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages.ToServer; 
+namespace Phantom.Common.Messages.Agent.ToController; 
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record AdvertiseJavaRuntimesMessage(
 	[property: MemoryPackOrder(0)] ImmutableArray<TaggedJavaRuntime> Runtimes
-) : IMessageToServer {
+) : IMessageToController {
-	public Task<NoReply> Accept(IMessageToServerListener listener) {
+	public Task<NoReply> Accept(IMessageToControllerListener listener) {
 		return listener.HandleAdvertiseJavaRuntimes(this);
 	}
 }

Common/Phantom.Common.Messages.Agent/ToController/AgentIsAliveMessage.cs

@@ -0,0 +1,11 @@
+using MemoryPack;
+using Phantom.Utils.Rpc.Message;
+
+namespace Phantom.Common.Messages.Agent.ToController; 
+
+[MemoryPackable(GenerateType.VersionTolerant)]
+public sealed partial record AgentIsAliveMessage : IMessageToController {
+	public Task<NoReply> Accept(IMessageToControllerListener listener) {
+		return listener.HandleAgentIsAlive(this);
+	}
+}

Common/Phantom.Common.Messages.Agent/ToController/InstanceOutputMessage.cs

@@ -2,14 +2,14 @@ using System.Collections.Immutable;
 using MemoryPack;
 using Phantom.Utils.Rpc.Message;
 
-namespace Phantom.Common.Messages.ToServer;
+namespace Phantom.Common.Messages.Agent.ToController;
 
-[MemoryPackable]
+[MemoryPackable(GenerateType.VersionTolerant)]
 public sealed partial record InstanceOutputMessage(
 	[property: MemoryPackOrder(0)] Guid InstanceGuid,
 	[property: MemoryPackOrder(1)] ImmutableArray<string> Lines
-) : IMessageToServer {
+) : IMessageToController {
-	public Task<NoReply> Accept(IMessageToServerListener listener) {
+	public Task<NoReply> Accept(IMessageToControllerListener listener) {
 		return listener.HandleInstanceOutput(this);
 	}
 }