Skip to content

Load Aspire skills catalog from bundle manifest#17553

Open
IEvangelist wants to merge 3 commits into
mainfrom
ievangelist/dapine-skill-catalog-pr
Open

Load Aspire skills catalog from bundle manifest#17553
IEvangelist wants to merge 3 commits into
mainfrom
ievangelist/dapine-skill-catalog-pr

Conversation

@IEvangelist
Copy link
Copy Markdown
Member

Description

aspire agent init now loads bundled Aspire skills from the resolved Aspire skills bundle manifest before prompting for which skills to install. This prevents the CLI prompt from drifting behind the microsoft/aspire-skills release bundle: bundle-backed skills such as aspire-init, aspire-monitoring, and aspire-orchestration can now surface from skill-manifest.json without adding new hardcoded CLI catalog entries.

The CLI still appends local-only skills such as playwright-cli and dotnet-inspect, and it reuses the resolved bundle for installation instead of resolving it a second time. The standalone and aspire new default selections no longer preselect the one-time aspireify skill, while aspire init still preselects it for the existing-workspace Aspire setup flow.

User-facing usage

Users can install every resolved skill with:

aspire agent init --skill-locations all --skills all

They can also select a bundle-defined skill by manifest name:

aspire agent init --skill-locations standard --skills aspire-monitoring

Command help now reflects that bundle-backed skills are loaded dynamically:

--skills <skills>  Comma-separated list of skills to install. Bundle skills are
                   loaded dynamically; CLI-provided skills include
                   playwright-cli,dotnet-inspect. Use 'all' or 'none'

Validation

.\restore.cmd
dotnet build /t:UpdateXlf src\Aspire.Cli\Aspire.Cli.csproj
dotnet test --project tests\Aspire.Cli.Tests\Aspire.Cli.Tests.csproj --no-launch-profile -- --filter-class "*.AgentInitCommandTests" --filter-class "*.CommonAgentApplicatorsTests" --filter-class "*.AspireSkillsBundleTests" --filter-class "*.AspireSkillsInstallerTests" --filter-not-trait "quarantined=true" --filter-not-trait "outerloop=true"
dotnet test --project tests\Aspire.Cli.Tests\Aspire.Cli.Tests.csproj --no-launch-profile -- --filter-method "*.InitCommand_WhenAspireifySkillSelected_PrintsToolSpecificFollowUpCommands" --filter-method "*.InitCommand_WhenAspireifySkillNotSelected_DoesNotPrintFollowUpCommands" --filter-method "*.NewCommandNonInteractive_SuppressAgentInitTrue_SkipsAgentInit" --filter-method "*.NewCommandNonInteractive_SuppressAgentInitFalse_RunsAgentInit" --filter-method "*.NewCommandNonInteractive_NoSuppressAgentInitOption_DefaultsToRunAgentInit" --filter-not-trait "quarantined=true" --filter-not-trait "outerloop=true"
dotnet run --project src\Aspire.Cli\Aspire.Cli.csproj -- agent init --help

Fixes #17551

Checklist

  • Is this feature complete?
    • Yes. Ready to ship.
    • No. Follow-up changes expected.
  • Are you including unit tests for the changes and scenario tests if relevant?
    • Yes
    • No
  • Did you add public API?
    • Yes
      • If yes, did you have an API Review for it?
        • Yes
        • No
      • Did you add <remarks /> and <code /> elements on your triple slash comments?
        • Yes
        • No
    • No
  • Does the change make any security assumptions or guarantees?
    • Yes
      • If yes, have you done a threat model and had a security review?
        • Yes
        • No
    • No

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@IEvangelist IEvangelist requested a review from mitchdenny as a code owner May 27, 2026 18:08
Copilot AI review requested due to automatic review settings May 27, 2026 18:08
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 27, 2026

🚀 Dogfood this PR with:

⚠️ WARNING: Do not do this without first carefully reviewing the code of this PR to satisfy yourself it is safe.

curl -fsSL https://raw.githubusercontent.com/microsoft/aspire/main/eng/scripts/get-aspire-cli-pr.sh | bash -s -- 17553

Or

  • Run remotely in PowerShell:
iex "& { $(irm https://raw.githubusercontent.com/microsoft/aspire/main/eng/scripts/get-aspire-cli-pr.ps1) } 17553"

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates aspire agent init to treat the Aspire skills bundle manifest (skill-manifest.json) as the source of truth for bundle-backed skills, so the interactive catalog doesn’t drift behind microsoft/aspire-skills.

