Clarify Aspire update notification

src/Aspire.Cli/Commands/AppHostLauncher.cs

@@ -87,6 +87,7 @@ internal static void AddLaunchOptions(Command command)
     /// <param name="additionalArgs">Additional unmatched args to forward.</param>
     /// <param name="stopAfterLaunchDelay">Optional delay after launch before stopping the AppHost.</param>
     /// <param name="cancellationToken">Cancellation token.</param>
+    /// <param name="appHostSelected">Callback invoked when an AppHost project file has been selected.</param>
     /// <returns>A <see cref="CommandResult"/> indicating success or failure.</returns>
     public async Task<CommandResult> LaunchDetachedAsync(
         FileInfo? passedAppHostProjectFile,
@@ -97,7 +98,8 @@ public async Task<CommandResult> LaunchDetachedAsync(
         IEnumerable<string> globalArgs,
         IEnumerable<string> additionalArgs,
         TimeSpan? stopAfterLaunchDelay,
-        CancellationToken cancellationToken)
+        CancellationToken cancellationToken,
+        Action<FileInfo>? appHostSelected = null)
     {
         // In JSON mode or non-interactive mode, avoid interactive prompts.
         var multipleAppHostBehavior = format == OutputFormat.Json || !hostEnvironment.SupportsInteractiveInput
@@ -126,6 +128,8 @@ public async Task<CommandResult> LaunchDetachedAsync(
             return CommandResult.Failure(CliExitCodes.FailedToFindProject);
         }
 
+        appHostSelected?.Invoke(effectiveAppHostFile);
+
         logger.LogDebug("Starting AppHost in background: {AppHostPath}", effectiveAppHostFile.FullName);
 
         // Check for running instance and stop it if found (same behavior as regular run)

src/Aspire.Cli/Commands/BaseCommand.cs

@@ -18,6 +18,7 @@ internal abstract class BaseCommand : Command
     private static readonly int[] s_suppressErrorLogsMessageExitCodes = [CliExitCodes.Cancelled, CliExitCodes.MissingRequiredArgument];
 
     protected virtual bool UpdateNotificationsEnabled { get; } = true;
+    protected virtual bool IncludeAppHostUpdateCommandInUpdateNotification { get; }
 
     /// <summary>
     /// Gets the help group for this command.
@@ -118,7 +119,7 @@ protected BaseCommand(string name, string description, IFeatures features, ICliU
             {
                 try
                 {
-                    updateNotifier.NotifyIfUpdateAvailable();
+                    updateNotifier.NotifyIfUpdateAvailable(IncludeAppHostUpdateCommandInUpdateNotification);
                 }
                 catch
                 {

src/Aspire.Cli/Commands/RunCommand.cs

@@ -73,13 +73,15 @@ internal sealed class RunCommand : BaseCommand
     private readonly ICliHostEnvironment _hostEnvironment;
     private readonly ProfilingTelemetry _profilingTelemetry;
     private bool _isDetachMode;
+    private bool _hasAppHostContext;
 
     // Guest AppHosts can bring up the temporary server/backchannel and then fail immediately
     // afterward when the guest startup process hits a syntax or pre-execute error. Keep the
     // detached parent waiting briefly so those early failures are reported instead of hidden.
     private static readonly TimeSpan s_detachedStartupStabilityWindow = TimeSpan.FromSeconds(2);
 
     protected override bool UpdateNotificationsEnabled => !_isDetachMode;
+    protected override bool IncludeAppHostUpdateCommandInUpdateNotification => _hasAppHostContext;
 
     private static readonly Option<bool> s_detachOption = new("--detach")
     {
@@ -132,6 +134,7 @@ public RunCommand(
 
     protected override async Task<CommandResult> ExecuteAsync(ParseResult parseResult, CancellationToken cancellationToken)
     {
+        _hasAppHostContext = false;
         var passedAppHostProjectFile = parseResult.GetValue(AppHostLauncher.s_appHostOption);
         var detach = parseResult.GetValue(s_detachOption);
         _isDetachMode = detach;
@@ -220,6 +223,7 @@ protected override async Task<CommandResult> ExecuteAsync(ParseResult parseResul
                 runActivity?.SetTag(TelemetryConstants.Tags.ErrorType, "project_not_found");
                 return CommandResult.Failure(CliExitCodes.FailedToFindProject);
             }
+            _hasAppHostContext = true;
 
             // Resolve the language for this file and get the appropriate handler
             var project = _projectFactory.TryGetProject(effectiveAppHostFile);

src/Aspire.Cli/Commands/StartCommand.cs

@@ -20,6 +20,9 @@ internal sealed class StartCommand : BaseCommand
 
     private readonly AppHostLauncher _appHostLauncher;
     private readonly IConfiguration _configuration;
+    private bool _hasAppHostContext;
+
+    protected override bool IncludeAppHostUpdateCommandInUpdateNotification => _hasAppHostContext;
 
     private static readonly Option<bool> s_noBuildOption = new("--no-build")
     {
@@ -48,6 +51,7 @@ public StartCommand(
 
     protected override async Task<CommandResult> ExecuteAsync(ParseResult parseResult, CancellationToken cancellationToken)
     {
+        _hasAppHostContext = false;
         var passedAppHostProjectFile = parseResult.GetValue(AppHostLauncher.s_appHostOption);
         var format = parseResult.GetValue(AppHostLauncher.s_formatOption);
         var isolated = parseResult.GetValue(AppHostLauncher.s_isolatedOption);
@@ -75,6 +79,7 @@ protected override async Task<CommandResult> ExecuteAsync(ParseResult parseResul
             && ExtensionHelper.IsExtensionHost(InteractionService, out var extensionInteractionService, out _)
             && string.IsNullOrEmpty(_configuration[KnownConfigNames.ExtensionDebugSessionId]))
         {
+            _hasAppHostContext = passedAppHostProjectFile is not null;
             var startDebugSession = parseResult.GetValue(RootCommand.StartDebugSessionOption);
             var debugSessionArgs = new List<string>();
             if (isolated)
@@ -140,6 +145,7 @@ await extensionInteractionService.StartDebugSessionAsync(
             globalArgs,
             additionalArgs,
             stopAfterLaunchDelay,
-            cancellationToken);
+            cancellationToken,
+            _ => _hasAppHostContext = true);
     }
 }

src/Aspire.Cli/Interaction/ConsoleInteractionService.cs

@@ -693,15 +693,22 @@ public void DisplayEmptyLine()
 
     private const string UpdateUrl = "https://aka.ms/aspire/update";
 
-    public void DisplayVersionUpdateNotification(string newerVersion, string? updateCommand = null)
+    public void DisplayVersionUpdateNotification(string newerVersion, string? updateCommand = null, bool includeAppHostUpdateCommand = false)
     {
         // Write to stderr to avoid corrupting stdout when JSON output is used
         _errorConsole.WriteLine();
-        _errorConsole.MarkupLine(string.Format(CultureInfo.CurrentCulture, InteractionServiceStrings.NewCliVersionAvailable, newerVersion.EscapeMarkup()));
+        if (includeAppHostUpdateCommand)
+        {
+            _errorConsole.MarkupLine(string.Format(CultureInfo.CurrentCulture, InteractionServiceStrings.NewCliVersionAvailableWithAppHostUpdateCommand, newerVersion.EscapeMarkup(), "aspire update"));
+        }
+        else
+        {
+            _errorConsole.MarkupLine(string.Format(CultureInfo.CurrentCulture, InteractionServiceStrings.NewCliVersionAvailable, newerVersion.EscapeMarkup()));
+        }
 
         if (!string.IsNullOrEmpty(updateCommand))
         {
-            _errorConsole.MarkupLine(string.Format(CultureInfo.CurrentCulture, InteractionServiceStrings.ToUpdateRunCommand, updateCommand.EscapeMarkup()));
+            _errorConsole.MarkupLine(string.Format(CultureInfo.CurrentCulture, InteractionServiceStrings.ToUpdateCliUseCommand, updateCommand.EscapeMarkup()));
         }
 
         _errorConsole.MarkupLine(string.Format(CultureInfo.CurrentCulture, InteractionServiceStrings.MoreInfoNewCliVersion, MarkupHelpers.SafeLink(this, UpdateUrl)));

src/Aspire.Cli/Interaction/ExtensionInteractionService.cs

@@ -488,9 +488,9 @@ public void DisplayMarkupLine(string markup)
         _consoleInteractionService.DisplayMarkupLine(markup);
     }
 
-    public void DisplayVersionUpdateNotification(string newerVersion, string? updateCommand = null)
+    public void DisplayVersionUpdateNotification(string newerVersion, string? updateCommand = null, bool includeAppHostUpdateCommand = false)
     {
-        _consoleInteractionService.DisplayVersionUpdateNotification(newerVersion, updateCommand);
+        _consoleInteractionService.DisplayVersionUpdateNotification(newerVersion, updateCommand, includeAppHostUpdateCommand);
     }
 
     public void DisplayRenderable(IRenderable renderable)

src/Aspire.Cli/Interaction/IInteractionService.cs

@@ -54,7 +54,7 @@ internal interface IInteractionService
     /// </summary>
     bool SupportsLinks { get; }
 
-    void DisplayVersionUpdateNotification(string newerVersion, string? updateCommand = null);
+    void DisplayVersionUpdateNotification(string newerVersion, string? updateCommand = null, bool includeAppHostUpdateCommand = false);
     // The semantic type is stringly-typed because some values originate from backchannel payloads.
     // Use ConsoleLogTypes for CLI-defined values.
     void WriteConsoleLog(string message, int? lineNumber = null, string? type = null, bool isErrorMessage = false);

src/Aspire.Cli/Resources/InteractionServiceStrings.resx

@@ -237,13 +237,17 @@
     <value>[yellow]A new version of Aspire is available: {0}[/]</value>
     <comment>Do not translate [yellow] and also leave [/] as-is. {0} is the version number</comment>
   </data>
+  <data name="NewCliVersionAvailableWithAppHostUpdateCommand" xml:space="preserve">
+    <value>[yellow]A new version of Aspire is available: {0}[/] [dim](use {1} for this AppHost)[/]</value>
+    <comment>Do not translate [yellow], [dim], or [/] as-is. {0} is the version number. {1} is the command to use</comment>
+  </data>
   <data name="MoreInfoNewCliVersion" xml:space="preserve">
     <value>[dim]For more information, see: {0}[/]</value>
     <comment>Do not translate [dim]. Also leave [/] as-is. {0} is a pre-formatted link</comment>
   </data>
-  <data name="ToUpdateRunCommand" xml:space="preserve">
-    <value>[dim]To update, run: {0}[/]</value>
-    <comment>Do not translate [dim]. Also leave [/] as-is. {0} is the command to run</comment>
+  <data name="ToUpdateCliUseCommand" xml:space="preserve">
+    <value>[dim]To update the Aspire CLI, use: {0}[/]</value>
+    <comment>Do not translate [dim]. Also leave [/] as-is. {0} is the command to use</comment>
   </data>
   <data name="UnbuildableAppHostsDetected" xml:space="preserve">
     <value>No AppHosts were found (there may be AppHost project files with syntax errors/invalid SDK versions).</value>