Lower the amout of public classes

Author: CapulusCodeNinja

nexus/Program.cs

@@ -5,6 +5,8 @@
 
 using Nexus.CommandLine;
 using Nexus.Config;
+using Nexus.External.Apis.FileSystem;
+using Nexus.External.Apis.ProcessManagement;
 using Nexus.Logging;
 using Nexus.Startup;
 
@@ -31,9 +33,11 @@ public static async Task<int> Main(string[] args)
             var cmd = new CommandLineContext(args);
 
             var settings = new Settings();
+            var filesystem = new FileSystem();
+            var processManager = new ProcessManager();
 
             // Use hosted service for ALL command types
-            var host = CreateHostBuilder(cmd, settings).Build();
+            var host = CreateHostBuilder(cmd, filesystem, processManager, settings).Build();
             await host.RunAsync();
 
             return 0;
@@ -53,10 +57,12 @@ public static async Task<int> Main(string[] args)
     /// Creates and configures a host builder for the application.
     /// </summary>
     /// <param name="cmd">Command line context.</param>
+    /// <param name="fileSystem">The file system abstraction.</param>
+    /// <param name="processManager">The process manager abstraction.</param>
     /// <param name="settings">The product settings.</param>
     /// <returns>Configured host builder.</returns>
     [SupportedOSPlatform("windows")]
-    internal static IHostBuilder CreateHostBuilder(CommandLineContext cmd, ISettings settings)
+    internal static IHostBuilder CreateHostBuilder(CommandLineContext cmd, IFileSystem fileSystem, IProcessManager processManager, ISettings settings)
     {
         var builder = Host.CreateDefaultBuilder(cmd.Args)
             .ConfigureLogging((context, logging) => logging.AddNexusLogging(
@@ -68,8 +74,9 @@ internal static IHostBuilder CreateHostBuilder(CommandLineContext cmd, ISettings
                 var ununsed = services.AddSingleton(cmd);
 
                 // Register ONLY the main hosted service (no others)
-                var ununsedHost = services.AddHostedService<MainHostedService>();
-            });
+                var ununsedHost = services.AddHostedService(sp =>
+                    new MainHostedService(cmd, fileSystem, processManager, settings));
+                });
 
         // Configure Windows Service support if in service mode
         if (cmd.IsServiceMode)

nexus/Startup/MainHostedService.cs

@@ -4,6 +4,8 @@
 
 using Nexus.CommandLine;
 using Nexus.Config;
+using Nexus.External.Apis.FileSystem;
+using Nexus.External.Apis.ProcessManagement;
 using Nexus.Protocol;
 using Nexus.Setup;
 
@@ -19,6 +21,8 @@ internal class MainHostedService : IHostedService
 {
     private readonly Logger m_Logger;
     private readonly ISettings m_Settings;
+    private readonly IFileSystem m_FileSystem;
+    private readonly IProcessManager m_ProcessManager;
     private readonly CommandLineContext m_CommandLineContext;
     private readonly IProtocolServer m_ProtocolServer;
     private readonly IProductInstallation m_ProductInstallation;
@@ -27,10 +31,12 @@ internal class MainHostedService : IHostedService
     /// Initializes a new instance of the <see cref="MainHostedService"/> class.
     /// </summary>
     /// <param name="commandLineContext">Command line context.</param>
+    /// <param name="fileSystem">The file system abstraction.</param>
+    /// <param name="processManager">The process manager abstraction.</param>
     /// <param name="settings">The product settings.</param>
     public MainHostedService(
-        CommandLineContext commandLineContext, ISettings settings)
-        : this(commandLineContext, new ProtocolServer(settings), new ProductInstallation(settings), settings)
+        CommandLineContext commandLineContext, IFileSystem fileSystem, IProcessManager processManager, ISettings settings)
+        : this(commandLineContext, new ProtocolServer(fileSystem, processManager, settings), new ProductInstallation(settings), fileSystem, processManager, settings)
     {
     }
 
