Merge branch 'main' into lm/restrict-content-type

1 files changed, 26 insertions, 5 deletions

diff --git a/src/zenutil/zenserverprocess.cpp b/src/zenutil/zenserverprocess.cpp
index ef2a4fda5..b09c2d89a 100644
--- a/src/zenutil/zenserverprocess.cpp
+++ b/src/zenutil/zenserverprocess.cpp
@@ -787,6 +787,8 @@ ToString(ZenServerInstance::ServerMode Mode)
 			return "storage"sv;
 		case ZenServerInstance::ServerMode::kHubServer:
 			return "hub"sv;
+		case ZenServerInstance::ServerMode::kComputeServer:
+			return "compute"sv;
 		default:
 			return "invalid"sv;
 	}
@@ -808,6 +810,10 @@ ZenServerInstance::SpawnServerInternal(int ChildId, std::string_view ServerArgs,
 	{
 		CommandLine << " hub";
 	}
+	else if (m_ServerMode == ServerMode::kComputeServer)
+	{
+		CommandLine << " compute";
+	}
 
 	CommandLine << " --child-id " << ChildEventName;
 
@@ -829,10 +835,18 @@ ZenServerInstance::SpawnServerInternal(int ChildId, std::string_view ServerArgs,
 	const std::filesystem::path BaseDir = m_Env.ProgramBaseDir();
 	const std::filesystem::path Executable =
 		m_ServerExecutablePath.empty() ? (BaseDir / "zenserver" ZEN_EXE_SUFFIX_LITERAL) : m_ServerExecutablePath;
-	const std::filesystem::path OutputPath =
-		OpenConsole ? std::filesystem::path{} : std::filesystem::temp_directory_path() / ("zenserver_" + m_Name + ".log");
-	CreateProcOptions CreateOptions = {.WorkingDirectory = &CurrentDirectory, .Flags = CreationFlags, .StdoutFile = OutputPath};
-	CreateProcResult  ChildPid		= CreateProc(Executable, CommandLine.ToView(), CreateOptions);
+	const std::filesystem::path OutputPath	  = (OpenConsole || m_Env.IsPassthroughOutput())
+													? std::filesystem::path{}
+													: std::filesystem::temp_directory_path() / ("zenserver_" + m_Name + ".log");
+	CreateProcOptions			CreateOptions = {
+				  .WorkingDirectory = &CurrentDirectory,
+				  .Flags			= CreationFlags,
+				  .StdoutFile		= OutputPath,
+#if ZEN_PLATFORM_WINDOWS
+		.AssignToJob = m_JobObject,
+#endif
+	};
+	CreateProcResult ChildPid = CreateProc(Executable, CommandLine.ToView(), CreateOptions);
 #if ZEN_PLATFORM_WINDOWS
 	if (!ChildPid)
 	{
@@ -841,6 +855,12 @@ ZenServerInstance::SpawnServerInternal(int ChildId, std::string_view ServerArgs,
 		{
 			ZEN_DEBUG("Regular spawn failed - spawning elevated server");
 			CreateOptions.Flags |= CreateProcOptions::Flag_Elevated;
+			// ShellExecuteEx (used by the elevated path) does not support job object assignment
+			if (CreateOptions.AssignToJob)
+			{
+				ZEN_WARN("Elevated process spawn does not support job object assignment; child will not be auto-terminated on parent exit");
+				CreateOptions.AssignToJob = nullptr;
+			}
 			ChildPid = CreateProc(Executable, CommandLine.ToView(), CreateOptions);
 		}
 		else
@@ -934,7 +954,8 @@ ZenServerInstance::SpawnServer(int BasePort, std::string_view AdditionalServerAr
 		CommandLine << " " << AdditionalServerArgs;
 	}
 
-	SpawnServerInternal(ChildId, CommandLine, !IsTest, WaitTimeoutMs);
+	const bool OpenConsole = !IsTest && !m_Env.IsHubEnvironment();
+	SpawnServerInternal(ChildId, CommandLine, OpenConsole, WaitTimeoutMs);
 }
 
 void