Refactor agent environment scanners and add standard location support (#15022)

Co-authored-by: James Newton-King <james@newtonking.com>

Author: IEvangelist

src/Aspire.Cli/Agents/AgentEnvironmentScanContext.cs

@@ -9,7 +9,6 @@ namespace Aspire.Cli.Agents;
 internal sealed class AgentEnvironmentScanContext
 {
     private readonly List<AgentEnvironmentApplicator> _applicators = [];
-    private readonly HashSet<string> _skillFileApplicatorPaths = new(StringComparer.OrdinalIgnoreCase);
     private readonly HashSet<string> _skillBaseDirectories = new(StringComparer.OrdinalIgnoreCase);
 
     /// <summary>
@@ -30,25 +29,6 @@ internal sealed class AgentEnvironmentScanContext
     /// </summary>
     public bool PlaywrightApplicatorAdded { get; set; }
 
-    /// <summary>
-    /// Checks if a skill file applicator has already been added for the specified path.
-    /// </summary>
-    /// <param name="skillRelativePath">The relative path to the skill file.</param>
-    /// <returns>True if an applicator has already been added for this path.</returns>
-    public bool HasSkillFileApplicator(string skillRelativePath)
-    {
-        return _skillFileApplicatorPaths.Contains(skillRelativePath);
-    }
-
-    /// <summary>
-    /// Marks a skill file path as having an applicator added.
-    /// </summary>
-    /// <param name="skillRelativePath">The relative path to the skill file.</param>
-    public void MarkSkillFileApplicatorAdded(string skillRelativePath)
-    {
-        _skillFileApplicatorPaths.Add(skillRelativePath);
-    }
-
     /// <summary>
     /// Adds an applicator to the collection of detected agent environments.
     /// </summary>

src/Aspire.Cli/Agents/ClaudeCode/ClaudeCodeAgentEnvironmentScanner.cs

@@ -17,9 +17,7 @@ internal sealed class ClaudeCodeAgentEnvironmentScanner : IAgentEnvironmentScann
     private const string ClaudeCodeFolderName = ".claude";
     private const string McpConfigFileName = ".mcp.json";
     private const string AspireServerName = "aspire";
-    private static readonly string s_skillFilePath = Path.Combine(".claude", "skills", CommonAgentApplicators.AspireSkillName, "SKILL.md");
     private static readonly string s_skillBaseDirectory = Path.Combine(".claude", "skills");
-    private const string SkillFileDescription = "Create Aspire skill file (.claude/skills/aspire/SKILL.md)";
 
     private readonly IClaudeCodeCliRunner _claudeCodeCliRunner;
     private readonly PlaywrightCliInstaller _playwrightCliInstaller;
@@ -76,13 +74,6 @@ public async Task ScanAsync(AgentEnvironmentScanContext context, CancellationTok
 
             // Register Playwright CLI installation applicator
             CommonAgentApplicators.AddPlaywrightCliApplicator(context, _playwrightCliInstaller, s_skillBaseDirectory);
-
-            // Try to add skill file applicator for Claude Code
-            CommonAgentApplicators.TryAddSkillFileApplicator(
-                context,
-                context.RepositoryRoot,
-                s_skillFilePath,
-                SkillFileDescription);
         }
         else
         {
@@ -107,13 +98,6 @@ public async Task ScanAsync(AgentEnvironmentScanContext context, CancellationTok
 
                 // Register Playwright CLI installation applicator
                 CommonAgentApplicators.AddPlaywrightCliApplicator(context, _playwrightCliInstaller, s_skillBaseDirectory);
-
-                // Try to add skill file applicator for Claude Code
-                CommonAgentApplicators.TryAddSkillFileApplicator(
-                    context,
-                    context.RepositoryRoot,
-                    s_skillFilePath,
-                    SkillFileDescription);
             }
             else
             {

src/Aspire.Cli/Agents/CommonAgentApplicators.cs

@@ -17,9 +17,7 @@ internal sealed class CopilotCliAgentEnvironmentScanner : IAgentEnvironmentScann
     private const string CopilotFolderName = ".copilot";
     private const string McpConfigFileName = "mcp-config.json";
     private const string AspireServerName = "aspire";
-    private static readonly string s_skillFilePath = Path.Combine(".github", "skills", CommonAgentApplicators.AspireSkillName, "SKILL.md");
     private static readonly string s_skillBaseDirectory = Path.Combine(".github", "skills");
-    private const string SkillFileDescription = "Create Aspire skill file (.github/skills/aspire/SKILL.md)";
 
     private readonly ICopilotCliRunner _copilotCliRunner;
     private readonly PlaywrightCliInstaller _playwrightCliInstaller;
@@ -75,13 +73,6 @@ public async Task ScanAsync(AgentEnvironmentScanContext context, CancellationTok
 
             // Register Playwright CLI installation applicator
             CommonAgentApplicators.AddPlaywrightCliApplicator(context, _playwrightCliInstaller, s_skillBaseDirectory);
-
-            // Try to add skill file applicator for GitHub Copilot
-            CommonAgentApplicators.TryAddSkillFileApplicator(
-                context,
-                context.RepositoryRoot,
-                s_skillFilePath,
-                SkillFileDescription);
             return;
         }
 
@@ -113,13 +104,6 @@ public async Task ScanAsync(AgentEnvironmentScanContext context, CancellationTok
 
         // Register Playwright CLI installation applicator
         CommonAgentApplicators.AddPlaywrightCliApplicator(context, _playwrightCliInstaller, s_skillBaseDirectory);
-
-        // Try to add skill file applicator for GitHub Copilot
-        CommonAgentApplicators.TryAddSkillFileApplicator(
-            context,
-            context.RepositoryRoot,
-            s_skillFilePath,
-            SkillFileDescription);
     }
 
     /// <summary>

src/Aspire.Cli/Agents/CopilotCli/CopilotCliAgentEnvironmentScanner.cs

@@ -16,9 +16,7 @@ internal sealed class OpenCodeAgentEnvironmentScanner : IAgentEnvironmentScanner
 {
     private const string OpenCodeConfigFileName = "opencode.jsonc";
     private const string AspireServerName = "aspire";
-    private static readonly string s_skillFilePath = Path.Combine(".opencode", "skill", CommonAgentApplicators.AspireSkillName, "SKILL.md");
     private static readonly string s_skillBaseDirectory = Path.Combine(".opencode", "skill");
-    private const string SkillFileDescription = "Create Aspire skill file (.opencode/skill/aspire/SKILL.md)";
 
     private readonly IOpenCodeCliRunner _openCodeCliRunner;
     private readonly PlaywrightCliInstaller _playwrightCliInstaller;
@@ -70,13 +68,6 @@ public async Task ScanAsync(AgentEnvironmentScanContext context, CancellationTok
 
             // Register Playwright CLI installation applicator
             CommonAgentApplicators.AddPlaywrightCliApplicator(context, _playwrightCliInstaller, s_skillBaseDirectory);
-
-            // Try to add skill file applicator for OpenCode
-            CommonAgentApplicators.TryAddSkillFileApplicator(
-                context,
-                context.RepositoryRoot,
-                s_skillFilePath,
-                SkillFileDescription);
         }
         else
         {
@@ -93,13 +84,6 @@ public async Task ScanAsync(AgentEnvironmentScanContext context, CancellationTok
 
                 // Register Playwright CLI installation applicator
                 CommonAgentApplicators.AddPlaywrightCliApplicator(context, _playwrightCliInstaller, s_skillBaseDirectory);
-                
-                // Try to add skill file applicator for OpenCode
-                CommonAgentApplicators.TryAddSkillFileApplicator(
-                    context,
-                    context.RepositoryRoot,
-                    s_skillFilePath,
-                    SkillFileDescription);
             }
             else
             {

src/Aspire.Cli/Agents/OpenCode/OpenCodeAgentEnvironmentScanner.cs

@@ -20,7 +20,7 @@ internal interface IPlaywrightCliRunner
     /// <summary>
     /// Installs Playwright CLI skill files into the workspace.
     /// </summary>
-    /// <param name="workingDirectory">The directory in which to run the skill installation command.</param>
+    /// <param name="workingDirectory">The directory to run the command from (skill files are written relative to this).</param>
     /// <param name="cancellationToken">A token to cancel the operation.</param>
     /// <returns>True if skill installation succeeded, false otherwise.</returns>
     Task<bool> InstallSkillsAsync(string workingDirectory, CancellationToken cancellationToken);