Show waiting dependency details in dashboard

playground/TestShop/BasketService/appsettings.json

@@ -7,11 +7,6 @@
     }
   },
   "AllowedHosts": "*",
-  "Kestrel": {
-    "EndpointDefaults": {
-      "Protocols": "Http2"
-    }
-  },
   "Aspire": {
     "RabbitMQ": {
       "Client": {

playground/TestShop/TestShop.AppHost/AppHost.cs

@@ -29,7 +29,9 @@
 #endif
 
 var catalogDbApp = builder.AddProject<Projects.CatalogDb>("catalogdbapp")
-                          .WithReference(catalogDb);
+                          .WithReference(catalogDb)
+                          .WaitFor(catalogDb)
+                          .WithHttpHealthCheck("/health");
 
 if (builder.Environment.IsDevelopment() && builder.ExecutionContext.IsRunMode)
 {
@@ -51,6 +53,8 @@
 
 var catalogService = builder.AddProject<Projects.CatalogService>("catalogservice")
                             .WithReference(catalogDb)
+                            .WaitFor(catalogDb)
+                            .WaitFor(catalogDbApp)
                             // Modify the endpoint URL
                             .WithUrlForEndpoint("https", u =>
                             {
@@ -65,6 +69,7 @@
                             })
                             // Hide the http URL
                             .WithUrlForEndpoint("http", u => u.DisplayLocation = UrlDisplayLocation.DetailsOnly)
+                            .WithHttpHealthCheck("/health")
                             .WithReplicas(2);
 
 var messaging = builder.AddRabbitMQ("messaging")
@@ -75,30 +80,43 @@
 
 var basketService = builder.AddProject("basketservice", @"..\BasketService\BasketService.csproj")
                            .WithReference(basketCache)
-                           .WithReference(messaging).WaitFor(messaging);
+                           .WaitFor(basketCache)
+                           .WithReference(messaging)
+                           .WaitFor(messaging)
+                           .WithHttpHealthCheck("/health", endpointName: "http");
 
 var frontend = builder.AddProject<Projects.MyFrontend>("frontend")
-       .WithExternalHttpEndpoints()
-       .WithReference(basketService)
-       .WithReference(catalogService)
-       // Modify the display text of the URLs
-       .WithUrls(c => c.Urls.ForEach(u => u.DisplayText = $"Online store ({u.Endpoint?.EndpointName})"))
-       // Don't show the non-HTTPS link on the resources page (details only)
-       .WithUrlForEndpoint("http", url => url.DisplayLocation = UrlDisplayLocation.DetailsOnly)
-       // Add health relative URL (show in details only)
-       .WithUrlForEndpoint("https", ep => new() { Url = "/health", DisplayText = "Health", DisplayLocation = UrlDisplayLocation.DetailsOnly })
-       .WithHttpHealthCheck("/health");
+    .WithExternalHttpEndpoints()
+    .WithReference(basketService)
+    .WaitFor(basketService)
+    .WithReference(catalogService)
+    .WaitFor(catalogService)
+    // Modify the display text of the URLs
+    .WithUrls(c => c.Urls.ForEach(u => u.DisplayText = $"Online store ({u.Endpoint?.EndpointName})"))
+    // Don't show the non-HTTPS link on the resources page (details only)
+    .WithUrlForEndpoint("http", url => url.DisplayLocation = UrlDisplayLocation.DetailsOnly)
+    // Add health relative URL (show in details only)
+    .WithUrlForEndpoint("https", ep => new() { Url = "/health", DisplayText = "Health", DisplayLocation = UrlDisplayLocation.DetailsOnly })
+    .WithHttpHealthCheck("/health");
 
 builder.AddProject<Projects.OrderProcessor>("orderprocessor", launchProfileName: "OrderProcessor")
-       .WithReference(messaging).WaitFor(messaging);
+    .WithReference(messaging)
+    .WaitFor(messaging);
 
 #if YARP_USE_CONFIG_FILE
 builder.AddYarp("apigateway")
-       .WithConfigFile("yarp.json")
-       .WithReference(basketService)
-       .WithReference(catalogService);
+    .WithConfigFile("yarp.json")
+    .WithReference(basketService)
+    .WaitFor(basketService)
+    .WithReference(catalogService)
+    .WaitFor(catalogService);
 #else
 var yarp = builder.AddYarp("apigateway");
+yarp.WithReference(basketService)
+    .WaitFor(basketService)
+    .WithReference(catalogService)
+    .WaitFor(catalogService);
+
 yarp.WithConfiguration(builder =>
 {
     // catalog 

src/Aspire.Cli/Backchannel/BackchannelJsonSerializerContext.cs

@@ -56,6 +56,7 @@ namespace Aspire.Cli.Backchannel;
 [JsonSerializable(typeof(IAsyncEnumerable<ResourceLogBatch>))]
 [JsonSerializable(typeof(MessageFormatterEnumerableTracker.EnumeratorResults<ResourceLogBatch>))]
 [JsonSerializable(typeof(Dictionary<string, JsonElement>))]
+[JsonSerializable(typeof(Dictionary<string, JsonNode?>))]
 [JsonSerializable(typeof(Dictionary<string, string>))]
 [JsonSerializable(typeof(JsonNode))]
 [JsonSerializable(typeof(CapabilitiesInfo))]

src/Aspire.Cli/Backchannel/ResourceSnapshotMapper.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Text.Json.Nodes;
+using Aspire.Dashboard.Model;
 using Aspire.Dashboard.Utils;
 using Aspire.Shared;
 using Aspire.Shared.Model;
@@ -82,7 +84,9 @@ public static ResourceJson MapToResourceJson(ResourceSnapshot snapshot, IReadOnl
 
         var properties = snapshot.Properties.OrderBy(p => p.Key).ToDistinctDictionary(
             p => p.Key,
-            p => p.Value);
+            p => p.Value?.DeepClone());
+
+        var waitingFor = GetResolvedWaitingForDependencies(snapshot, allSnapshots);
 
         // Build relationships by matching DisplayName
         var relationships = new List<ResourceRelationshipJson>();
@@ -119,7 +123,10 @@ public static ResourceJson MapToResourceJson(ResourceSnapshot snapshot, IReadOnl
                 });
 
         // Get source information using the shared ResourceSourceViewModel
-        var sourceViewModel = ResourceSource.GetSourceModel(snapshot.ResourceType, snapshot.Properties);
+        var stringProperties = snapshot.Properties.OrderBy(p => p.Key).ToDistinctDictionary(
+            p => p.Key,
+            p => ConvertJsonNodeToString(p.Value));
+        var sourceViewModel = ResourceSource.GetSourceModel(snapshot.ResourceType, stringProperties);
 
         // Generate dashboard URL for this resource if a base URL is provided
         string? dashboardUrl = null;
@@ -135,6 +142,7 @@ public static ResourceJson MapToResourceJson(ResourceSnapshot snapshot, IReadOnl
             DisplayName = snapshot.DisplayName,
             ResourceType = snapshot.ResourceType,
             State = snapshot.State,
+            WaitingFor = waitingFor,
             StateStyle = snapshot.StateStyle,
             HealthStatus = snapshot.HealthStatus,
             Source = sourceViewModel?.Value,
@@ -153,6 +161,60 @@ public static ResourceJson MapToResourceJson(ResourceSnapshot snapshot, IReadOnl
         };
     }
 
+    private static string[]? GetResolvedWaitingForDependencies(ResourceSnapshot snapshot, IReadOnlyList<ResourceSnapshot> allSnapshots)
+    {
+        var waitingFor = snapshot.WaitingFor;
+        if (waitingFor is not { Length: > 0 } &&
+            snapshot.Properties.TryGetValue(KnownProperties.Resource.WaitingFor, out var waitingForProperty) &&
+            TryConvertJsonNodeToString(waitingForProperty, out var waitingForPropertyString) &&
+            !string.IsNullOrWhiteSpace(waitingForPropertyString))
+        {
+            waitingFor = waitingForPropertyString.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+        }
+
+        if (waitingFor is not { Length: > 0 })
+        {
+            return null;
+        }
+
+        var dependencies = new List<string>();
+        var seenDependencies = new HashSet<string>(StringComparers.ResourceName);
+
+        foreach (var dependency in waitingFor)
+        {
+            var dependencyName = dependency;
+            var matches = ResolveResources(dependency, allSnapshots);
+            if (matches.Count == 1)
+            {
+                dependencyName = GetResourceName(matches[0], allSnapshots);
+            }
+
+            if (seenDependencies.Add(dependencyName))
+            {
+                dependencies.Add(dependencyName);
+            }
+        }
+
+        return dependencies.Count > 0 ? [.. dependencies] : null;
+    }
+
+    private static string? ConvertJsonNodeToString(JsonNode? node)
+    {
+        return TryConvertJsonNodeToString(node, out var value) ? value : null;
+    }
+
+    private static bool TryConvertJsonNodeToString(JsonNode? node, [System.Diagnostics.CodeAnalysis.NotNullWhen(returnValue: true)] out string? value)
+    {
+        if (node is JsonValue jsonValue && jsonValue.TryGetValue<string>(out var stringValue))
+        {
+            value = stringValue;
+            return true;
+        }
+
+        value = null;
+        return false;
+    }
+
     internal static bool IsCommandAvailableToApi(ResourceSnapshotCommand command)
     {
         return string.Equals(command.State, "Enabled", StringComparison.OrdinalIgnoreCase) &&

src/Aspire.Cli/Commands/DescribeCommand.cs

@@ -4,6 +4,7 @@
 using System.CommandLine;
 using System.Globalization;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using Aspire.Cli.Backchannel;
 using Aspire.Cli.Configuration;
@@ -32,6 +33,8 @@ internal sealed class ResourcesOutput
 [JsonSerializable(typeof(ResourceJson))]
 [JsonSerializable(typeof(ResourceUrlJson))]
 [JsonSerializable(typeof(ResourceVolumeJson))]
+[JsonSerializable(typeof(JsonNode))]
+[JsonSerializable(typeof(Dictionary<string, JsonNode?>))]
 [JsonSerializable(typeof(Dictionary<string, string?>))]
 [JsonSerializable(typeof(Dictionary<string, ResourceHealthReportJson>))]
 [JsonSerializable(typeof(ResourceRelationshipJson))]

src/Aspire.Cli/Commands/PsCommand.cs

@@ -4,6 +4,7 @@
 using System.CommandLine;
 using System.Globalization;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using Aspire.Cli.Backchannel;
 using Aspire.Cli.Configuration;
@@ -44,6 +45,8 @@ internal sealed class AppHostDisplayInfo
 [JsonSerializable(typeof(ResourceHealthReportJson))]
 [JsonSerializable(typeof(ResourceCommandJson))]
 [JsonSerializable(typeof(ResourceCommandArgumentJson[]))]
+[JsonSerializable(typeof(JsonNode))]
+[JsonSerializable(typeof(Dictionary<string, JsonNode?>))]
 [JsonSerializable(typeof(Dictionary<string, string?>))]
 [JsonSerializable(typeof(Dictionary<string, ResourceHealthReportJson>))]
 [JsonSerializable(typeof(Dictionary<string, ResourceCommandJson>))]

src/Aspire.Cli/Mcp/Tools/ListResourcesTool.cs

@@ -3,6 +3,7 @@
 
 using System.Text.Encodings.Web;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using Aspire.Cli.Backchannel;
 using Aspire.Shared.Model.Serialization;
@@ -15,6 +16,8 @@ namespace Aspire.Cli.Mcp.Tools;
 [JsonSerializable(typeof(ResourceJson[]))]
 [JsonSerializable(typeof(ResourceUrlJson))]
 [JsonSerializable(typeof(ResourceVolumeJson))]
+[JsonSerializable(typeof(JsonNode))]
+[JsonSerializable(typeof(Dictionary<string, JsonNode?>))]
 [JsonSerializable(typeof(Dictionary<string, string?>))]
 [JsonSerializable(typeof(Dictionary<string, ResourceHealthReportJson>))]
 [JsonSerializable(typeof(ResourceRelationshipJson))]

src/Aspire.Dashboard/Components/Controls/ResourceDetails.razor.cs

@@ -212,7 +212,7 @@ protected override void OnParametersSet()
                 {
                     Type = typeof(ResourceHealthStateValue),
                     Parameters = { ["Resource"] = _resource }
-                },
+                }
             };
 
             // For parameter resources whose value is unset, render the same "Value not set" affordance
@@ -225,7 +225,7 @@ protected override void OnParametersSet()
                     Parameters =
                     {
                         ["Resource"] = _resource,
-                        ["OnExecuteCommandAsync"] = (Func<ResourceViewModel, CommandViewModel, Task>)ExecuteParameterCommandAsync,
+                        ["OnExecuteCommandAsync"] = (Func<ResourceViewModel, CommandViewModel, Task>)ExecuteResourceCommandAsync,
                         ["IsCommandExecuting"] = IsCommandExecuting,
                     }
                 };
@@ -307,10 +307,11 @@ private void UpdateResourceActionsMenu()
             IsCommandExecuting,
             showViewDetails: false,
             showConsoleLogsItem: true,
-            showUrls: true);
+            showUrls: true,
+            showStartCommand: false);
     }
 