@@ -40,15 +46,19 @@ public MainHostedService(
     /// <param name="commandLineContext">Command line context.</param>
     /// <param name="protocolServer">The command line server.</param>
     /// <param name="productInstallation">The product setup finctionality.</param>
+    /// <param name="fileSystem">The file system abstraction.</param>
+    /// <param name="processManager">The process manager abstraction.</param>
     /// <param name="settings">The product settings.</param>
     internal MainHostedService(
-        CommandLineContext commandLineContext, IProtocolServer protocolServer, IProductInstallation productInstallation, ISettings settings)
+        CommandLineContext commandLineContext, IProtocolServer protocolServer, IProductInstallation productInstallation, IFileSystem fileSystem, IProcessManager processManager, ISettings settings)
     {
         m_Logger = LogManager.GetCurrentClassLogger();
         m_CommandLineContext = commandLineContext;
         m_ProtocolServer = protocolServer;
         m_ProductInstallation = productInstallation;
         m_Settings = settings;
+        m_FileSystem = fileSystem;
+        m_ProcessManager = processManager;
     }
 
     /// <summary>

nexus_engine/nexus_engine/DebugEngine.cs

@@ -67,9 +67,11 @@ public class DebugEngine : IDebugEngine
     /// <summary>
     /// Initializes a new instance of the <see cref="DebugEngine"/> class with default dependencies.
     /// </summary>
+    /// <param name="fileSystem">The file system abstraction.</param>
+    /// <param name="processManager">The process manager abstraction.</param>
     /// <param name="settings">The product settings.</param>
-    public DebugEngine(ISettings settings)
-        : this(new FileSystem(), new ProcessManager(), new BatchProcessor(settings), settings)
+    public DebugEngine(IFileSystem fileSystem, IProcessManager processManager, ISettings settings)
+        : this(fileSystem, processManager, new BatchProcessor(settings), settings)
     {
     }
 
