[PoC] Add aspire monitor TUI command

Directory.Packages.props

@@ -98,9 +98,9 @@
     <PackageVersion Include="Grpc.AspNetCore" Version="2.71.0" />
     <PackageVersion Include="Grpc.Net.ClientFactory" Version="2.71.0" />
     <PackageVersion Include="Grpc.Tools" Version="2.72.0" />
-    <PackageVersion Include="Hex1b" Version="0.78.0" />
-    <PackageVersion Include="Hex1b.McpServer" Version="0.78.0" />
-    <PackageVersion Include="Hex1b.Tool" Version="0.78.0" />
+    <PackageVersion Include="Hex1b" Version="0.83.0" />
+    <PackageVersion Include="Hex1b.McpServer" Version="0.83.0" />
+    <PackageVersion Include="Hex1b.Tool" Version="0.83.0" />
     <PackageVersion Include="Humanizer.Core" Version="2.14.1" />
     <PackageVersion Include="KubernetesClient" Version="18.0.5" />
     <PackageVersion Include="JsonPatch.Net" Version="3.3.0" />

src/Aspire.Cli/Aspire.Cli.csproj

@@ -9,7 +9,7 @@
     <EnablePackageValidation>false</EnablePackageValidation>
     <AssemblyName>aspire</AssemblyName>
     <RootNamespace>Aspire.Cli</RootNamespace>
-    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <NoWarn>$(NoWarn);CS1591;CS8002</NoWarn>
     <PublishAot>true</PublishAot>
     <OptimizationPreference>Size</OptimizationPreference>
     <DefineConstants>$(DefineConstants);CLI</DefineConstants>
@@ -38,6 +38,7 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" />
+    <PackageReference Include="Hex1b" />
     <PackageReference Include="Spectre.Console" />
     <PackageReference Include="System.CommandLine" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
@@ -163,6 +164,11 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>McpCommandStrings.resx</DependentUpon>
     </Compile>
+    <Compile Update="Resources\MonitorCommandStrings.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>MonitorCommandStrings.resx</DependentUpon>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
@@ -258,5 +264,12 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>McpCommandStrings.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Update="Resources\MonitorCommandStrings.resx">
+      <XlfSourceFormat>Resx</XlfSourceFormat>
+      <XlfOutputItem>EmbeddedResource</XlfOutputItem>
+      <SubType>Designer</SubType>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>MonitorCommandStrings.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
 </Project>

src/Aspire.Cli/Backchannel/AppHostAuxiliaryBackchannel.cs

@@ -393,6 +393,27 @@ public async Task<CallToolResult> CallResourceMcpToolAsync(
             cancellationToken).ConfigureAwait(false);
     }
 
+    /// <inheritdoc />
+    public async Task<IAsyncEnumerable<BackchannelLogEntry>?> GetAppHostLogEntriesAsync(CancellationToken cancellationToken = default)
+    {
+        var rpc = EnsureConnected();
+
+        _logger?.LogDebug("Requesting AppHost log entries");
+
+        try
+        {
+            return await rpc.InvokeWithCancellationAsync<IAsyncEnumerable<BackchannelLogEntry>>(
+                "GetAppHostLogEntriesAsync",
+                [],
+                cancellationToken).ConfigureAwait(false);
+        }
+        catch (Exception ex) when (ex is not OperationCanceledException)
+        {
+            _logger?.LogDebug(ex, "AppHost log streaming is not available. The AppHost may be running an older version.");
+            return null;
+        }
+    }
+
     #region V2 API Methods
 
     /// <summary>

src/Aspire.Cli/Backchannel/IAppHostAuxiliaryBackchannel.cs

@@ -133,4 +133,10 @@
         string status,
         int timeoutSeconds,
         CancellationToken cancellationToken = default);
+    /// Gets AppHost log entries streamed from the hosting process.
+    /// Returns null if the AppHost does not support log streaming.
+    /// </summary>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <returns>An async enumerable of log entries, or null if not supported.</returns>
+    Task<IAsyncEnumerable<BackchannelLogEntry>?> GetAppHostLogEntriesAsync(CancellationToken cancellationToken = default);
 }

