Fix aspire run graceful shtudown behavior and unify with aspire start/aspire stop.

src/Aspire.Cli/Commands/AppHostLauncher.cs

@@ -33,7 +33,7 @@ internal sealed class AppHostLauncher(
     AspireCliTelemetry telemetry,
     ProfilingTelemetry profilingTelemetry,
     FileLoggerProvider fileLoggerProvider,
-    ProcessShutdownService processShutdownService,
+    DetachedAppHostShutdownService processShutdownService,
     IDetachedProcessLauncher detachedProcessLauncher,
     ILogger<AppHostLauncher> logger,
     TimeProvider timeProvider)

src/Aspire.Cli/Commands/RunCommand.cs

@@ -72,11 +72,17 @@ internal sealed class RunCommand : BaseCommand
     private readonly ICliHostEnvironment _hostEnvironment;
     private readonly ProfilingTelemetry _profilingTelemetry;
     private readonly TimeProvider _timeProvider;
+    private readonly ConsoleCancellationManager _cancellationManager;
     private bool _isDetachMode;
     private const int MaxDisplayedAppHostStartupOutputLines = 80;
 
     private static readonly TimeSpan s_appHostStartupCancellationTimeout = TimeSpan.FromSeconds(5);
 
+    // Graceful shutdown budget for `aspire run`. DCP gets a cooperative window to drain DCP
+    // resources before the central drain budget arms and ladders escalate to forceful kill.
+    // See plan §10 for the budget rationale.
+    internal static readonly TimeSpan s_gracefulShutdownBudget = TimeSpan.FromSeconds(5);
+
     // Guest AppHosts can bring up the temporary server/backchannel and then fail immediately
     // afterward when the guest startup process hits a syntax, pre-execute, or model validation
     // error. Keep guest AppHost startup waits alive briefly so those failures are reported instead of hidden.
