Merge v13.3.4 to main (replaces #17139)

src/Aspire.Cli/Commands/DeployCommand.cs

@@ -51,7 +51,7 @@ protected override Task<string[]> GetRunArgumentsAsync(string? fullyQualifiedOut
         }
 
         // Add --log-level and --envionment flags if specified
-        var logLevel = parseResult.GetValue(s_logLevelOption);
+        var logLevel = parseResult.GetValue(s_pipelineLogLevelOption);
 
         if (!string.IsNullOrEmpty(logLevel))
         {

src/Aspire.Cli/Commands/DestroyCommand.cs

@@ -52,7 +52,7 @@ protected override Task<string[]> GetRunArgumentsAsync(string? fullyQualifiedOut
             baseArgs.AddRange(["--yes", "true"]);
         }
 
-        var logLevel = parseResult.GetValue(s_logLevelOption);
+        var logLevel = parseResult.GetValue(s_pipelineLogLevelOption);
         if (!string.IsNullOrEmpty(logLevel))
         {
             baseArgs.AddRange(["--log-level", logLevel!]);

src/Aspire.Cli/Commands/DoCommand.cs

@@ -76,7 +76,7 @@ protected override async Task<string[]> GetRunArgumentsAsync(string? fullyQualif
         }
 
         // Add --log-level and --environment flags if specified
-        var logLevel = parseResult.GetValue(s_logLevelOption);
+        var logLevel = parseResult.GetValue(s_pipelineLogLevelOption);
         if (!string.IsNullOrEmpty(logLevel))
         {
             baseArgs.AddRange(["--log-level", logLevel!]);

src/Aspire.Cli/Commands/PipelineCommandBase.cs

@@ -41,7 +41,7 @@ internal abstract class PipelineCommandBase : BaseCommand
 
     private readonly Option<string?> _outputPathOption;
 
-    protected static readonly Option<string?> s_logLevelOption = new("--log-level")
+    protected static readonly Option<string?> s_pipelineLogLevelOption = new("--pipeline-log-level")
     {
         Description = SharedCommandStrings.PipelineLogLevelOptionDescription
     };
@@ -97,7 +97,7 @@ protected PipelineCommandBase(string name, string description, IDotNetCliRunner
 
         Options.Add(s_appHostOption);
         Options.Add(_outputPathOption);
-        Options.Add(s_logLevelOption);
+        Options.Add(s_pipelineLogLevelOption);
         Options.Add(s_environmentOption);
         Options.Add(s_includeExceptionDetailsOption);
         Options.Add(s_noBuildOption);
@@ -281,7 +281,7 @@ protected override async Task<CommandResult> ExecuteAsync(ParseResult parseResul
             var publishingActivities = backchannel.GetPublishingActivitiesAsync(cancellationToken);
 
             // Check if debug or trace logging is enabled
-            var logLevel = parseResult.GetValue(s_logLevelOption);
+            var logLevel = parseResult.GetValue(s_pipelineLogLevelOption);
             var isDebugOrTraceLoggingEnabled = logLevel?.Equals("debug", StringComparison.OrdinalIgnoreCase) == true ||
                                                  logLevel?.Equals("trace", StringComparison.OrdinalIgnoreCase) == true;
 

src/Aspire.Cli/Commands/PublishCommand.cs

@@ -59,7 +59,7 @@ protected override Task<string[]> GetRunArgumentsAsync(string? fullyQualifiedOut
         }
 
         // Add --log-level and --envionment flags if specified
-        var logLevel = parseResult.GetValue(s_logLevelOption);
+        var logLevel = parseResult.GetValue(s_pipelineLogLevelOption);
 
         if (!string.IsNullOrEmpty(logLevel))
         {

src/Aspire.Cli/Commands/TelemetryCommandHelpers.cs

@@ -212,7 +212,8 @@ public static async Task<DashboardApiResult> GetDashboardApiAsync(
             var loginToken = McpToolHelpers.ExtractLoginToken(dashboardUrl);
 
             // Normalize login URLs (e.g., http://localhost:18888/login?t=abc) to base URL
-            dashboardUrl = McpToolHelpers.StripLoginPath(dashboardUrl) ?? dashboardUrl;
+            var displayDashboardUrl = McpToolHelpers.StripLoginPath(dashboardUrl) ?? dashboardUrl;
+            dashboardUrl = McpToolHelpers.NormalizeDashboardUrl(displayDashboardUrl);
 
             if (!UrlHelper.IsHttpUrl(dashboardUrl))
             {
@@ -235,10 +236,10 @@ public static async Task<DashboardApiResult> GetDashboardApiAsync(
                     var errorInfo = exchangeResult.FailureKind switch
                     {
                         TokenExchangeFailureKind.ConnectionError => new TelemetryErrorInfo(
-                            string.Format(CultureInfo.CurrentCulture, TelemetryCommandStrings.DashboardConnectionFailed, dashboardUrl),
+                            string.Format(CultureInfo.CurrentCulture, TelemetryCommandStrings.DashboardConnectionFailed, displayDashboardUrl),
                             TelemetryCommandStrings.DashboardConnectionFailedHint),
                         TokenExchangeFailureKind.ApiNotEnabled => new TelemetryErrorInfo(
-                            string.Format(CultureInfo.CurrentCulture, TelemetryCommandStrings.DashboardApiNotEnabled, dashboardUrl),
+                            string.Format(CultureInfo.CurrentCulture, TelemetryCommandStrings.DashboardApiNotEnabled, displayDashboardUrl),
                             TelemetryCommandStrings.DashboardApiNotEnabledHint),
                         _ => new TelemetryErrorInfo(
                             TelemetryCommandStrings.DashboardLoginTokenFailed,
@@ -253,7 +254,7 @@ public static async Task<DashboardApiResult> GetDashboardApiAsync(
             }
 
             var token = apiKey ?? string.Empty;
-            return new DashboardApiResult(true, null, dashboardUrl, token, dashboardUrl, 0);
+            return new DashboardApiResult(true, null, dashboardUrl, token, displayDashboardUrl, 0);
         }
 
         var result = await connectionResolver.ResolveConnectionAsync(
@@ -287,10 +288,13 @@ public static async Task<DashboardApiResult> GetDashboardApiAsync(
             return new DashboardApiResult(true, connection, null, null, null, 0);
         }
 
-        // Extract dashboard base URL (without /login path) for hyperlinks
+        var apiBaseUrl = McpToolHelpers.NormalizeDashboardUrl(dashboardInfo.ApiBaseUrl);
+
+        // Extract dashboard base URL (without /login path) for hyperlinks.
+        // Preserve the original hostname (e.g. *.dev.localhost) for display URLs.
         var extractedDashboardUrl = ExtractDashboardBaseUrl(dashboardInfo.DashboardUrls?.FirstOrDefault());
 
-        return new DashboardApiResult(true, connection, dashboardInfo.ApiBaseUrl, dashboardInfo.ApiToken, extractedDashboardUrl, 0);
+        return new DashboardApiResult(true, connection, apiBaseUrl, dashboardInfo.ApiToken, extractedDashboardUrl, 0);
     }
 
     /// <summary>

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

@@ -49,6 +49,9 @@ internal sealed class StaticDashboardInfoProvider(string dashboardUrl, string? a
     {
         // For unsecured dashboards, apiToken is empty string (no X-API-Key header will be sent)
         var apiToken = apiKey ?? string.Empty;
-        return Task.FromResult((apiToken, dashboardUrl, (string?)dashboardUrl));
+        // Normalize the API base URL (e.g., rewrite *.localhost to localhost) for HTTP requests,
+        // but preserve the original URL as the dashboard display URL.
+        var apiBaseUrl = McpToolHelpers.NormalizeDashboardUrl(dashboardUrl);
+        return Task.FromResult((apiToken, apiBaseUrl, (string?)dashboardUrl));
     }
 }

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

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Globalization;
 using System.Web;
 using Aspire.Cli.Backchannel;
 using Microsoft.Extensions.Logging;
@@ -26,9 +27,10 @@ internal static class McpToolHelpers
             throw new McpProtocolException(McpErrorMessages.DashboardNotAvailable, McpErrorCode.InternalError);
         }
 
+        var apiBaseUrl = NormalizeDashboardUrl(dashboardInfo.ApiBaseUrl);
         var dashboardBaseUrl = StripLoginPath(dashboardInfo.DashboardUrls.FirstOrDefault());
 
-        return (dashboardInfo.ApiToken, dashboardInfo.ApiBaseUrl, dashboardBaseUrl);
+        return (dashboardInfo.ApiToken, apiBaseUrl, dashboardBaseUrl);
     }
 
     /// <summary>
@@ -59,6 +61,31 @@ internal static class McpToolHelpers
         return url;
     }
 
+    /// <summary>
+    /// Replaces AppHost-scoped <c>*.localhost</c> dashboard hostnames with <c>localhost</c>.
+    /// </summary>
+    /// <remarks>
+    /// DNS resolvers typically don't implement RFC 6761 for localhost subdomains, so hosts
+    /// like <c>dashboard.dev.localhost</c> fail to resolve when making HTTP requests.
+    /// Rewriting to <c>localhost</c> ensures the CLI can reach the dashboard API.
+    /// </remarks>
+    internal static string NormalizeDashboardUrl(string url)
+    {
+        if (Uri.TryCreate(url, UriKind.Absolute, out var uri) && IsLocalhostTld(uri.Host))
+        {
+            var port = uri.IsDefaultPort ? string.Empty : ":" + uri.Port.ToString(CultureInfo.InvariantCulture);
+            var pathAndQuery = uri.PathAndQuery == "/" ? string.Empty : uri.PathAndQuery;
+            return $"{uri.Scheme}://localhost{port}{pathAndQuery}{uri.Fragment}";
+        }
+
+        return url;
+    }
+
+    private static bool IsLocalhostTld(string host)
+    {
+        return host.EndsWith(".localhost", StringComparison.OrdinalIgnoreCase);
+    }
+
     /// <summary>
     /// Extracts the browser token (<c>t</c> query parameter) from a dashboard login URL.
     /// Returns <c>null</c> if the URL does not contain a login token.

src/Aspire.Cli/Resources/ConsoleActivityLoggerStrings.resx

@@ -142,7 +142,7 @@
     <value>Total time: {0}</value>
   </data>
   <data name="SummaryLogLevelHelp" xml:space="preserve">
-    <value>For more details, add --log-level debug/trace to the command.</value>
+    <value>For more details, add --pipeline-log-level debug/trace to the command.</value>
   </data>
   <data name="PipelineSucceeded" xml:space="preserve">
     <value>Pipeline succeeded</value>

src/Aspire.Cli/Resources/DestroyCommandStrings.resx

@@ -120,6 +120,9 @@
   <data name="Description" xml:space="preserve">
     <value>Destroy a previously deployed AppHost environment</value>
   </data>
+  <data name="NonInteractiveRequiresYes" xml:space="preserve">
+    <value>The destroy command requires --yes when the --non-interactive option is specified.</value>
+  </data>
   <data name="OutputPathArgumentDescription" xml:space="preserve">
     <value>The output path containing the deployment artifacts to destroy</value>
   </data>