@@ -87,7 +89,7 @@ internal DebugEngine(IFileSystem fileSystem, IProcessManager processManager, IBa
         m_Settings = settings ?? throw new ArgumentNullException(nameof(settings));
         m_BatchProcessor = batchProcessor;
 
-        m_ExtensionScripts = new ExtensionScripts(this, m_Settings);
+        m_ExtensionScripts = new ExtensionScripts(this, fileSystem, processManager, m_Settings);
 
         m_Logger = LogManager.GetCurrentClassLogger();
         m_Logger.Info("DebugEngine initialized with max {MaxSessions} concurrent sessions", m_Settings.Get().McpNexus.SessionManagement.MaxConcurrentSessions);

nexus_engine/nexus_engine_extensions/ExtensionScripts.cs

@@ -80,9 +80,15 @@ public class ExtensionScripts : IExtensionScripts, IAsyncDisposable
     /// Initializes a new instance of the <see cref="ExtensionScripts"/> class with default dependencies.
     /// </summary>
     /// <param name="engine">The debug engine instance for callback operations.</param>
+    /// <param name="fileSystem">The file system abstraction.</param>
+    /// <param name="processManager">The process manager abstraction.</param>
     /// <param name="settings">The product settings.</param>
-    public ExtensionScripts(IDebugEngine engine, ISettings settings)
-        : this(engine, new TokenValidator(), settings)
+    public ExtensionScripts(
+        IDebugEngine engine,
+        IFileSystem fileSystem,
+        IProcessManager processManager,
+        ISettings settings)
+        : this(engine, new TokenValidator(), fileSystem, processManager, settings)
     {
     }
 
@@ -91,9 +97,16 @@ public ExtensionScripts(IDebugEngine engine, ISettings settings)
     /// </summary>
     /// <param name="engine">The debug engine instance for callback operations.</param>
     /// <param name="tokenValidator">The token validator for validating extension script callbacks.</param>
+    /// <param name="fileSystem">The file system abstraction.</param>
+    /// <param name="processManager">The process manager abstraction.</param>
     /// <param name="settings">The product settings.</param>
-    internal ExtensionScripts(IDebugEngine engine, TokenValidator tokenValidator, ISettings settings)
-        : this(engine, tokenValidator, new CallbackServerManager(engine, tokenValidator, settings), new FileSystem(), new ProcessManager(), settings)
+    internal ExtensionScripts(
+        IDebugEngine engine,
+        TokenValidator tokenValidator,
+        IFileSystem fileSystem,
+        IProcessManager processManager,
+        ISettings settings)
+        : this(engine, tokenValidator, new CallbackServerManager(engine, tokenValidator, settings), fileSystem, processManager, settings)
     {
     }
 

nexus_protocol/ProtocolServer.cs

@@ -2,6 +2,8 @@
 using Microsoft.Extensions.Hosting;
 
 using Nexus.Config;
+using Nexus.External.Apis.FileSystem;
+using Nexus.External.Apis.ProcessManagement;
 using Nexus.Protocol.Configuration;
 using Nexus.Protocol.Services;
 
@@ -26,14 +28,16 @@ public class ProtocolServer : IProtocolServer
     /// <summary>
     /// Initializes a new instance of the <see cref="ProtocolServer"/> class.
     /// </summary>
+    /// <param name="fileSystem">The file system abstraction.</param>
+    /// <param name="processManager">The process manager abstraction.</param>
     /// <param name="settings">The product settings.</param>
     /// <exception cref="ArgumentNullException">Thrown when serviceProvider is null.</exception>
-    public ProtocolServer(ISettings settings)
+    public ProtocolServer(IFileSystem fileSystem, IProcessManager processManager, ISettings settings)
     {
         IsRunning = false;
         m_Logger = LogManager.GetCurrentClassLogger();
         m_Settings = settings;
-        EngineService.Initialize(m_Settings);
+        EngineService.Initialize(fileSystem, processManager, m_Settings);
     }
 
     /// <summary>

nexus_protocol/Services/EngineService.cs

@@ -1,6 +1,8 @@
 using Nexus.Config;
 using Nexus.Engine;
 using Nexus.Engine.Share;
+using Nexus.External.Apis.FileSystem;
+using Nexus.External.Apis.ProcessManagement;
 
 namespace Nexus.Protocol.Services
 {
@@ -11,7 +13,7 @@ namespace Nexus.Protocol.Services
     internal static class EngineService
     {
         /// <summary>
-        /// The debug engine instance. Null until initialized via <see cref="Initialize(ISettings)"/>.
+        /// The debug engine instance. Null until initialized via <see cref="Initialize(IFileSystem, IProcessManager, ISettings)"/>.
         /// </summary>
         private static IDebugEngine? m_DebugEngine;
 
@@ -25,7 +27,7 @@ internal static class EngineService
         /// Retrieves the debug engine instance in a thread-safe manner.
         /// </summary>
         /// <returns>The initialized debug engine instance.</returns>
-        /// <exception cref="InvalidOperationException">Thrown when the debug engine has not been initialized via <see cref="Initialize(ISettings)"/>.</exception>
+        /// <exception cref="InvalidOperationException">Thrown when the debug engine has not been initialized via <see cref="Initialize(IFileSystem, IProcessManager, ISettings)"/>.</exception>
         public static IDebugEngine Get()
         {
             m_DebugEngineLock.EnterReadLock();
@@ -43,14 +45,16 @@ public static IDebugEngine Get()
         /// Initializes the debug engine instance with the specified settings.
         /// This method must be called before using <see cref="Get()"/> to retrieve the engine.
         /// </summary>
-        /// <param name="settings">The settings to use for initializing the debug engine.</param>
+        /// <param name="fileSystem">The file system abstraction.</param>
+        /// <param name="processManager">The process manager abstraction.</param>
+        /// <param name="settings">The product settings.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="settings"/> is null.</exception>
-        public static void Initialize(ISettings settings)
+        public static void Initialize(IFileSystem fileSystem, IProcessManager processManager, ISettings settings)
         {
             m_DebugEngineLock.EnterWriteLock();
             try
             {
-                m_DebugEngine = new DebugEngine(settings);
+                m_DebugEngine = new DebugEngine(fileSystem, processManager, settings);
             }
             finally
             {

unittests/nexus_unittests/ProgramTests.cs

@@ -8,6 +8,8 @@
 using Nexus.CommandLine;
 using Nexus.Config;
 using Nexus.Config.Models;
+using Nexus.External.Apis.FileSystem;
+using Nexus.External.Apis.ProcessManagement;
 using Nexus.Startup;
 
 using Xunit;
@@ -20,13 +22,18 @@ namespace Nexus.Tests;
 public class ProgramTests
 {
     private readonly Mock<ISettings> m_Settings;
+    private readonly Mock<IFileSystem> m_FileSystem;
+    private readonly Mock<IProcessManager> m_ProcessManager;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ProgramTests"/> class.
     /// </summary>
     public ProgramTests()
     {
         m_Settings = new Mock<ISettings>();
+        m_FileSystem = new Mock<IFileSystem>();
+        m_ProcessManager = new Mock<IProcessManager>();
+
         var sharedConfig = new SharedConfiguration
         {
             McpNexus = new McpNexusSettings
@@ -50,7 +57,7 @@ public void CreateHostBuilder_WithHttpMode_CreatesHostBuilder()
         var context = new CommandLineContext(new[] { "--http" });
 
         // Act
-        var hostBuilder = Program.CreateHostBuilder(context, m_Settings.Object);
+        var hostBuilder = Program.CreateHostBuilder(context, m_FileSystem.Object, m_ProcessManager.Object, m_Settings.Object);
 
         // Assert
         _ = hostBuilder.Should().NotBeNull();
@@ -66,7 +73,7 @@ public void CreateHostBuilder_WithStdioMode_CreatesHostBuilder()
         var context = new CommandLineContext(new[] { "--stdio" });
 
         // Act
-        var hostBuilder = Program.CreateHostBuilder(context, m_Settings.Object);
+        var hostBuilder = Program.CreateHostBuilder(context, m_FileSystem.Object, m_ProcessManager.Object, m_Settings.Object);
 
         // Assert
         _ = hostBuilder.Should().NotBeNull();
@@ -82,7 +89,7 @@ public void CreateHostBuilder_WithServiceMode_CreatesHostBuilder()
         var context = new CommandLineContext(new[] { "--service" });
 
         // Act
-        var hostBuilder = Program.CreateHostBuilder(context, m_Settings.Object);
+        var hostBuilder = Program.CreateHostBuilder(context, m_FileSystem.Object, m_ProcessManager.Object, m_Settings.Object);
 
         // Assert
         _ = hostBuilder.Should().NotBeNull();
@@ -98,7 +105,7 @@ public void CreateHostBuilder_RegistersCommandLineContext()
         var context = new CommandLineContext(Array.Empty<string>());
 
         // Act
-        var hostBuilder = Program.CreateHostBuilder(context, m_Settings.Object);
+        var hostBuilder = Program.CreateHostBuilder(context, m_FileSystem.Object, m_ProcessManager.Object, m_Settings.Object);
         var host = hostBuilder.Build();
         var registeredContext = host.Services.GetService<CommandLineContext>();
 
@@ -117,7 +124,7 @@ public void CreateHostBuilder_RegistersMainHostedService()
         var context = new CommandLineContext(Array.Empty<string>());
 
         // Act
-        var hostBuilder = Program.CreateHostBuilder(context, m_Settings.Object);
+        var hostBuilder = Program.CreateHostBuilder(context, m_FileSystem.Object, m_ProcessManager.Object, m_Settings.Object);
         _ = hostBuilder.ConfigureServices(services => services.AddSingleton(m_Settings.Object));
         var host = hostBuilder.Build();
         var hostedServices = host.Services.GetServices<IHostedService>();
@@ -136,7 +143,7 @@ public void CreateHostBuilder_WithEmptyArgs_CreatesHostBuilder()
         var context = new CommandLineContext(Array.Empty<string>());
 
         // Act
-        var hostBuilder = Program.CreateHostBuilder(context, m_Settings.Object);
+        var hostBuilder = Program.CreateHostBuilder(context, m_FileSystem.Object, m_ProcessManager.Object, m_Settings.Object);
 
         // Assert
         _ = hostBuilder.Should().NotBeNull();
@@ -152,7 +159,7 @@ public void CreateHostBuilder_WithInstallMode_CreatesHostBuilder()
         var context = new CommandLineContext(new[] { "--install" });
 
         // Act
-        var hostBuilder = Program.CreateHostBuilder(context, m_Settings.Object);
+        var hostBuilder = Program.CreateHostBuilder(context, m_FileSystem.Object, m_ProcessManager.Object, m_Settings.Object);
 
         // Assert
         _ = hostBuilder.Should().NotBeNull();
@@ -168,7 +175,7 @@ public void CreateHostBuilder_WithUpdateMode_CreatesHostBuilder()
         var context = new CommandLineContext(new[] { "--update" });
 
         // Act
-        var hostBuilder = Program.CreateHostBuilder(context, m_Settings.Object);
+        var hostBuilder = Program.CreateHostBuilder(context, m_FileSystem.Object, m_ProcessManager.Object, m_Settings.Object);
 
         // Assert
         _ = hostBuilder.Should().NotBeNull();
@@ -184,7 +191,7 @@ public void CreateHostBuilder_WithUninstallMode_CreatesHostBuilder()
         var context = new CommandLineContext(new[] { "--uninstall" });
 
         // Act
-        var hostBuilder = Program.CreateHostBuilder(context, m_Settings.Object);
+        var hostBuilder = Program.CreateHostBuilder(context, m_FileSystem.Object, m_ProcessManager.Object, m_Settings.Object);
 
         // Assert
         _ = hostBuilder.Should().NotBeNull();