refactor(cli): restructure plugin commands into pack batch

ImuS663 · ImuS663 · commit 5c721661e778 · 2026-02-26T15:29:15.000+02:00
diff --git a/README.md b/README.md
@@ -109,7 +109,7 @@ A plugin exposes one or more proxy sources, and the CLI orchestrates:
 For automatic adding plugins from `.pxp` package use the command:
 
 ```shell
-./proxxi install <PATH_TO_PLUGIN_PACKAGE>.pxp
+./proxxi pack install <PATH_TO_PLUGIN_PACKAGE>.pxp
 ```
 
 > This command unpackage `.pxp` package in to the plugins directory, and register in the plugins
diff --git a/src/Proxxi.Cli/Commands/Fetch/FetchCommandSettings.cs b/src/Proxxi.Cli/Commands/Fetch/FetchCommandSettings.cs
@@ -7,7 +7,7 @@
 
 namespace Proxxi.Cli.Commands.Fetch;
 
-public class FetchCommandSettings : CommandSettings
+public sealed class FetchCommandSettings : CommandSettings
 {
     [CommandArgument(0, "<ID>")]
     [Description("The plugin ID or alias to fetch proxies from")]
diff --git a/src/Proxxi.Cli/Commands/Pack/Install/InstallCommand.cs b/src/Proxxi.Cli/Commands/Pack/Install/InstallCommand.cs
@@ -12,7 +12,7 @@
 using Spectre.Console;
 using Spectre.Console.Cli;
 
-namespace Proxxi.Cli.Commands.Install;
+namespace Proxxi.Cli.Commands.Pack.Install;
 
 public sealed class InstallCommand(
     IAnsiConsole console,
diff --git a/src/Proxxi.Cli/Commands/Pack/Install/InstallCommandSettings.cs b/src/Proxxi.Cli/Commands/Pack/Install/InstallCommandSettings.cs
@@ -2,7 +2,7 @@
 
 using Spectre.Console.Cli;
 
-namespace Proxxi.Cli.Commands.Install;
+namespace Proxxi.Cli.Commands.Pack.Install;
 
 public sealed class InstallCommandSettings : CommandSettings
 {
diff --git a/src/Proxxi.Cli/Commands/Pack/Remove/RemoveCommand.cs b/src/Proxxi.Cli/Commands/Pack/Remove/RemoveCommand.cs
@@ -7,7 +7,7 @@
 using Spectre.Console;
 using Spectre.Console.Cli;
 
-namespace Proxxi.Cli.Commands.Remove;
+namespace Proxxi.Cli.Commands.Pack.Remove;
 
 public sealed class RemoveCommand(
     IAnsiConsole console,
diff --git a/src/Proxxi.Cli/Commands/Pack/Remove/RemoveCommandSettings.cs b/src/Proxxi.Cli/Commands/Pack/Remove/RemoveCommandSettings.cs
@@ -2,7 +2,7 @@
 
 using Spectre.Console.Cli;
 
-namespace Proxxi.Cli.Commands.Remove;
+namespace Proxxi.Cli.Commands.Pack.Remove;
 
 public sealed class RemoveCommandSettings : CommandSettings
 {
diff --git a/src/Proxxi.Cli/Commands/Plugin/PluginAlias/PluginAliasCommand.cs b/src/Proxxi.Cli/Commands/Plugin/PluginAlias/PluginAliasCommand.cs
@@ -5,7 +5,7 @@
 
 namespace Proxxi.Cli.Commands.Plugin.PluginAlias;
 
-public class PluginAliasCommand(IAnsiConsole console, IPluginConfigProvider configProvider)
+public sealed class PluginAliasCommand(IAnsiConsole console, IPluginConfigProvider configProvider)
     : Command<PluginAliasCommandSettings>
 {
     public override int Execute(CommandContext context, PluginAliasCommandSettings settings, CancellationToken ct)
diff --git a/src/Proxxi.Cli/Commands/Plugin/PluginAlias/PluginAliasCommandSettings.cs b/src/Proxxi.Cli/Commands/Plugin/PluginAlias/PluginAliasCommandSettings.cs
@@ -4,7 +4,7 @@
 
 namespace Proxxi.Cli.Commands.Plugin.PluginAlias;
 
-public class PluginAliasCommandSettings : PluginCommandSettings
+public sealed class PluginAliasCommandSettings : PluginCommandSettings
 {
     [CommandArgument(0, "[VALUE]")]
     [Description("The alias to set for the plugin (if omitted, the print the current alias)")]
diff --git a/src/Proxxi.Cli/Commands/Plugin/PluginDisable/PluginDisableCommand.cs b/src/Proxxi.Cli/Commands/Plugin/PluginDisable/PluginDisableCommand.cs
@@ -5,7 +5,7 @@
 
 namespace Proxxi.Cli.Commands.Plugin.PluginDisable;
 
-public class PluginDisableCommand(IAnsiConsole console, IPluginConfigProvider configProvider)
+public sealed class PluginDisableCommand(IAnsiConsole console, IPluginConfigProvider configProvider)
     : Command<PluginDisableCommand.PluginDisableCommandSettings>
 {
     public class PluginDisableCommandSettings : PluginCommandSettings;
diff --git a/src/Proxxi.Cli/Commands/Plugin/PluginEnable/PluginEnableCommand.cs b/src/Proxxi.Cli/Commands/Plugin/PluginEnable/PluginEnableCommand.cs
@@ -5,7 +5,7 @@
 
 namespace Proxxi.Cli.Commands.Plugin.PluginEnable;
 
-public class PluginEnableCommand(IAnsiConsole console, IPluginConfigProvider configProvider)
+public sealed class PluginEnableCommand(IAnsiConsole console, IPluginConfigProvider configProvider)
     : Command<PluginEnableCommand.PluginEnableCommandSettings>
 {
     public class PluginEnableCommandSettings : PluginCommandSettings;
diff --git a/src/Proxxi.Cli/Commands/Plugin/PluginInfo/PluginInfoCommand.cs b/src/Proxxi.Cli/Commands/Plugin/PluginInfo/PluginInfoCommand.cs
@@ -10,7 +10,7 @@
 
 namespace Proxxi.Cli.Commands.Plugin.PluginInfo;
 
-public class PluginInfoCommand(
+public sealed class PluginInfoCommand(
     IAnsiConsole console,
     IPluginConfigProvider configProvider,
     IPluginLoader pluginLoader,
diff --git a/src/Proxxi.Cli/Commands/Plugin/PluginParameter/PluginParameterCommand.cs b/src/Proxxi.Cli/Commands/Plugin/PluginParameter/PluginParameterCommand.cs
@@ -9,7 +9,7 @@
 
 namespace Proxxi.Cli.Commands.Plugin.PluginParameter;
 
-public class PluginParameterCommand(
+public sealed class PluginParameterCommand(
     IAnsiConsole console,
     IPluginConfigProvider configProvider,
     IPluginLoader pluginLoader,
diff --git a/src/Proxxi.Cli/Commands/Plugin/PluginParameter/PluginParameterCommandSettings.cs b/src/Proxxi.Cli/Commands/Plugin/PluginParameter/PluginParameterCommandSettings.cs
@@ -4,7 +4,7 @@
 
 namespace Proxxi.Cli.Commands.Plugin.PluginParameter;
 
-public class PluginParameterCommandSettings : PluginCommandSettings
+public sealed class PluginParameterCommandSettings : PluginCommandSettings
 {
     [CommandArgument(0, "<NAME>")]
     [Description("The parameter name to set for the plugin")]
diff --git a/src/Proxxi.Cli/Commands/Plugin/PluginParameters/PluginParametersCommand.cs b/src/Proxxi.Cli/Commands/Plugin/PluginParameters/PluginParametersCommand.cs
@@ -9,7 +9,7 @@
 
 namespace Proxxi.Cli.Commands.Plugin.PluginParameters;
 
-public class PluginParametersCommand(
+public sealed class PluginParametersCommand(
     IAnsiConsole console,
     IPluginConfigProvider configProvider,
     IPluginLoader pluginLoader,
diff --git a/src/Proxxi.Cli/Commands/Plugin/PluginParameters/PluginParametersCommandSettings.cs b/src/Proxxi.Cli/Commands/Plugin/PluginParameters/PluginParametersCommandSettings.cs
@@ -4,7 +4,7 @@
 
 namespace Proxxi.Cli.Commands.Plugin.PluginParameters;
 
-public class PluginParametersCommandSettings : PluginCommandSettings
+public sealed class PluginParametersCommandSettings : PluginCommandSettings
 {
     [CommandOption("-d|--desc")]
     [Description("Show plugin supported parameters and their descriptions")]
diff --git a/src/Proxxi.Cli/Commands/Plugins/PluginsCommand.cs b/src/Proxxi.Cli/Commands/Plugins/PluginsCommand.cs
@@ -8,7 +8,7 @@
 
 namespace Proxxi.Cli.Commands.Plugins;
 
-public class PluginsCommand(
+public sealed class PluginsCommand(
     IAnsiConsole console,
     IPluginConfigProvider configProvider,
     IOptions<ProxxiPathsOptions> options
diff --git a/src/Proxxi.Cli/Program.cs b/src/Proxxi.Cli/Program.cs
@@ -5,7 +5,8 @@
 using Microsoft.Extensions.DependencyInjection;
 
 using Proxxi.Cli.Commands.Fetch;
-using Proxxi.Cli.Commands.Install;
+using Proxxi.Cli.Commands.Pack.Install;
+using Proxxi.Cli.Commands.Pack.Remove;
 using Proxxi.Cli.Commands.Plugin;
 using Proxxi.Cli.Commands.Plugin.PluginAlias;
 using Proxxi.Cli.Commands.Plugin.PluginDisable;
@@ -14,7 +15,6 @@
 using Proxxi.Cli.Commands.Plugin.PluginParameter;
 using Proxxi.Cli.Commands.Plugin.PluginParameters;
 using Proxxi.Cli.Commands.Plugins;
-using Proxxi.Cli.Commands.Remove;
 using Proxxi.Cli.Infrastructure.Injection;
 using Proxxi.Core.Extensions;
 using Proxxi.Core.Providers;
@@ -80,11 +80,16 @@
     config.AddCommand<PluginsCommand>("plugins")
         .WithDescription("List installed plugins.");
 
-    config.AddCommand<InstallCommand>("install")
-        .WithDescription("Install a plugins with (.pxp) package.");
+    config.AddBranch("pack", packConfig =>
+    {
+        packConfig.SetDescription("Manage plugins packages.");
+
+        packConfig.AddCommand<InstallCommand>("install")
+            .WithDescription("Install a plugins with (.pxp) package.");
 
-    config.AddCommand<RemoveCommand>("remove")
-        .WithDescription("Remove a plugins package.");
+        packConfig.AddCommand<RemoveCommand>("remove")
+            .WithDescription("Remove a plugins package.");
+    });
 
 #if DEBUG
     config.ValidateExamples();
diff --git a/src/Proxxi.Cli/Proxxi.Cli.csproj b/src/Proxxi.Cli/Proxxi.Cli.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
     <PackageReference Include="Spectre.Console" Version="0.53.1" />
     <PackageReference Include="Spectre.Console.Cli" Version="0.53.1" />
   </ItemGroup>
diff --git a/src/Proxxi.Core/Proxxi.Core.csproj b/src/Proxxi.Core/Proxxi.Core.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Options" Version="10.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="10.0.3" />
     <PackageReference Include="Proxxi.Plugin.Sdk" Version="2.2.0" />
   </ItemGroup>
 
diff --git a/tests/Proxxi.Core.Tests/Proxxi.Core.Tests.csproj b/tests/Proxxi.Core.Tests/Proxxi.Core.Tests.csproj
@@ -9,9 +9,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-    <PackageReference Include="NUnit" Version="4.4.0" />
+    <PackageReference Include="coverlet.collector" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageReference Include="NUnit" Version="4.5.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.11.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace Proxxi.Cli.Commands.Fetch;`
`9`	`9`
`10`		`-public class FetchCommandSettings : CommandSettings`
	`10`	`+public sealed class FetchCommandSettings : CommandSettings`
`11`	`11`	`{`
`12`	`12`	`[CommandArgument(0, "<ID>")]`
`13`	`13`	`[Description("The plugin ID or alias to fetch proxies from")]`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`using Spectre.Console.Cli;`
`4`	`4`
`5`		`-namespace Proxxi.Cli.Commands.Install;`
	`5`	`+namespace Proxxi.Cli.Commands.Pack.Install;`
`6`	`6`
`7`	`7`	`public sealed class InstallCommandSettings : CommandSettings`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`using Spectre.Console.Cli;`
`4`	`4`
`5`		`-namespace Proxxi.Cli.Commands.Remove;`
	`5`	`+namespace Proxxi.Cli.Commands.Pack.Remove;`
`6`	`6`
`7`	`7`	`public sealed class RemoveCommandSettings : CommandSettings`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace Proxxi.Cli.Commands.Plugin.PluginAlias;`
`7`	`7`
`8`		`-public class PluginAliasCommand(IAnsiConsole console, IPluginConfigProvider configProvider)`
	`8`	`+public sealed class PluginAliasCommand(IAnsiConsole console, IPluginConfigProvider configProvider)`
`9`	`9`	`: Command<PluginAliasCommandSettings>`
`10`	`10`	`{`
`11`	`11`	`public override int Execute(CommandContext context, PluginAliasCommandSettings settings, CancellationToken ct)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Proxxi.Cli.Commands.Plugin.PluginAlias;`
`6`	`6`
`7`		`-public class PluginAliasCommandSettings : PluginCommandSettings`
	`7`	`+public sealed class PluginAliasCommandSettings : PluginCommandSettings`
`8`	`8`	`{`
`9`	`9`	`[CommandArgument(0, "[VALUE]")]`
`10`	`10`	`[Description("The alias to set for the plugin (if omitted, the print the current alias)")]`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace Proxxi.Cli.Commands.Plugin.PluginDisable;`
`7`	`7`
`8`		`-public class PluginDisableCommand(IAnsiConsole console, IPluginConfigProvider configProvider)`
	`8`	`+public sealed class PluginDisableCommand(IAnsiConsole console, IPluginConfigProvider configProvider)`
`9`	`9`	`: Command<PluginDisableCommand.PluginDisableCommandSettings>`
`10`	`10`	`{`
`11`	`11`	`public class PluginDisableCommandSettings : PluginCommandSettings;`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace Proxxi.Cli.Commands.Plugin.PluginEnable;`
`7`	`7`
`8`		`-public class PluginEnableCommand(IAnsiConsole console, IPluginConfigProvider configProvider)`
	`8`	`+public sealed class PluginEnableCommand(IAnsiConsole console, IPluginConfigProvider configProvider)`
`9`	`9`	`: Command<PluginEnableCommand.PluginEnableCommandSettings>`
`10`	`10`	`{`
`11`	`11`	`public class PluginEnableCommandSettings : PluginCommandSettings;`