Chain aspire agent init from aspire init on success

src/Aspire.Cli/Commands/AgentInitCommand.cs

@@ -62,7 +62,47 @@ internal Task<int> ExecuteCommandAsync(ParseResult parseResult, CancellationToke
         return ExecuteAsync(parseResult, cancellationToken);
     }
 
+    /// <summary>
+    /// Prompts the user to run agent init after a successful command, then chains into agent init if accepted.
+    /// Used by commands (e.g. <c>aspire init</c>, <c>aspire new</c>) to offer agent init as a follow-up step.
+    /// </summary>
+    internal async Task<int> PromptAndChainAsync(
+        ICliHostEnvironment hostEnvironment,
+        IInteractionService interactionService,
+        int previousResultExitCode,
+        DirectoryInfo workspaceRoot,
+        CancellationToken cancellationToken)
+    {
+        if (previousResultExitCode != ExitCodeConstants.Success)
+        {
+            return previousResultExitCode;
+        }
+
+        if (!hostEnvironment.SupportsInteractiveInput)
+        {
+            return ExitCodeConstants.Success;
+        }
+
+        var runAgentInit = await interactionService.ConfirmAsync(
+            SharedCommandStrings.PromptRunAgentInit,
+            defaultValue: true,
+            cancellationToken: cancellationToken);
+
+        if (runAgentInit)
+        {
+            return await ExecuteAgentInitAsync(workspaceRoot, cancellationToken);
+        }
+
+        return ExitCodeConstants.Success;
+    }
+
     protected override async Task<int> ExecuteAsync(ParseResult parseResult, CancellationToken cancellationToken)
+    {
+        var workspaceRoot = await PromptForWorkspaceRootAsync(cancellationToken);
+        return await ExecuteAgentInitAsync(workspaceRoot, cancellationToken);
+    }
+
+    private async Task<DirectoryInfo> PromptForWorkspaceRootAsync(CancellationToken cancellationToken)
     {
         // Try to discover the git repository root to use as the default workspace root
         var gitRoot = await _gitRepository.GetRootAsync(cancellationToken);
@@ -89,8 +129,11 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
             directory: true,
             cancellationToken: cancellationToken);
 
-        var workspaceRoot = new DirectoryInfo(workspaceRootPath);
+        return new DirectoryInfo(workspaceRootPath);
+    }
 
