Pass nonInteractive flag directly to CliHostEnvironment constructor

Co-authored-by: davidfowl <[email protected]>

Author: Copilot

src/Aspire.Cli/Program.cs

@@ -63,15 +63,6 @@ private static async Task<IHost> BuildApplicationAsync(string[] args)
         };
         settings.Configuration.AddEnvironmentVariables();
 
-        // Add --non-interactive flag to configuration if present
-        if (nonInteractive)
-        {
-            settings.Configuration.AddInMemoryCollection(new Dictionary<string, string?>
-            {
-                ["ASPIRE_NON_INTERACTIVE"] = "true"
-            });
-        }
-
         var builder = Host.CreateEmptyApplicationBuilder(settings);
 
         // Set up settings with appropriate paths.
@@ -121,7 +112,11 @@ private static async Task<IHost> BuildApplicationAsync(string[] args)
         // Shared services.
         builder.Services.AddSingleton(_ => BuildCliExecutionContext(debugMode));
         builder.Services.AddSingleton(BuildAnsiConsole);
-        builder.Services.AddSingleton<ICliHostEnvironment, CliHostEnvironment>();
+        builder.Services.AddSingleton<ICliHostEnvironment>(provider =>
+        {
+            var configuration = provider.GetRequiredService<IConfiguration>();
+            return new CliHostEnvironment(configuration, nonInteractive);
+        });
         AddInteractionServices(builder);
         builder.Services.AddSingleton<IProjectLocator, ProjectLocator>();
         builder.Services.AddSingleton<ISolutionLocator, SolutionLocator>();

src/Aspire.Cli/Utils/CliHostEnvironment.cs

@@ -29,22 +29,39 @@ internal interface ICliHostEnvironment
 /// <summary>
 /// Default implementation that detects CLI host environment capabilities from configuration.
 /// </summary>