src/Aspire.Cli/Commands/AtopCommand.cs

@@ -0,0 +1,44 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.CommandLine;
+using Aspire.Cli.Backchannel;
+using Aspire.Cli.Configuration;
+using Aspire.Cli.Interaction;
+using Aspire.Cli.Resources;
+using Aspire.Cli.Telemetry;
+using Aspire.Cli.UI;
+using Aspire.Cli.Utils;
+using Microsoft.Extensions.Logging;
+
+namespace Aspire.Cli.Commands;
+
+internal sealed class AtopCommand : BaseCommand
+{
+    private readonly IAuxiliaryBackchannelMonitor _backchannelMonitor;
+    private readonly ILogger<AtopCommand> _logger;
+
+    public AtopCommand(
+        IInteractionService interactionService,
+        IAuxiliaryBackchannelMonitor backchannelMonitor,
+        IFeatures features,
+        ICliUpdateNotifier updateNotifier,
+        CliExecutionContext executionContext,
+        AspireCliTelemetry telemetry,
+        ILogger<AtopCommand> logger)
+        : base("atop", MonitorCommandStrings.Description, features, updateNotifier, executionContext, interactionService, telemetry)
+    {
+        _backchannelMonitor = backchannelMonitor;
+        _logger = logger;
+    }
+
+    protected override async Task<int> ExecuteAsync(ParseResult parseResult, CancellationToken cancellationToken)
+    {
+        using var activity = Telemetry.StartDiagnosticActivity(Name);
+
+        var tui = new AspireAtopTui(_backchannelMonitor, _logger);
+        await tui.RunAsync(cancellationToken).ConfigureAwait(false);
+
+        return ExitCodeConstants.Success;
+    }
+}

src/Aspire.Cli/Commands/RootCommand.cs

@@ -130,6 +130,8 @@
         DocsCommand docsCommand,
         SdkCommand sdkCommand,
         SetupCommand setupCommand,
+        MonitorCommand monitorCommand,
+        AtopCommand atopCommand,
         ExtensionInternalCommand extensionInternalCommand,
         IFeatures featureFlags,
         IInteractionService interactionService)
@@ -220,5 +222,10 @@
             Subcommands.Add(sdkCommand);
         }
 
+        if (featureFlags.IsFeatureEnabled(KnownFeatures.MonitorCommandEnabled, false))
+        {
+            Subcommands.Add(atopCommand);
+        }
+
     }
 }

src/Aspire.Cli/KnownFeatures.cs

@@ -31,6 +31,7 @@ internal static class KnownFeatures
     public static string ExperimentalPolyglotPython => "experimentalPolyglot:python";
     public static string DotNetSdkInstallationEnabled => "dotnetSdkInstallationEnabled";
     public static string RunningInstanceDetectionEnabled => "runningInstanceDetectionEnabled";
+    public static string MonitorCommandEnabled => "monitorCommandEnabled";
 
     private static readonly Dictionary<string, FeatureMetadata> s_featureMetadata = new()
     {
@@ -112,7 +113,12 @@ internal static class KnownFeatures
         [RunningInstanceDetectionEnabled] = new(
             RunningInstanceDetectionEnabled,
             "Enable or disable detection of already running Aspire instances to prevent conflicts",
-            DefaultValue: true)
+            DefaultValue: true),
+
+        [MonitorCommandEnabled] = new(
+            MonitorCommandEnabled,
+            "Enable or disable the 'aspire atop' command for launching a TUI to monitor running AppHosts and resources",
+            DefaultValue: false)
     };
 
     /// <summary>

src/Aspire.Cli/Program.cs

@@ -374,6 +374,8 @@ internal static async Task<IHost> BuildApplicationAsync(string[] args, Dictionar
         builder.Services.AddTransient<SdkGenerateCommand>();
         builder.Services.AddTransient<SdkDumpCommand>();
         builder.Services.AddTransient<SetupCommand>();
+        builder.Services.AddTransient<MonitorCommand>();
+        builder.Services.AddTransient<AtopCommand>();
         builder.Services.AddTransient<RootCommand>();
         builder.Services.AddTransient<ExtensionInternalCommand>();