Refactor CIEnvironmentDetector to use DI with IConfiguration

Copilot · davidfowl · Copilot · commit a2ed2de96c16 · 2025-10-17T22:43:33.000Z
Co-authored-by: davidfowl &lt;95136+davidfowl@users.noreply.github.com&gt;
diff --git a/src/Aspire.Cli/Commands/DeployCommand.cs b/src/Aspire.Cli/Commands/DeployCommand.cs
@@ -16,8 +16,8 @@ internal sealed class DeployCommand : PublishCommandBase
 {
     private readonly Option<bool> _clearCacheOption;
 
-    public DeployCommand(IDotNetCliRunner runner, IInteractionService interactionService, IProjectLocator projectLocator, AspireCliTelemetry telemetry, IDotNetSdkInstaller sdkInstaller, IFeatures features, ICliUpdateNotifier updateNotifier, CliExecutionContext executionContext)
-        : base("deploy", DeployCommandStrings.Description, runner, interactionService, projectLocator, telemetry, sdkInstaller, features, updateNotifier, executionContext)
+    public DeployCommand(IDotNetCliRunner runner, IInteractionService interactionService, IProjectLocator projectLocator, AspireCliTelemetry telemetry, IDotNetSdkInstaller sdkInstaller, IFeatures features, ICliUpdateNotifier updateNotifier, CliExecutionContext executionContext, ICIEnvironmentDetector ciDetector)
+        : base("deploy", DeployCommandStrings.Description, runner, interactionService, projectLocator, telemetry, sdkInstaller, features, updateNotifier, executionContext, ciDetector)
     {
         _clearCacheOption = new Option<bool>("--clear-cache")
         {
diff --git a/src/Aspire.Cli/Commands/PublishCommand.cs b/src/Aspire.Cli/Commands/PublishCommand.cs
@@ -34,8 +34,8 @@ internal sealed class PublishCommand : PublishCommandBase
 {
     private readonly IPublishCommandPrompter _prompter;
 
-    public PublishCommand(IDotNetCliRunner runner, IInteractionService interactionService, IProjectLocator projectLocator, IPublishCommandPrompter prompter, AspireCliTelemetry telemetry, IDotNetSdkInstaller sdkInstaller, IFeatures features, ICliUpdateNotifier updateNotifier, CliExecutionContext executionContext)
-        : base("publish", PublishCommandStrings.Description, runner, interactionService, projectLocator, telemetry, sdkInstaller, features, updateNotifier, executionContext)
+    public PublishCommand(IDotNetCliRunner runner, IInteractionService interactionService, IProjectLocator projectLocator, IPublishCommandPrompter prompter, AspireCliTelemetry telemetry, IDotNetSdkInstaller sdkInstaller, IFeatures features, ICliUpdateNotifier updateNotifier, CliExecutionContext executionContext, ICIEnvironmentDetector ciDetector)
+        : base("publish", PublishCommandStrings.Description, runner, interactionService, projectLocator, telemetry, sdkInstaller, features, updateNotifier, executionContext, ciDetector)
     {
         ArgumentNullException.ThrowIfNull(prompter);
         _prompter = prompter;
diff --git a/src/Aspire.Cli/Commands/PublishCommandBase.cs b/src/Aspire.Cli/Commands/PublishCommandBase.cs
@@ -27,6 +27,7 @@ internal abstract class PublishCommandBase : BaseCommand
     protected readonly IDotNetSdkInstaller _sdkInstaller;
 
     private readonly IFeatures _features;
+    private readonly ICIEnvironmentDetector _ciDetector;
 
     protected abstract string OperationCompletedPrefix { get; }
     protected abstract string OperationFailedPrefix { get; }
@@ -40,20 +41,22 @@ private static bool IsCompletionStateError(string completionState) =>
     private static bool IsCompletionStateWarning(string completionState) =>
         completionState == CompletionStates.CompletedWithWarning;
 
-    protected PublishCommandBase(string name, string description, IDotNetCliRunner runner, IInteractionService interactionService, IProjectLocator projectLocator, AspireCliTelemetry telemetry, IDotNetSdkInstaller sdkInstaller, IFeatures features, ICliUpdateNotifier updateNotifier, CliExecutionContext executionContext)
+    protected PublishCommandBase(string name, string description, IDotNetCliRunner runner, IInteractionService interactionService, IProjectLocator projectLocator, AspireCliTelemetry telemetry, IDotNetSdkInstaller sdkInstaller, IFeatures features, ICliUpdateNotifier updateNotifier, CliExecutionContext executionContext, ICIEnvironmentDetector ciDetector)
         : base(name, description, features, updateNotifier, executionContext, interactionService)
     {
         ArgumentNullException.ThrowIfNull(runner);
         ArgumentNullException.ThrowIfNull(projectLocator);
         ArgumentNullException.ThrowIfNull(telemetry);
         ArgumentNullException.ThrowIfNull(sdkInstaller);
         ArgumentNullException.ThrowIfNull(features);
+        ArgumentNullException.ThrowIfNull(ciDetector);
 
         _runner = runner;
         _projectLocator = projectLocator;
         _telemetry = telemetry;
         _sdkInstaller = sdkInstaller;
         _features = features;
+        _ciDetector = ciDetector;
 
         var projectOption = new Option<FileInfo?>("--project")
         {
@@ -345,7 +348,7 @@ public async Task<bool> ProcessAndDisplayPublishingActivitiesAsync(IAsyncEnumera
     {
         var stepCounter = 1;
         var steps = new Dictionary<string, StepInfo>();
-        var logger = new ConsoleActivityLogger();
+        var logger = new ConsoleActivityLogger(_ciDetector);
         logger.StartSpinner();
         PublishingActivity? publishingActivity = null;
 
@@ -731,10 +734,10 @@ private class TaskInfo
     /// <summary>
     /// Starts the terminal infinite progress bar.
     /// </summary>
-    private static void StartTerminalProgressBar()
+    private void StartTerminalProgressBar()
     {
         // Skip terminal progress bar in CI environments
-        if (CIEnvironmentDetector.IsCI)
+        if (_ciDetector.IsCI)
         {
             return;
         }
@@ -744,10 +747,10 @@ private static void StartTerminalProgressBar()
     /// <summary>
     /// Stops the terminal progress bar.
     /// </summary>
-    private static void StopTerminalProgressBar()
+    private void StopTerminalProgressBar()
     {
         // Skip terminal progress bar in CI environments
-        if (CIEnvironmentDetector.IsCI)
+        if (_ciDetector.IsCI)
         {
             return;
         }
diff --git a/src/Aspire.Cli/Interaction/ConsoleInteractionService.cs b/src/Aspire.Cli/Interaction/ConsoleInteractionService.cs
@@ -18,19 +18,22 @@ internal class ConsoleInteractionService : IInteractionService
 
     private readonly IAnsiConsole _ansiConsole;
     private readonly CliExecutionContext _executionContext;
+    private readonly ICIEnvironmentDetector _ciDetector;
 
-    public ConsoleInteractionService(IAnsiConsole ansiConsole, CliExecutionContext executionContext)
+    public ConsoleInteractionService(IAnsiConsole ansiConsole, CliExecutionContext executionContext, ICIEnvironmentDetector ciDetector)
     {
         ArgumentNullException.ThrowIfNull(ansiConsole);
         ArgumentNullException.ThrowIfNull(executionContext);
+        ArgumentNullException.ThrowIfNull(ciDetector);
         _ansiConsole = ansiConsole;
         _executionContext = executionContext;
+        _ciDetector = ciDetector;
     }
 
     public async Task<T> ShowStatusAsync<T>(string statusText, Func<Task<T>> action)
     {
         // In debug mode or CI environments, avoid interactive progress as it conflicts with debug logging
-        if (_executionContext.DebugMode || CIEnvironmentDetector.IsCI)
+        if (_executionContext.DebugMode || _ciDetector.IsCI)
         {
             DisplaySubtleMessage(statusText);
             return await action();
@@ -44,7 +47,7 @@ public async Task<T> ShowStatusAsync<T>(string statusText, Func<Task<T>> action)
     public void ShowStatus(string statusText, Action action)
     {
         // In debug mode or CI environments, avoid interactive progress as it conflicts with debug logging
-        if (_executionContext.DebugMode || CIEnvironmentDetector.IsCI)
+        if (_executionContext.DebugMode || _ciDetector.IsCI)
         {
             DisplaySubtleMessage(statusText);
             action();
diff --git a/src/Aspire.Cli/Program.cs b/src/Aspire.Cli/Program.cs
@@ -109,6 +109,7 @@ private static async Task<IHost> BuildApplicationAsync(string[] args)
         // Shared services.
         builder.Services.AddSingleton(_ => BuildCliExecutionContext(debugMode));
         builder.Services.AddSingleton(BuildAnsiConsole);
+        builder.Services.AddSingleton<ICIEnvironmentDetector, CIEnvironmentDetector>();
         AddInteractionServices(builder);
         builder.Services.AddSingleton<IProjectLocator, ProjectLocator>();
         builder.Services.AddSingleton<ISolutionLocator, SolutionLocator>();
@@ -262,7 +263,8 @@ private static void AddInteractionServices(HostApplicationBuilder builder)
                 var ansiConsole = provider.GetRequiredService<IAnsiConsole>();
                 ansiConsole.Profile.Width = 256; // VS code terminal will handle wrapping so set a large width here.
                 var executionContext = provider.GetRequiredService<CliExecutionContext>();
-                var consoleInteractionService = new ConsoleInteractionService(ansiConsole, executionContext);
+                var ciDetector = provider.GetRequiredService<ICIEnvironmentDetector>();
+                var consoleInteractionService = new ConsoleInteractionService(ansiConsole, executionContext, ciDetector);
                 return new ExtensionInteractionService(consoleInteractionService,
                     provider.GetRequiredService<IExtensionBackchannel>(),
                     extensionPromptEnabled);
@@ -279,7 +281,8 @@ private static void AddInteractionServices(HostApplicationBuilder builder)
             {
                 var ansiConsole = provider.GetRequiredService<IAnsiConsole>();
                 var executionContext = provider.GetRequiredService<CliExecutionContext>();
-                return new ConsoleInteractionService(ansiConsole, executionContext);
+                var ciDetector = provider.GetRequiredService<ICIEnvironmentDetector>();
+                return new ConsoleInteractionService(ansiConsole, executionContext, ciDetector);
             });
         }
     }
diff --git a/src/Aspire.Cli/Utils/CIEnvironmentDetector.cs b/src/Aspire.Cli/Utils/CIEnvironmentDetector.cs
@@ -1,19 +1,32 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Configuration;
+
 namespace Aspire.Cli.Utils;
 
 /// <summary>
 /// Detects if the current process is running in a CI environment.
 /// </summary>
-internal static class CIEnvironmentDetector
+internal interface ICIEnvironmentDetector
+{
+    /// <summary>
+    /// Gets whether the current process is running in a CI environment.
+    /// </summary>
+    bool IsCI { get; }
+}
+
+/// <summary>
+/// Default implementation that detects CI environments from configuration.
+/// </summary>
+internal sealed class CIEnvironmentDetector(IConfiguration configuration) : ICIEnvironmentDetector
 {
     /// <summary>
     /// Gets whether the current process is running in a CI environment.
     /// </summary>
-    public static bool IsCI { get; } = DetectCI();
+    public bool IsCI { get; } = DetectCI(configuration);
 
-    private static bool DetectCI()
+    private static bool DetectCI(IConfiguration configuration)
     {
         // Check for common CI environment variables
         // https://github.com/watson/ci-info/blob/master/vendors.json
@@ -36,7 +49,7 @@ private static bool DetectCI()
 
         foreach (var envVar in ciEnvVars)
         {
-            var value = Environment.GetEnvironmentVariable(envVar);
+            var value = configuration[envVar];
             if (!string.IsNullOrEmpty(value))
             {
                 // For CI variable, only return true if it's "true" or "1"
diff --git a/src/Aspire.Cli/Utils/ConsoleActivityLogger.cs b/src/Aspire.Cli/Utils/ConsoleActivityLogger.cs
@@ -18,6 +18,7 @@ namespace Aspire.Cli.Utils;
 internal sealed class ConsoleActivityLogger
 {
     private readonly bool _enableColor;
+    private readonly ICIEnvironmentDetector _ciDetector;
     private readonly object _lock = new();
     private readonly Stopwatch _stopwatch = Stopwatch.StartNew();
     private readonly Dictionary<string, string> _stepColors = new();
@@ -43,12 +44,13 @@ internal sealed class ConsoleActivityLogger
     private const string InProgressSymbol = "→";
     private const string InfoSymbol = "i";
 
-    public ConsoleActivityLogger(bool? forceColor = null)
+    public ConsoleActivityLogger(ICIEnvironmentDetector ciDetector, bool? forceColor = null)
     {
+        _ciDetector = ciDetector;
         _enableColor = forceColor ?? DetectColorSupport();
         
         // Disable spinner in CI environments
-        if (CIEnvironmentDetector.IsCI)
+        if (_ciDetector.IsCI)
         {
             _spinning = false;
         }
@@ -92,7 +94,7 @@ public void StartTask(string taskKey, string displayName, string? startingMessag
     public void StartSpinner()
     {
         // Skip spinner in CI environments
-        if (CIEnvironmentDetector.IsCI || _spinning)
+        if (_ciDetector.IsCI || _spinning)
         {
             return;
         }
@@ -256,7 +258,7 @@ public void WriteSummary(string? dashboardUrl = null)
             {
                 // Render dashboard URL as clickable link in interactive terminals, plain in CI
                 var url = dashboardUrl;
-                if (CIEnvironmentDetector.IsCI || !_enableColor)
+                if (_ciDetector.IsCI || !_enableColor)
                 {
                     AnsiConsole.MarkupLine($"Dashboard: {url.EscapeMarkup()}");
                 }
@@ -392,7 +394,7 @@ private static IEnumerable<string> SplitLinesPreserve(string message)
         options: RegexOptions.Compiled | RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
 
     // Escapes non-URL portions for Spectre markup while preserving injected [link] markup unescaped.
-    private static string HighlightAndEscape(string input)
+    private string HighlightAndEscape(string input)
     {
         if (string.IsNullOrEmpty(input))
         {
@@ -406,7 +408,7 @@ private static string HighlightAndEscape(string input)
         }
 
         // In CI environments, just output URLs as-is without [link] markup
-        if (CIEnvironmentDetector.IsCI)
+        if (_ciDetector.IsCI)
         {
             return input.EscapeMarkup();
         }
@@ -431,12 +433,12 @@ private static string HighlightAndEscape(string input)
         return sb.ToString();
     }
 
-    private static bool DetectColorSupport()
+    private bool DetectColorSupport()
     {
         try
         {
             // In CI environments, we should still use ANSI colors for better readability
-            if (CIEnvironmentDetector.IsCI)
+            if (_ciDetector.IsCI)
             {
                 // Most modern CI systems support ANSI colors
                 return true;
diff --git a/tests/Aspire.Cli.Tests/Interaction/ConsoleInteractionServiceTests.cs b/tests/Aspire.Cli.Tests/Interaction/ConsoleInteractionServiceTests.cs
@@ -14,7 +14,7 @@ public async Task PromptForSelectionAsync_EmptyChoices_ThrowsEmptyChoicesExcepti
     {
         // Arrange
         var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."));
-        var interactionService = new ConsoleInteractionService(AnsiConsole.Console, executionContext);
+        var interactionService = new ConsoleInteractionService(AnsiConsole.Console, executionContext, TestHelpers.CreateNonCIDetector());
         var choices = Array.Empty<string>();
 
         // Act & Assert
@@ -27,7 +27,7 @@ public async Task PromptForSelectionsAsync_EmptyChoices_ThrowsEmptyChoicesExcept
     {
         // Arrange
         var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."));
-        var interactionService = new ConsoleInteractionService(AnsiConsole.Console, executionContext);
+        var interactionService = new ConsoleInteractionService(AnsiConsole.Console, executionContext, TestHelpers.CreateNonCIDetector());
         var choices = Array.Empty<string>();
 
         // Act & Assert
@@ -48,7 +48,7 @@ public void DisplayError_WithMarkupCharacters_DoesNotCauseMarkupParsingError()
         });
         
         var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."));
-        var interactionService = new ConsoleInteractionService(console, executionContext);
+        var interactionService = new ConsoleInteractionService(console, executionContext, TestHelpers.CreateNonCIDetector());
         var errorMessage = "The JSON value could not be converted to <Type>. Path: $.values[0].Type | LineNumber: 0 | BytePositionInLine: 121.";
 
         // Act - this should not throw an exception due to markup parsing
@@ -73,7 +73,7 @@ public void DisplaySubtleMessage_WithMarkupCharacters_DoesNotCauseMarkupParsingE
         });
         
         var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."));
-        var interactionService = new ConsoleInteractionService(console, executionContext);
+        var interactionService = new ConsoleInteractionService(console, executionContext, TestHelpers.CreateNonCIDetector());
         var message = "Path with <brackets> and [markup] characters";
 
         // Act - this should not throw an exception due to markup parsing
@@ -98,7 +98,7 @@ public void DisplayLines_WithMarkupCharacters_DoesNotCauseMarkupParsingError()
         });
         
         var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."));
-        var interactionService = new ConsoleInteractionService(console, executionContext);
+        var interactionService = new ConsoleInteractionService(console, executionContext, TestHelpers.CreateNonCIDetector());
         var lines = new[] 
         {
             ("stdout", "Command output with <angle> brackets"),
@@ -129,7 +129,7 @@ public void DisplayMarkdown_WithBasicMarkdown_ConvertsToSpectreMarkup()
         });
         
         var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."));
-        var interactionService = new ConsoleInteractionService(console, executionContext);
+        var interactionService = new ConsoleInteractionService(console, executionContext, TestHelpers.CreateNonCIDetector());
         var markdown = "# Header\nThis is **bold** and *italic* text with `code`.";
 
         // Act
@@ -156,7 +156,7 @@ public void DisplayMarkdown_WithPlainText_DoesNotThrow()
         });
         
         var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."));
-        var interactionService = new ConsoleInteractionService(console, executionContext);
+        var interactionService = new ConsoleInteractionService(console, executionContext, TestHelpers.CreateNonCIDetector());
         var plainText = "This is just plain text without any markdown.";
 
         // Act
@@ -181,7 +181,7 @@ public async Task ShowStatusAsync_InDebugMode_DisplaysSubtleMessageInsteadOfSpin
         });
 
         var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."), debugMode: true);
-        var interactionService = new ConsoleInteractionService(console, executionContext);
+        var interactionService = new ConsoleInteractionService(console, executionContext, TestHelpers.CreateNonCIDetector());
         var statusText = "Processing request...";
         var result = "test result";
 
@@ -208,7 +208,7 @@ public void ShowStatus_InDebugMode_DisplaysSubtleMessageInsteadOfSpinner()
         });
 
         var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."), debugMode: true);
-        var interactionService = new ConsoleInteractionService(console, executionContext);
+        var interactionService = new ConsoleInteractionService(console, executionContext, TestHelpers.CreateNonCIDetector());
         var statusText = "Processing synchronous request...";
         var actionCalled = false;
 
diff --git a/tests/Aspire.Cli.Tests/Interaction/SpectreConsoleLoggerProviderTests.cs b/tests/Aspire.Cli.Tests/Interaction/SpectreConsoleLoggerProviderTests.cs
diff --git a/tests/Aspire.Cli.Tests/TestHelpers.cs b/tests/Aspire.Cli.Tests/TestHelpers.cs
diff --git a/tests/Aspire.Cli.Tests/Utils/CIEnvironmentDetectorTests.cs b/tests/Aspire.Cli.Tests/Utils/CIEnvironmentDetectorTests.cs
diff --git a/tests/Aspire.Cli.Tests/Utils/CliTestHelper.cs b/tests/Aspire.Cli.Tests/Utils/CliTestHelper.cs

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ internal sealed class DeployCommand : PublishCommandBase`
`16`	`16`	`{`
`17`	`17`	`private readonly Option<bool> _clearCacheOption;`
`18`	`18`
`19`		`- public DeployCommand(IDotNetCliRunner runner, IInteractionService interactionService, IProjectLocator projectLocator, AspireCliTelemetry telemetry, IDotNetSdkInstaller sdkInstaller, IFeatures features, ICliUpdateNotifier updateNotifier, CliExecutionContext executionContext)`
`20`		`- : base("deploy", DeployCommandStrings.Description, runner, interactionService, projectLocator, telemetry, sdkInstaller, features, updateNotifier, executionContext)`
	`19`	`+ public DeployCommand(IDotNetCliRunner runner, IInteractionService interactionService, IProjectLocator projectLocator, AspireCliTelemetry telemetry, IDotNetSdkInstaller sdkInstaller, IFeatures features, ICliUpdateNotifier updateNotifier, CliExecutionContext executionContext, ICIEnvironmentDetector ciDetector)`
	`20`	`+ : base("deploy", DeployCommandStrings.Description, runner, interactionService, projectLocator, telemetry, sdkInstaller, features, updateNotifier, executionContext, ciDetector)`
`21`	`21`	`{`
`22`	`22`	`_clearCacheOption = new Option<bool>("--clear-cache")`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ internal sealed class PublishCommand : PublishCommandBase`
`34`	`34`	`{`
`35`	`35`	`private readonly IPublishCommandPrompter _prompter;`
`36`	`36`
`37`		`- public PublishCommand(IDotNetCliRunner runner, IInteractionService interactionService, IProjectLocator projectLocator, IPublishCommandPrompter prompter, AspireCliTelemetry telemetry, IDotNetSdkInstaller sdkInstaller, IFeatures features, ICliUpdateNotifier updateNotifier, CliExecutionContext executionContext)`
`38`		`- : base("publish", PublishCommandStrings.Description, runner, interactionService, projectLocator, telemetry, sdkInstaller, features, updateNotifier, executionContext)`
	`37`	`+ public PublishCommand(IDotNetCliRunner runner, IInteractionService interactionService, IProjectLocator projectLocator, IPublishCommandPrompter prompter, AspireCliTelemetry telemetry, IDotNetSdkInstaller sdkInstaller, IFeatures features, ICliUpdateNotifier updateNotifier, CliExecutionContext executionContext, ICIEnvironmentDetector ciDetector)`
	`38`	`+ : base("publish", PublishCommandStrings.Description, runner, interactionService, projectLocator, telemetry, sdkInstaller, features, updateNotifier, executionContext, ciDetector)`
`39`	`39`	`{`
`40`	`40`	`ArgumentNullException.ThrowIfNull(prompter);`
`41`	`41`	`_prompter = prompter;`
Original file line number	Diff line number	Diff line change
`@@ -18,19 +18,22 @@ internal class ConsoleInteractionService : IInteractionService`
`18`	`18`
`19`	`19`	`private readonly IAnsiConsole _ansiConsole;`
`20`	`20`	`private readonly CliExecutionContext _executionContext;`
	`21`	`+ private readonly ICIEnvironmentDetector _ciDetector;`
`21`	`22`
`22`		`- public ConsoleInteractionService(IAnsiConsole ansiConsole, CliExecutionContext executionContext)`
	`23`	`+ public ConsoleInteractionService(IAnsiConsole ansiConsole, CliExecutionContext executionContext, ICIEnvironmentDetector ciDetector)`
`23`	`24`	`{`
`24`	`25`	`ArgumentNullException.ThrowIfNull(ansiConsole);`
`25`	`26`	`ArgumentNullException.ThrowIfNull(executionContext);`
	`27`	`+ ArgumentNullException.ThrowIfNull(ciDetector);`
`26`	`28`	`_ansiConsole = ansiConsole;`
`27`	`29`	`_executionContext = executionContext;`
	`30`	`+ _ciDetector = ciDetector;`
`28`	`31`	`}`
`29`	`32`
`30`	`33`	`public async Task<T> ShowStatusAsync<T>(string statusText, Func<Task<T>> action)`
`31`	`34`	`{`
`32`	`35`	`// In debug mode or CI environments, avoid interactive progress as it conflicts with debug logging`
`33`		`- if (_executionContext.DebugMode \|\| CIEnvironmentDetector.IsCI)`
	`36`	`+ if (_executionContext.DebugMode \|\| _ciDetector.IsCI)`
`34`	`37`	`{`
`35`	`38`	`DisplaySubtleMessage(statusText);`
`36`	`39`	`return await action();`
`@@ -44,7 +47,7 @@ public async Task<T> ShowStatusAsync<T>(string statusText, Func<Task<T>> action)`
`44`	`47`	`public void ShowStatus(string statusText, Action action)`
`45`	`48`	`{`
`46`	`49`	`// In debug mode or CI environments, avoid interactive progress as it conflicts with debug logging`
`47`		`- if (_executionContext.DebugMode \|\| CIEnvironmentDetector.IsCI)`
	`50`	`+ if (_executionContext.DebugMode \|\| _ciDetector.IsCI)`
`48`	`51`	`{`
`49`	`52`	`DisplaySubtleMessage(statusText);`
`50`	`53`	`action();`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ namespace Aspire.Cli.Utils;`
`18`	`18`	`internal sealed class ConsoleActivityLogger`
`19`	`19`	`{`
`20`	`20`	`private readonly bool _enableColor;`
	`21`	`+ private readonly ICIEnvironmentDetector _ciDetector;`
`21`	`22`	`private readonly object _lock = new();`
`22`	`23`	`private readonly Stopwatch _stopwatch = Stopwatch.StartNew();`
`23`	`24`	`private readonly Dictionary<string, string> _stepColors = new();`
`@@ -43,12 +44,13 @@ internal sealed class ConsoleActivityLogger`
`43`	`44`	`private const string InProgressSymbol = "→";`
`44`	`45`	`private const string InfoSymbol = "i";`
`45`	`46`
`46`		`- public ConsoleActivityLogger(bool? forceColor = null)`
	`47`	`+ public ConsoleActivityLogger(ICIEnvironmentDetector ciDetector, bool? forceColor = null)`
`47`	`48`	`{`
	`49`	`+ _ciDetector = ciDetector;`
`48`	`50`	`_enableColor = forceColor ?? DetectColorSupport();`
`49`	`51`
`50`	`52`	`// Disable spinner in CI environments`
`51`		`- if (CIEnvironmentDetector.IsCI)`
	`53`	`+ if (_ciDetector.IsCI)`
`52`	`54`	`{`
`53`	`55`	`_spinning = false;`
`54`	`56`	`}`
`@@ -92,7 +94,7 @@ public void StartTask(string taskKey, string displayName, string? startingMessag`
`92`	`94`	`public void StartSpinner()`
`93`	`95`	`{`
`94`	`96`	`// Skip spinner in CI environments`
`95`		`- if (CIEnvironmentDetector.IsCI \|\| _spinning)`
	`97`	`+ if (_ciDetector.IsCI \|\| _spinning)`
`96`	`98`	`{`
`97`	`99`	`return;`
`98`	`100`	`}`
`@@ -256,7 +258,7 @@ public void WriteSummary(string? dashboardUrl = null)`
`256`	`258`	`{`
`257`	`259`	`// Render dashboard URL as clickable link in interactive terminals, plain in CI`
`258`	`260`	`var url = dashboardUrl;`
`259`		`- if (CIEnvironmentDetector.IsCI \|\| !_enableColor)`
	`261`	`+ if (_ciDetector.IsCI \|\| !_enableColor)`
`260`	`262`	`{`
`261`	`263`	`AnsiConsole.MarkupLine($"Dashboard: {url.EscapeMarkup()}");`
`262`	`264`	`}`
`@@ -392,7 +394,7 @@ private static IEnumerable<string> SplitLinesPreserve(string message)`
`392`	`394`	`options: RegexOptions.Compiled \| RegexOptions.CultureInvariant \| RegexOptions.IgnoreCase);`
`393`	`395`
`394`	`396`	`// Escapes non-URL portions for Spectre markup while preserving injected [link] markup unescaped.`
`395`		`- private static string HighlightAndEscape(string input)`
	`397`	`+ private string HighlightAndEscape(string input)`
`396`	`398`	`{`
`397`	`399`	`if (string.IsNullOrEmpty(input))`
`398`	`400`	`{`
`@@ -406,7 +408,7 @@ private static string HighlightAndEscape(string input)`
`406`	`408`	`}`
`407`	`409`
`408`	`410`	`// In CI environments, just output URLs as-is without [link] markup`
`409`		`- if (CIEnvironmentDetector.IsCI)`
	`411`	`+ if (_ciDetector.IsCI)`
`410`	`412`	`{`
`411`	`413`	`return input.EscapeMarkup();`
`412`	`414`	`}`
`@@ -431,12 +433,12 @@ private static string HighlightAndEscape(string input)`
`431`	`433`	`return sb.ToString();`
`432`	`434`	`}`
`433`	`435`
`434`		`- private static bool DetectColorSupport()`
	`436`	`+ private bool DetectColorSupport()`
`435`	`437`	`{`
`436`	`438`	`try`
`437`	`439`	`{`
`438`	`440`	`// In CI environments, we should still use ANSI colors for better readability`
`439`		`- if (CIEnvironmentDetector.IsCI)`
	`441`	`+ if (_ciDetector.IsCI)`
`440`	`442`	`{`
`441`	`443`	`// Most modern CI systems support ANSI colors`
`442`	`444`	`return true;`