Changes:

  • Load skill definitions dynamically from the resolved Aspire skills bundle manifest and reuse that resolved bundle for installation.
  • Adjust default-skill selection so standalone/aspire new no longer preselect aspireify, while aspire init still does.
  • Update tests and localized help text to reflect dynamic bundle-backed skills plus CLI-defined skills.

Reviewed changes

Copilot reviewed 25 out of 26 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
tests/Aspire.Cli.Tests/TestServices/FakePlaywrightServices.cs Extends the fake bundle manifest to include additional bundle-defined skills for test coverage.
tests/Aspire.Cli.Tests/Commands/NewCommandTests.cs Updates assertions for new default-skill behavior and uses shared skill-name constants.
tests/Aspire.Cli.Tests/Commands/InitCommandTests.cs Updates selection logic to find skills by name rather than static instances.
tests/Aspire.Cli.Tests/Commands/AgentInitCommandTests.cs Adds/updates tests for manifest-driven skill catalog and revised defaults.
tests/Aspire.Cli.Tests/Agents/CommonAgentApplicatorsTests.cs Updates tests to distinguish CLI-defined skills from bundle-defined skills.
tests/Aspire.Cli.Tests/Agents/AspireSkillsInstallerTests.cs Aligns installer tests with manifest-sourced bundle skill definitions.
tests/Aspire.Cli.Tests/Agents/AspireSkillsBundleTests.cs Adds coverage for enumerating manifest skills and updates existing bundle tests.
src/Aspire.Cli/Resources/xlf/AgentCommandStrings.zh-Hant.xlf Updates localized --skills help text to mention dynamic bundle skills.
src/Aspire.Cli/Resources/xlf/AgentCommandStrings.zh-Hans.xlf Updates localized --skills help text to mention dynamic bundle skills.
src/Aspire.Cli/Resources/xlf/AgentCommandStrings.tr.xlf Updates localized --skills help text to mention dynamic bundle skills.
src/Aspire.Cli/Resources/xlf/AgentCommandStrings.ru.xlf Updates localized --skills help text to mention dynamic bundle skills.
src/Aspire.Cli/Resources/xlf/AgentCommandStrings.pt-BR.xlf Updates localized --skills help text to mention dynamic bundle skills.
src/Aspire.Cli/Resources/xlf/AgentCommandStrings.pl.xlf Updates localized --skills help text to mention dynamic bundle skills.
src/Aspire.Cli/Resources/xlf/AgentCommandStrings.ko.xlf Updates localized --skills help text to mention dynamic bundle skills.
src/Aspire.Cli/Resources/xlf/AgentCommandStrings.ja.xlf Updates localized --skills help text to mention dynamic bundle skills.
src/Aspire.Cli/Resources/xlf/AgentCommandStrings.it.xlf Updates localized --skills help text to mention dynamic bundle skills.
src/Aspire.Cli/Resources/xlf/AgentCommandStrings.fr.xlf Updates localized --skills help text to mention dynamic bundle skills.
src/Aspire.Cli/Resources/xlf/AgentCommandStrings.es.xlf Updates localized --skills help text to mention dynamic bundle skills.
src/Aspire.Cli/Resources/xlf/AgentCommandStrings.de.xlf Updates localized --skills help text to mention dynamic bundle skills.
src/Aspire.Cli/Resources/xlf/AgentCommandStrings.cs.xlf Updates localized --skills help text to mention dynamic bundle skills.
src/Aspire.Cli/Resources/AgentCommandStrings.resx Updates --skills option description text.
src/Aspire.Cli/Resources/AgentCommandStrings.Designer.cs Updates generated resource accessor doc comment for the changed string.
src/Aspire.Cli/Commands/InitCommand.cs Uses agent-init default mode that includes aspireify for the init flow and checks selection by name.
src/Aspire.Cli/Commands/AgentInitCommand.cs Adds manifest-sourced skill loading, default-mode handling, and bundle reuse during install.
src/Aspire.Cli/Agents/SkillDefinition.cs Removes hardcoded bundle skill entries; introduces bundle-skill factory, name checks, and name-based equality.
src/Aspire.Cli/Agents/AspireSkills/AspireSkillsBundle.cs Exposes manifest skill definitions and validates manifest skill descriptions.
Files not reviewed (1)
  • src/Aspire.Cli/Resources/AgentCommandStrings.Designer.cs: Language not supported

Comment thread src/Aspire.Cli/Commands/AgentInitCommand.cs Outdated
Comment thread src/Aspire.Cli/Commands/AgentInitCommand.cs
IEvangelist and others added 2 commits May 27, 2026 13:56
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actions
Copy link
Copy Markdown
Contributor

CLI E2E Tests failed — 105 passed, 2 failed, 2 unknown (commit 673ecd2)