@@ -122,6 +128,7 @@ public RunCommand(
         _hostEnvironment = hostEnvironment;
         _profilingTelemetry = profilingTelemetry;
         _timeProvider = timeProvider;
+        _cancellationManager = services.CancellationManager;
 
         Options.Add(s_detachOption);
         Options.Add(s_noBuildOption);
@@ -132,6 +139,12 @@ public RunCommand(
 
     protected override async Task<CommandResult> ExecuteAsync(ParseResult parseResult, CancellationToken cancellationToken)
     {
+        // Give DCP a cooperative window to drain resources before the central drain budget
+        // arms and shutdown ladders escalate to forceful kill. Without this, GracefulShutdownToken
+        // fires immediately on the first user signal and isolation/AttachConsole buys nothing
+        // because every ladder sees the graceful window already expired.
+        _cancellationManager.ConfigureForCommand(s_gracefulShutdownBudget);
+
         var passedAppHostProjectFile = parseResult.GetValue(AppHostLauncher.s_appHostOption);
         var detach = parseResult.GetValue(s_detachOption);
         _isDetachMode = detach;
@@ -504,9 +517,10 @@ await InteractionService.DisplayLiveAsync(BuildLiveRenderable(), async updateTar
             {
                 runActivity?.SetTag(TelemetryConstants.Tags.ErrorType, "canceled");
 
-                // The user cancelled (e.g. Ctrl+C); the linked CTS we passed to project.RunAsync
-                // propagated the cancellation and the OCE bubbled out with the linked token.
-                // Treat as successful exit since the user intentionally stopped the AppHost.
+                // User Ctrl+C is the normal exit path for `aspire run`; surface as success.
+                // Internal failures `return X` directly from GuestAppHostProject.RunAsync rather
+                // than flowing through this catch, so we don't need to distinguish failure codes
+                // here.
                 return CommandResult.Cancelled(CliExitCodes.Success);
             }
             finally
@@ -529,8 +543,9 @@ await InteractionService.DisplayLiveAsync(BuildLiveRenderable(), async updateTar
         {
             runActivity?.SetTag(TelemetryConstants.Tags.ErrorType, "canceled");
 
-            // Command is designed to be cancellable by the user (e.g. Ctrl+C) at any time.
-            // Treat cancellation as a successful exit since the user intentionally stopped the AppHost.
+            // User Ctrl+C is the normal exit path for `aspire run`; surface as success.
+            // Internal failures `return X` directly from GuestAppHostProject.RunAsync rather
+            // than flowing through this catch.
             return CommandResult.Cancelled(CliExitCodes.Success);
         }
         catch (ProjectLocatorException ex)

src/Aspire.Cli/Commands/Sdk/SdkDumpCommand.cs

@@ -191,11 +191,16 @@ private async Task<int> DumpCapabilitiesAsync(
                 return CliExitCodes.FailedToBuildArtifacts;
             }
 
-            await using var serverSession = AppHostServerSession.Start(
+            await using var serverSession = new AppHostServerSession(
                 appHostServerProject,
                 environmentVariables: null,
                 debug: false,
-                _logger);
+                _logger,
+                cancellationToken);
+            // Short-lived RPC session: discard the completion task; disposal flows the exit code
+            // through the activity scope and the only failure mode we care about surfaces via the
+            // RPC call below.
+            _ = serverSession.StartAsync();
 
             // Connect and get capabilities
             var rpcClient = await serverSession.GetRpcClientAsync(cancellationToken);
@@ -290,11 +295,16 @@ private async Task<int> DumpCapabilitiesToDirectoryAsync(
                 return CliExitCodes.FailedToBuildArtifacts;
             }
 
-            await using var serverSession = AppHostServerSession.Start(
+            await using var serverSession = new AppHostServerSession(
                 appHostServerProject,
                 environmentVariables: null,
                 debug: false,
-                _logger);
+                _logger,
+                cancellationToken);
+            // Short-lived RPC session: discard the completion task; disposal flows the exit code
+            // through the activity scope and the only failure mode we care about surfaces via the
+            // RPC call below.
+            _ = serverSession.StartAsync();
 
             var rpcClient = await serverSession.GetRpcClientAsync(cancellationToken);
             outputDirectory.Create();

src/Aspire.Cli/Commands/Sdk/SdkGenerateCommand.cs

@@ -152,11 +152,16 @@ private async Task<int> GenerateSdkAsync(
                 return CliExitCodes.FailedToBuildArtifacts;
             }
 
-            await using var serverSession = AppHostServerSession.Start(
+            await using var serverSession = new AppHostServerSession(
                 appHostServerProject,
                 environmentVariables: null,
                 debug: false,
-                _logger);
+                _logger,
+                cancellationToken);
+            // Short-lived RPC session: discard the completion task; disposal flows the exit code
+            // through the activity scope and the only failure mode we care about surfaces via the
+            // RPC call below.
+            _ = serverSession.StartAsync();
 
             // Connect and generate code
             var rpcClient = await serverSession.GetRpcClientAsync(cancellationToken);

src/Aspire.Cli/Commands/StopCommand.cs

@@ -23,7 +23,7 @@ internal sealed class StopCommand : BaseCommand
     private readonly AppHostConnectionResolver _connectionResolver;
     private readonly ILogger<StopCommand> _logger;
     private readonly ICliHostEnvironment _hostEnvironment;
-    private readonly ProcessShutdownService _processShutdownService;
+    private readonly DetachedAppHostShutdownService _processShutdownService;
     private readonly ProfilingTelemetry _profilingTelemetry;
 
     private static readonly OptionWithLegacy<FileInfo?> s_appHostOption = new("--apphost", "--project", StopCommandStrings.ProjectArgumentDescription);
@@ -38,7 +38,7 @@ public StopCommand(
         IAuxiliaryBackchannelMonitor backchannelMonitor,
         IProjectLocator projectLocator,
         ICliHostEnvironment hostEnvironment,
-        ProcessShutdownService processShutdownService,
+        DetachedAppHostShutdownService processShutdownService,
         ILogger<StopCommand> logger,
         ProfilingTelemetry profilingTelemetry,
         CommonCommandServices services)