-internal sealed class CliHostEnvironment(IConfiguration configuration) : ICliHostEnvironment
+internal sealed class CliHostEnvironment : ICliHostEnvironment
 {
     /// <summary>
     /// Gets whether the host supports interactive input (e.g., prompts, user input).
     /// </summary>
-    public bool SupportsInteractiveInput { get; } = DetectInteractiveInput(configuration);
+    public bool SupportsInteractiveInput { get; }
 
     /// <summary>
     /// Gets whether the host supports interactive output (e.g., spinners, progress bars).
     /// </summary>
-    public bool SupportsInteractiveOutput { get; } = DetectInteractiveOutput(configuration);
+    public bool SupportsInteractiveOutput { get; }
 
     /// <summary>
     /// Gets whether the host supports colors and ANSI codes.
     /// </summary>
-    public bool SupportsAnsi { get; } = DetectAnsiSupport(configuration);
+    public bool SupportsAnsi { get; }
+
+    public CliHostEnvironment(IConfiguration configuration, bool nonInteractive)
+    {
+        // If --non-interactive is explicitly set, disable interactive input and output
+        if (nonInteractive)
+        {
+            SupportsInteractiveInput = false;
+            SupportsInteractiveOutput = false;
+        }
+        else
+        {
+            SupportsInteractiveInput = DetectInteractiveInput(configuration);
+            SupportsInteractiveOutput = DetectInteractiveOutput(configuration);
+        }
+
+        SupportsAnsi = DetectAnsiSupport(configuration);
+    }
 
     private static bool DetectInteractiveInput(IConfiguration configuration)
     {

tests/Aspire.Cli.Tests/TestHelpers.cs

@@ -11,6 +11,6 @@ internal static class TestHelpers
     public static ICliHostEnvironment CreateInteractiveHostEnvironment()
     {
         var configuration = new ConfigurationBuilder().Build();
-        return new CliHostEnvironment(configuration);
+        return new CliHostEnvironment(configuration, nonInteractive: false);
     }
 }

tests/Aspire.Cli.Tests/Utils/CliHostEnvironmentTests.cs

@@ -15,7 +15,7 @@ public void SupportsInteractiveInput_ReturnsTrue_WhenNoConfigSet()
         var configuration = new ConfigurationBuilder().Build();
 
         // Act
-        var env = new CliHostEnvironment(configuration);
+        var env = new CliHostEnvironment(configuration, nonInteractive: false);
 
         // Assert
         Assert.True(env.SupportsInteractiveInput);
@@ -28,7 +28,7 @@ public void SupportsInteractiveOutput_ReturnsTrue_WhenNoConfigSet()
         var configuration = new ConfigurationBuilder().Build();
 
         // Act
-        var env = new CliHostEnvironment(configuration);
+        var env = new CliHostEnvironment(configuration, nonInteractive: false);
 
         // Assert
         Assert.True(env.SupportsInteractiveOutput);
@@ -41,7 +41,7 @@ public void SupportsAnsi_ReturnsTrue_WhenNoConfigSet()
         var configuration = new ConfigurationBuilder().Build();
 
         // Act
-        var env = new CliHostEnvironment(configuration);
+        var env = new CliHostEnvironment(configuration, nonInteractive: false);
 
         // Assert
         Assert.True(env.SupportsAnsi);
@@ -61,7 +61,7 @@ public void SupportsInteractiveInput_ReturnsFalse_WhenNonInteractiveSet(string k
             .Build();
 
         // Act
-        var env = new CliHostEnvironment(configuration);
+        var env = new CliHostEnvironment(configuration, nonInteractive: false);
 
         // Assert
         Assert.False(env.SupportsInteractiveInput);
@@ -81,7 +81,7 @@ public void SupportsInteractiveOutput_ReturnsFalse_WhenNonInteractiveSet(string
             .Build();
 
         // Act
-        var env = new CliHostEnvironment(configuration);
+        var env = new CliHostEnvironment(configuration, nonInteractive: false);
 
         // Assert
         Assert.False(env.SupportsInteractiveOutput);
@@ -104,7 +104,7 @@ public void SupportsInteractiveInput_ReturnsFalse_InCIEnvironment(string envVar,
             .Build();
 
         // Act
-        var env = new CliHostEnvironment(configuration);
+        var env = new CliHostEnvironment(configuration, nonInteractive: false);
 
         // Assert
         Assert.False(env.SupportsInteractiveInput);
@@ -126,7 +126,7 @@ public void SupportsInteractiveOutput_ReturnsFalse_InCIEnvironment(string envVar
             .Build();
 
         // Act
-        var env = new CliHostEnvironment(configuration);
+        var env = new CliHostEnvironment(configuration, nonInteractive: false);
 
         // Assert
         Assert.False(env.SupportsInteractiveOutput);
@@ -147,7 +147,7 @@ public void SupportsAnsi_ReturnsTrue_InCIEnvironment(string envVar, string value
             .Build();
 
         // Act
-        var env = new CliHostEnvironment(configuration);
+        var env = new CliHostEnvironment(configuration, nonInteractive: false);
 
         // Assert
         Assert.True(env.SupportsAnsi);
@@ -165,9 +165,48 @@ public void SupportsAnsi_ReturnsFalse_WhenNO_COLORSet()
             .Build();
 
         // Act
-        var env = new CliHostEnvironment(configuration);
+        var env = new CliHostEnvironment(configuration, nonInteractive: false);
 
         // Assert
         Assert.False(env.SupportsAnsi);
     }
+
+    [Fact]
+    public void SupportsInteractiveInput_ReturnsFalse_WhenNonInteractiveTrue()
+    {
+        // Arrange
+        var configuration = new ConfigurationBuilder().Build();
+        
+        // Act
+        var env = new CliHostEnvironment(configuration, nonInteractive: true);
+        
+        // Assert
+        Assert.False(env.SupportsInteractiveInput);
+    }
+
+    [Fact]
+    public void SupportsInteractiveOutput_ReturnsFalse_WhenNonInteractiveTrue()
+    {
+        // Arrange
+        var configuration = new ConfigurationBuilder().Build();
+        
+        // Act
+        var env = new CliHostEnvironment(configuration, nonInteractive: true);
+        
+        // Assert
+        Assert.False(env.SupportsInteractiveOutput);
+    }
+
+    [Fact]
+    public void SupportsAnsi_ReturnsTrue_WhenNonInteractiveTrue()
+    {
+        // Arrange - ANSI should still be supported even in non-interactive mode
+        var configuration = new ConfigurationBuilder().Build();
+        
+        // Act
+        var env = new CliHostEnvironment(configuration, nonInteractive: true);
+        
+        // Assert
+        Assert.True(env.SupportsAnsi);
+    }
 }