Failed Tests

View all recordings
Status Test Recording
AddPackageInteractiveWhileAppHostRunningDetached ▶️ View recording
AddPackageWhileAppHostRunningDetached ▶️ View recording
AgentCommands_AllHelpOutputs_AreCorrect ▶️ View recording
AgentInitCommand_DefaultSelection_InstallsDefaultSkills ▶️ View recording
AgentInitCommand_MigratesDeprecatedConfig ▶️ View recording
AgentMcpListStructuredLogsReturnsLogsFromStarterApp ▶️ View recording
AgentMcpListStructuredLogsReturnsLogsFromStarterApp_DevLocalhost ▶️ View recording
AgentMcpListStructuredLogsReturnsLogsFromStarterApp_Isolated ▶️ View recording
AllPublishMethodsBuildDockerImages ▶️ View recording
AspireAddAndStartWorkAgainstLegacyAppHostTs ▶️ View recording
AspireAddPackageVersionToDirectoryPackagesProps ▶️ View recording
AspireInitSingleFileAppHostRunsViaDotnetRunAppHost ▶️ View recording
AspireInitWithExistingAppHostDirRecreatesMissingNuGetConfigAndPreservesFiles ▶️ View recording
AspireInitWithSolutionFileGeneratesAppHostThatBuildsAgainstChannelHive ▶️ View recording
AspireStartUpdatesStaleTypeScriptAppHostPath ▶️ View recording
AspireUpdateRemovesAppHostPackageVersionFromDirectoryPackagesProps ▶️ View recording
AspireUpdateRemovesOrphanAppHostPackageVersionWhenSdkAlreadyCurrent ▶️ View recording
Banner_DisplayedOnFirstRun ▶️ View recording
Banner_DisplayedWithExplicitFlag ▶️ View recording
Banner_NotDisplayedWithNoLogoFlag ▶️ View recording
CertificatesClean_RemovesCertificates ▶️ View recording
CertificatesTrust_WithNoCert_CreatesAndTrustsCertificate ▶️ View recording
CertificatesTrust_WithUntrustedCert_TrustsCertificate ▶️ View recording
ConfigSetGet_CreatesNestedJsonFormat ▶️ View recording
CreateAndRunAspireStarterProject ▶️ View recording
CreateAndRunAspireStarterProjectWithBundle ▶️ View recording
CreateAndRunEmptyAppHostProject ▶️ View failure recording
CreateAndRunJavaEmptyAppHostProject ▶️ View recording
CreateAndRunJsReactProject ▶️ View recording
CreateAndRunPythonReactProject ▶️ View recording
CreateAndRunTypeScriptEmptyAppHostProject ▶️ View recording
CreateAndRunTypeScriptStarterProject ▶️ View recording
CreateJavaAppHostWithViteApp ▶️ View recording
CreateTypeScriptAppHostWithViteApp_AllowsGuestAppPackageManagerToDiffer ▶️ View recording
CreateTypeScriptAppHostWithViteApp_UsesConfiguredToolchain ▶️ View recording
DashboardRunWithAgentMcpListTracesReturnsNoTraces ▶️ View recording
DashboardRunWithAgentMcpListTracesReturnsNoTraces_DevLocalhost ▶️ View recording
DashboardRunWithOtelTracesReturnsNoTraces ▶️ View recording
DashboardRunWithOtelTracesReturnsNoTraces_DevLocalhost ▶️ View recording
DeployK8sBasicApiService ▶️ View recording
DeployK8sWithExternalHelmChart ▶️ View recording
DeployK8sWithGarnet ▶️ View recording
DeployK8sWithMongoDB ▶️ View recording
DeployK8sWithMySql ▶️ View recording
DeployK8sWithPostgres ▶️ View recording
DeployK8sWithRabbitMQ ▶️ View recording
DeployK8sWithRedis ▶️ View recording
DeployK8sWithSqlServer ▶️ View recording
DeployK8sWithValkey ▶️ View recording
DeployTypeScriptAppToKubernetes ▶️ View recording
DescribeCommandResolvesReplicaNames ▶️ View recording
DescribeCommandShowsRunningResources ▶️ View recording
DetachFormatJsonProducesValidJson ▶️ View recording
DetachFormatJsonProducesValidJsonWhenRestartingExistingInstance ▶️ View recording
DoPublishAndDeployListStepsWork ▶️ View recording
DocsCommand_RendersInteractiveMarkdownFromLocalSource ▶️ View recording
DoctorCommand_DetectsDeprecatedAgentConfig ▶️ View recording
DoctorCommand_TypeScriptAppHostReportsMissingConfiguredToolchain ▶️ View recording
DoctorCommand_WithSslCertDir_ShowsTrusted ▶️ View recording
DoctorCommand_WithoutSslCertDir_ShowsPartiallyTrusted ▶️ View recording
GatewayWithoutExternalEndpoint_FailsPublishWithGuidance ▶️ View recording
GeneratedAspireDevScript_StartsWatchMode_WithConfiguredToolchain ▶️ View recording
GlobalMigration_HandlesCommentsAndTrailingCommas ▶️ View recording
GlobalMigration_HandlesMalformedLegacyJson ▶️ View recording
GlobalMigration_PreservesAllValueTypes ▶️ View recording
GlobalMigration_SkipsWhenNewConfigExists ▶️ View recording
GlobalSettings_MigratedFromLegacyFormat ▶️ View recording
IngressWithoutExternalEndpoint_FailsPublishWithGuidance ▶️ View recording
InitTypeScriptAppHost_AugmentsExistingViteRepoInWorkspaceSubdirectory ▶️ View recording
InteractiveCSharpInitCreatesExpectedFiles ▶️ View recording
InvalidAppHostPathWithComments_IsHealedOnRun ▶️ View recording
JavaScriptHostingApisRunFromTypeScriptAppHost ▶️ View recording
LatestCliCanStartStableChannelAppHost ▶️ View failure recording
LatestCliCanStartStableChannelTypeScriptAppHost ▶️ View recording
LegacySettingsMigration_AdjustsRelativeAppHostPath ▶️ View recording
LogsCommandShowsResourceLogs ▶️ View recording
OtelLogsReturnsStructuredLogsFromStarterApp ▶️ View recording
OtelLogsReturnsStructuredLogsFromStarterAppIsolated ▶️ View recording
PsCommandListsRunningAppHost ▶️ View recording
PsFormatJsonOutputsOnlyJsonToStdout ▶️ View recording
PublishJavaScriptPatternsGeneratesExpectedDockerComposeArtifacts ▶️ View recording
PublishWithConfigureEnvFileUpdatesEnvOutput ▶️ View recording
PublishWithDockerComposeServiceCallbackSucceeds ▶️ View recording
PublishWithoutOutputPathUsesAppHostDirectoryDefault ▶️ View recording
ResourceCommand_FailedExecution_DisplaysAppHostLogPathAndLogContainsEntries ▶️ View recording
ResourceCommand_SetAndDeleteParameterUpdatesDescribeOutput ▶️ View recording
RestoreGeneratesSdkFiles ▶️ View recording
RestoreGeneratesSdkFiles_WithConfiguredToolchain ▶️ View recording
RestoreRefreshesGeneratedSdkAfterAddingIntegration ▶️ View recording
RestoreSupportsConfigOnlyHelperPackageAndCrossPackageTypes ▶️ View recording
RunFromParentDirectory_UsesExistingConfigNearAppHost ▶️ View recording
RunReportsSyntaxErrorsForDotNetAppHost ▶️ View recording
RunReportsSyntaxErrorsForTypeScriptAppHost ▶️ View recording
SecretCrudOnDotNetAppHost ▶️ View recording
SecretCrudOnTypeScriptAppHost ▶️ View recording
StagingChannel_ConfigureAndVerifySettings_ThenSwitchChannels ▶️ View recording
StartAndWaitForTypeScriptSqlServerAppHostWithNativeAssets ▶️ View recording
StartReportsSyntaxErrorsForDotNetAppHost ▶️ View recording
StartReportsSyntaxErrorsForTypeScriptAppHost ▶️ View recording
StopAllAppHostsFromAppHostDirectory ▶️ View recording
StopJavaPolyglotAppHostUsingApphostDirectory ▶️ View recording
StopNonInteractiveSingleAppHost ▶️ View recording
StopTypeScriptPolyglotAppHostUsingApphostDirectory ▶️ View recording
StopWithNoRunningAppHostExitsSuccessfully ▶️ View recording
UnAwaitedChainsCompileWithAutoResolvePromises ▶️ View recording
UpdateProjectChannelToStable_CSharpEmptyAppHost_PreservesAspireConfigChannel ▶️ View recording
UpdateProjectChannelToStable_CSharpSingleFileInit_PreservesAspireConfigChannel ▶️ View recording
UpdateProjectChannelToStable_TypeScriptSingleFileInit_PreservesAspireConfigChannel ▶️ View recording
UpdateProjectChannelToStable_TypeScript_PreviewsStablePackagesAndPreservesChannel ▶️ View recording

📹 Recordings uploaded automatically from CI run #26536316589

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

aspire agent init does not surface all bundled Aspire skills

2 participants