-    private async Task ExecuteParameterCommandAsync(ResourceViewModel resource, CommandViewModel command)
+    private async Task ExecuteResourceCommandAsync(ResourceViewModel resource, CommandViewModel command)
     {
         await CommandSelected.InvokeAsync(command);
     }
@@ -375,7 +376,7 @@ private List<DisplayedUrl> GetUrls()
     private void AddStateDescriptionProperty(ResourceViewModel resource)
     {
         var stateViewModel = ResourceStateViewModel.GetStateViewModel(resource, ColumnsLoc);
-        var stateDescription = ResourceStateViewModel.GetResourceStateTooltip(resource, ColumnsLoc);
+        var stateDescription = ResourceStateViewModel.GetResourceStateTooltip(resource, ColumnsLoc, ResourceByName.Values);
 
         if (string.IsNullOrWhiteSpace(stateDescription) || string.Equals(stateDescription, stateViewModel.Text, StringComparison.Ordinal))
         {

src/Aspire.Dashboard/Components/Pages/Resources.razor

@@ -158,7 +158,7 @@
                                                     <ResourceNameDisplay Resource="context.Resource" FilterText="@_filter" FormatName="GetResourceName" />
                                                 </span>
                                             </AspireTemplateColumn>
-                                            <AspireTemplateColumn ColumnId="@StateColumn" ColumnManager="@_manager" Title="@Loc[nameof(Dashboard.Resources.Resources.ResourcesStateColumnHeader)]" Sortable="true" SortBy="@_stateSort" Tooltip="true" TooltipText="@(c => ResourceStateViewModel.GetResourceStateTooltip(c.Resource, ColumnsLoc))">
+                                            <AspireTemplateColumn ColumnId="@StateColumn" ColumnManager="@_manager" Title="@Loc[nameof(Dashboard.Resources.Resources.ResourcesStateColumnHeader)]" Sortable="true" SortBy="@_stateSort" Tooltip="true" TooltipText="@(c => ResourceStateViewModel.GetResourceStateTooltip(c.Resource, ColumnsLoc, _resourceByName.Values))">
                                                 <StateColumnDisplay Resource="@context.Resource" UnviewedErrorCounts="@_resourceUnviewedErrorCounts" />
                                             </AspireTemplateColumn>
                                             <AspireTemplateColumn ColumnId="@StartTimeColumn" ColumnManager="@_manager" Title="@Loc[nameof(Dashboard.Resources.Resources.ResourcesStartTimeColumnHeader)]" Sortable="true" SortBy="@_startTimeSort" TooltipText="@(context => context.Resource.StartTimeStamp != null ? FormatHelpers.FormatDateTime(TimeProvider, context.Resource.StartTimeStamp.Value, MillisecondsDisplay.None, CultureInfo.CurrentCulture) : null)" Tooltip="true">

src/Aspire.Dashboard/Model/Assistant/AIHelpers.cs

@@ -106,7 +106,7 @@ internal static string GetResponseGraphJson(List<ResourceViewModel> resources, s
                 ["resourceName"] = resourceName,
                 ["type"] = resource.ResourceType,
                 ["state"] = resource.State,
-                ["stateDescription"] = ResourceStateViewModel.GetResourceStateTooltip(resource, s_columnsLoc),
+                ["stateDescription"] = ResourceStateViewModel.GetResourceStateTooltip(resource, s_columnsLoc, resources),
                 ["relationships"] = GetResourceRelationshipsJson(resources, resource, getResourceName),
                 ["endpointUrls"] = endpointUrlsArray,
                 ["health"] = healthObj,

src/Aspire.Dashboard/Model/ResourceMenuBuilder.cs

@@ -79,7 +79,8 @@ public void AddMenuItems(
         Func<ResourceViewModel, CommandViewModel, bool> isCommandExecuting,
         bool showViewDetails,
         bool showConsoleLogsItem,
-        bool showUrls)
+        bool showUrls,
+        bool showStartCommand = true)
     {
         if (showViewDetails)
         {
@@ -165,7 +166,7 @@ await _aiContextProvider.LaunchAssistantSidebarAsync(
 
         AddTelemetryMenuItems(menuItems, resource, resourceByName);
 
-        AddCommandMenuItems(menuItems, resource, commandSelected, isCommandExecuting);
+        AddCommandMenuItems(menuItems, resource, commandSelected, isCommandExecuting, showStartCommand);
 
         if (showUrls)
         {
@@ -282,9 +283,10 @@ private void AddTelemetryMenuItems(List<MenuButtonItem> menuItems, ResourceViewM
         }
     }
 
-    private void AddCommandMenuItems(List<MenuButtonItem> menuItems, ResourceViewModel resource, EventCallback<CommandViewModel> commandSelected, Func<ResourceViewModel, CommandViewModel, bool> isCommandExecuting)
+    private void AddCommandMenuItems(List<MenuButtonItem> menuItems, ResourceViewModel resource, EventCallback<CommandViewModel> commandSelected, Func<ResourceViewModel, CommandViewModel, bool> isCommandExecuting, bool showStartCommand)
     {
         var menuCommands = resource.Commands
+                    .Where(c => showStartCommand || !c.Name.Equals(CommandViewModel.StartCommand, StringComparisons.CommandName))
                     .Where(c => c.State != CommandViewModelState.Hidden)
                     .ToList();
 

src/Aspire.Dashboard/Model/ResourceStateViewModel.cs

@@ -101,7 +101,7 @@ private static (Icon icon, Color color) GetStateIcon(ResourceViewModel resource)
     /// <remarks>
     /// This is a static method so it can be called at the level of the parent column.
     /// </remarks>
-    internal static string GetResourceStateTooltip(ResourceViewModel resource, IStringLocalizer<Columns> loc)
+    internal static string GetResourceStateTooltip(ResourceViewModel resource, IStringLocalizer<Columns> loc, IEnumerable<ResourceViewModel>? allResources = null)
     {
         if (resource.IsFailedToStart())
         {
@@ -132,6 +132,13 @@ internal static string GetResourceStateTooltip(ResourceViewModel resource, IStri
         }
         else if (resource.IsWaiting())
         {
+            if (allResources is not null
+                ? resource.TryGetResolvedWaitingForDependencies(allResources, out var dependencies)
+                : resource.TryGetWaitingForDependencies(out dependencies))
+            {
+                return loc.GetString(nameof(Columns.StateColumnResourceWaitingFor), string.Join(", ", dependencies));
+            }
+
             return loc[nameof(Columns.StateColumnResourceWaiting)];
         }
         else if (resource.IsNotStarted())