+    private async Task<int> ExecuteAgentInitAsync(DirectoryInfo workspaceRoot, CancellationToken cancellationToken)
+    {
         var context = new AgentEnvironmentScanContext
         {
             WorkingDirectory = ExecutionContext.WorkingDirectory,

src/Aspire.Cli/Commands/InitCommand.cs

@@ -39,6 +39,8 @@ internal sealed class InitCommand : BaseCommand, IPackageMetaPrefetchingCommand
     private readonly ILanguageService _languageService;
     private readonly ILanguageDiscovery _languageDiscovery;
     private readonly IScaffoldingService _scaffoldingService;
+    private readonly AgentInitCommand _agentInitCommand;
+    private readonly ICliHostEnvironment _hostEnvironment;
 
     private static readonly Option<string?> s_sourceOption = new("--source", "-s")
     {
@@ -80,7 +82,9 @@ public InitCommand(
         IConfigurationService configurationService,
         ILanguageService languageService,
         ILanguageDiscovery languageDiscovery,
-        IScaffoldingService scaffoldingService)
+        IScaffoldingService scaffoldingService,
+        AgentInitCommand agentInitCommand,
+        ICliHostEnvironment hostEnvironment)
         : base("init", InitCommandStrings.Description, features, updateNotifier, executionContext, interactionService, telemetry)
     {
         _runner = runner;
@@ -96,6 +100,8 @@ public InitCommand(
         _languageService = languageService;
         _languageDiscovery = languageDiscovery;
         _scaffoldingService = scaffoldingService;
+        _agentInitCommand = agentInitCommand;
+        _hostEnvironment = hostEnvironment;
 
         Options.Add(s_sourceOption);
         Options.Add(s_versionOption);
@@ -140,7 +146,8 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
             InteractionService.DisplayEmptyLine();
             InteractionService.DisplayMessage(KnownEmojis.Information, $"Creating {languageInfo.DisplayName} AppHost...");
             InteractionService.DisplayEmptyLine();
-            return await CreatePolyglotAppHostAsync(languageInfo, cancellationToken);
+            var polyglotResult = await CreatePolyglotAppHostAsync(languageInfo, cancellationToken);
+            return await _agentInitCommand.PromptAndChainAsync(_hostEnvironment, InteractionService, polyglotResult, _executionContext.WorkingDirectory, cancellationToken);
         }
 
         // For C#, we need the .NET SDK
@@ -155,20 +162,26 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
         // Use SolutionLocator to find solution files, walking up the directory tree
         initContext.SelectedSolutionFile = await _solutionLocator.FindSolutionFileAsync(_executionContext.WorkingDirectory, cancellationToken);
 
+        int initResult;
+        DirectoryInfo workspaceRoot;
         if (initContext.SelectedSolutionFile is not null)
         {
             InteractionService.DisplayEmptyLine();
             InteractionService.DisplayMessage(KnownEmojis.Information, string.Format(CultureInfo.CurrentCulture, InitCommandStrings.SolutionDetected, initContext.SelectedSolutionFile.Name));
             InteractionService.DisplayEmptyLine();
-            return await InitializeExistingSolutionAsync(initContext, parseResult, cancellationToken);
+            initResult = await InitializeExistingSolutionAsync(initContext, parseResult, cancellationToken);
+            workspaceRoot = initContext.SolutionDirectory ?? _executionContext.WorkingDirectory;
         }
         else
         {
             InteractionService.DisplayEmptyLine();
             InteractionService.DisplayMessage(KnownEmojis.Information, InitCommandStrings.NoSolutionFoundCreatingSingleFileAppHost);
             InteractionService.DisplayEmptyLine();
-            return await CreateEmptyAppHostAsync(parseResult, cancellationToken);
+            initResult = await CreateEmptyAppHostAsync(parseResult, cancellationToken);
+            workspaceRoot = _executionContext.WorkingDirectory;
         }
+
+        return await _agentInitCommand.PromptAndChainAsync(_hostEnvironment, InteractionService, initResult, workspaceRoot, cancellationToken);
     }
 
     private async Task<int> InitializeExistingSolutionAsync(InitContext initContext, ParseResult parseResult, CancellationToken cancellationToken)

src/Aspire.Cli/Commands/NewCommand.cs

@@ -28,6 +28,8 @@ internal sealed class NewCommand : BaseCommand, IPackageMetaPrefetchingCommand
     private readonly IFeatures _features;
     private readonly IPackagingService _packagingService;
     private readonly IConfigurationService _configurationService;
+    private readonly AgentInitCommand _agentInitCommand;
+    private readonly ICliHostEnvironment _hostEnvironment;
 
     private static readonly Option<string> s_nameOption = new("--name", "-n")
     {
@@ -72,14 +74,18 @@ public NewCommand(
         ICliUpdateNotifier updateNotifier,
         CliExecutionContext executionContext,
         IPackagingService packagingService,
-        IConfigurationService configurationService)
+        IConfigurationService configurationService,
+        AgentInitCommand agentInitCommand,
+        ICliHostEnvironment hostEnvironment)
         : base("new", NewCommandStrings.Description, features, updateNotifier, executionContext, interactionService, telemetry)
     {
         _prompter = prompter;
         _templateProvider = templateProvider;
         _features = features;
         _packagingService = packagingService;
         _configurationService = configurationService;
+        _agentInitCommand = agentInitCommand;
+        _hostEnvironment = hostEnvironment;
 
         Options.Add(s_nameOption);
         Options.Add(s_outputOption);
@@ -366,7 +372,8 @@ protected override async Task<int> ExecuteAsync(ParseResult parseResult, Cancell
             extensionInteractionService.OpenEditor(templateResult.OutputPath);
         }
 
-        return templateResult.ExitCode;
+        var workspaceRoot = new DirectoryInfo(templateResult.OutputPath ?? ExecutionContext.WorkingDirectory.FullName);
+        return await _agentInitCommand.PromptAndChainAsync(_hostEnvironment, InteractionService, templateResult.ExitCode, workspaceRoot, cancellationToken);
     }
 
     private static bool ShouldResolveCliTemplateVersion(ITemplate template)

src/Aspire.Cli/Resources/SharedCommandStrings.resx

@@ -144,4 +144,7 @@
   <data name="MultipleInScopeAppHosts" xml:space="preserve">
     <value>Multiple running AppHosts found in the current directory. Select from running AppHosts.</value>
   </data>
+  <data name="PromptRunAgentInit" xml:space="preserve">
+    <value>Would you like to configure AI agent environments for this project?</value>
+  </data>
 </root>

tests/Aspire.Cli.EndToEnd.Tests/BundleSmokeTests.cs

@@ -81,6 +81,7 @@ public async Task CreateAndRunAspireStarterProjectWithBundle()
             .Enter()
             .WaitUntil(s => waitingForTestPrompt.Search(s).Count > 0, TimeSpan.FromSeconds(10))
             .Enter()
+            .DeclineAgentInitPrompt()
             .WaitForSuccessPrompt(counter)
             // Start AppHost in detached mode and capture JSON output
             .Type("aspire run --detach --format json | tee /tmp/aspire-detach.json")

tests/Aspire.Cli.EndToEnd.Tests/DescribeCommandTests.cs

@@ -95,6 +95,7 @@ public async Task DescribeCommandShowsRunningResources()
             .Enter()
             .WaitUntil(s => waitingForTestPrompt.Search(s).Count > 0, TimeSpan.FromSeconds(10))
             .Enter()
+            .DeclineAgentInitPrompt()
             .WaitForSuccessPrompt(counter);
 
         // Navigate to the AppHost directory
@@ -223,6 +224,7 @@ public async Task DescribeCommandResolvesReplicaNames()
             .Enter()
             .WaitUntil(s => waitingForTestPrompt.Search(s).Count > 0, TimeSpan.FromSeconds(10))
             .Enter()
+            .DeclineAgentInitPrompt()
             .WaitForSuccessPrompt(counter);
 
         // Navigate to the AppHost directory

tests/Aspire.Cli.EndToEnd.Tests/DockerDeploymentTests.cs

@@ -84,6 +84,7 @@ public async Task CreateAndDeployToDockerCompose()
             .WaitUntil(s => waitingForTestPrompt.Search(s).Count > 0, TimeSpan.FromSeconds(10))
             // For test project prompt, default is "No" so just press Enter to accept it
             .Enter()
+            .DeclineAgentInitPrompt()
             .WaitForSuccessPrompt(counter);
 
         // Step 2: Navigate into the project directory
@@ -253,6 +254,7 @@ public async Task CreateAndDeployToDockerComposeInteractive()
             .WaitUntil(s => waitingForTestPrompt.Search(s).Count > 0, TimeSpan.FromSeconds(10))
             // For test project prompt, default is "No" so just press Enter to accept it
             .Enter()
+            .DeclineAgentInitPrompt()
             .WaitForSuccessPrompt(counter);
 
         // Step 2: Navigate into the project directory