Enable groups (#1460)

Author: eleftherias

cmd/thv/app/client.go

@@ -102,11 +102,10 @@ func init() {
 	clientCmd.AddCommand(clientRemoveCmd)
 	clientCmd.AddCommand(clientListRegisteredCmd)
 
-	// TODO: Re-enable when group functionality is complete
-	//clientRegisterCmd.Flags().StringSliceVar(
-	//	&groupAddNames, "group", []string{groups.DefaultGroup}, "Only register workloads from specified groups")
-	//clientRemoveCmd.Flags().StringSliceVar(
-	//	&groupRmNames, "group", []string{}, "Remove client from specified groups (if not set, removes all workloads from the client)")
+	clientRegisterCmd.Flags().StringSliceVar(
+		&groupAddNames, "group", []string{groups.DefaultGroup}, "Only register workloads from specified groups")
+	clientRemoveCmd.Flags().StringSliceVar(
+		&groupRmNames, "group", []string{}, "Remove client from specified groups (if not set, removes all workloads from the client)")
 }
 
 func clientStatusCmdFunc(cmd *cobra.Command, _ []string) error {
@@ -157,11 +156,11 @@ func clientSetupCmdFunc(cmd *cobra.Command, _ []string) error {
 	return registerSelectedClients(cmd, selectedClients, selectedGroups)
 }
 
-// Helper to get available (installed but unregistered) clients
+// Helper to get available (installed) clients
 func getAvailableClients(statuses []client.MCPClientStatus) []client.MCPClientStatus {
 	var available []client.MCPClientStatus
 	for _, s := range statuses {
-		if s.Installed && !s.Registered {
+		if s.Installed {
 			available = append(available, s)
 		}
 	}

cmd/thv/app/commands.go

@@ -54,7 +54,7 @@ func NewRootCmd(enableUpdates bool) *cobra.Command {
 	rootCmd.AddCommand(newSecretCommand())
 	rootCmd.AddCommand(inspectorCommand())
 	rootCmd.AddCommand(newMCPCommand())
-	// rootCmd.AddCommand(groupCmd) //  TODO: add back in once we have a working group command, and update the docs
+	rootCmd.AddCommand(groupCmd)
 
 	// Silence printing the usage on error
 	rootCmd.SilenceUsage = true

cmd/thv/app/common.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/stacklok/toolhive/pkg/config"
 	"github.com/stacklok/toolhive/pkg/secrets"
+	"github.com/stacklok/toolhive/pkg/validation"
 	"github.com/stacklok/toolhive/pkg/workloads"
 )
 
@@ -149,7 +150,7 @@ func completeLogsArgs(cmd *cobra.Command, args []string, _ string) ([]string, co
 
 // ValidateGroupFlag returns a cobra PreRunE-compatible function
 // that validates the --group flag *if provided*.
-/*func validateGroupFlag() func(cmd *cobra.Command, args []string) error {
+func validateGroupFlag() func(cmd *cobra.Command, args []string) error {
 	return func(cmd *cobra.Command, _ []string) error {
 		groupName, err := cmd.Flags().GetString("group")
 		if err != nil {
@@ -168,4 +169,4 @@ func completeLogsArgs(cmd *cobra.Command, args []string, _ string) ([]string, co
 
 		return nil
 	}
-}*/
+}

cmd/thv/app/list.go

@@ -32,10 +32,9 @@ func init() {
 	listCmd.Flags().BoolVarP(&listAll, "all", "a", false, "Show all workloads (default shows just running)")
 	listCmd.Flags().StringVar(&listFormat, "format", FormatText, "Output format (json, text, or mcpservers)")
 	listCmd.Flags().StringArrayVarP(&listLabelFilter, "label", "l", []string{}, "Filter workloads by labels (format: key=value)")
-	// TODO: Re-enable when group functionality is complete
-	// listCmd.Flags().StringVar(&listGroupFilter, "group", "", "Filter workloads by group")
+	listCmd.Flags().StringVar(&listGroupFilter, "group", "", "Filter workloads by group")
 
-	// listCmd.PreRunE = validateGroupFlag()
+	listCmd.PreRunE = validateGroupFlag()
 }
 
 func listCmdFunc(cmd *cobra.Command, _ []string) error {

cmd/thv/app/restart.go

@@ -29,13 +29,12 @@ var restartCmd = &cobra.Command{
 func init() {
 	restartCmd.Flags().BoolVarP(&restartAll, "all", "a", false, "Restart all MCP servers")
 	restartCmd.Flags().BoolVarP(&restartForeground, "foreground", "f", false, "Run the restarted workload in foreground mode")
-	// TODO: Uncomment when groups are fully supported
-	//restartCmd.Flags().StringVarP(&restartGroup, "group", "g", "", "Restart all MCP servers in a specific group")
-	//
-	//// Mark the flags as mutually exclusive
-	//restartCmd.MarkFlagsMutuallyExclusive("all", "group")
+	restartCmd.Flags().StringVarP(&restartGroup, "group", "g", "", "Restart all MCP servers in a specific group")
 
-	// restartCmd.PreRunE = validateGroupFlag()
+	// Mark the flags as mutually exclusive
+	restartCmd.MarkFlagsMutuallyExclusive("all", "group")
+
+	restartCmd.PreRunE = validateGroupFlag()
 }
 
 func restartCmdFunc(cmd *cobra.Command, args []string) error {

cmd/thv/app/rm.go

@@ -20,10 +20,9 @@ var rmCmd = &cobra.Command{
 }
 
 func init() {
-	// TODO: Re-enable when group functionality is complete
-	// rmCmd.Flags().String("group", "", "Delete all workloads in the specified group")
+	rmCmd.Flags().String("group", "", "Delete all workloads in the specified group")
 
-	// rmCmd.PreRunE = validateGroupFlag()
+	rmCmd.PreRunE = validateGroupFlag()
 }
 
 //nolint:gocyclo // This function is complex but manageable

cmd/thv/app/run.go

@@ -82,7 +82,7 @@ func init() {
 	// Add run flags
 	AddRunFlags(runCmd, &runFlags)
 
-	//runCmd.PreRunE = validateGroupFlag()
+	runCmd.PreRunE = validateGroupFlag()
 
 	// This is used for the K8s operator which wraps the run command, but shouldn't be visible to users.
 	if err := runCmd.Flags().MarkHidden("k8s-pod-patch"); err != nil {

cmd/thv/app/run_flags.go

@@ -94,9 +94,8 @@ func AddRunFlags(cmd *cobra.Command, config *RunFlags) {
 	cmd.Flags().StringVar(&config.Transport, "transport", "", "Transport mode (sse, streamable-http or stdio)")
 	cmd.Flags().StringVar(&config.ProxyMode, "proxy-mode", "sse", "Proxy mode for stdio transport (sse or streamable-http)")
 	cmd.Flags().StringVar(&config.Name, "name", "", "Name of the MCP server (auto-generated from image if not provided)")
-	// TODO: Re-enable when group functionality is complete
-	// cmd.Flags().StringVar(&config.Group, "group", "default",
-	//	"Name of the group this workload belongs to (defaults to 'default' if not specified)")
+	cmd.Flags().StringVar(&config.Group, "group", "default",
+		"Name of the group this workload belongs to (defaults to 'default' if not specified)")
 	cmd.Flags().StringVar(&config.Host, "host", transport.LocalhostIPv4, "Host for the HTTP proxy to listen on (IP or hostname)")
 	cmd.Flags().IntVar(&config.ProxyPort, "proxy-port", 0, "Port for the HTTP proxy to listen on (host port)")
 	cmd.Flags().IntVar(&config.TargetPort, "target-port", 0,

cmd/thv/app/stop.go

@@ -32,13 +32,12 @@ var (
 func init() {
 	stopCmd.Flags().IntVar(&stopTimeout, "timeout", 30, "Timeout in seconds before forcibly stopping the workload")
 	stopCmd.Flags().BoolVar(&stopAll, "all", false, "Stop all running MCP servers")
-	// TODO: Re-enable group flag when groups are implemented
-	//stopCmd.Flags().StringVarP(&stopGroup, "group", "g", "", "Stop all MCP servers in a specific group")
-	//
-	//// Mark the flags as mutually exclusive
-	//stopCmd.MarkFlagsMutuallyExclusive("all", "group")
-	//
-	//stopCmd.PreRunE = validateGroupFlag()
+	stopCmd.Flags().StringVarP(&stopGroup, "group", "g", "", "Stop all MCP servers in a specific group")
+
+	// Mark the flags as mutually exclusive
+	stopCmd.MarkFlagsMutuallyExclusive("all", "group")
+
+	stopCmd.PreRunE = validateGroupFlag()
 }
 
 // validateStopArgs validates the arguments for the stop command

cmd/thv/main.go

@@ -8,6 +8,7 @@ import (
 	"github.com/stacklok/toolhive/pkg/client"
 	"github.com/stacklok/toolhive/pkg/container/runtime"
 	"github.com/stacklok/toolhive/pkg/logger"
+	"github.com/stacklok/toolhive/pkg/migration"
 )
 
 func main() {
@@ -20,8 +21,7 @@ func main() {
 
 	// Check and perform default group migration if needed
 	// Migrates existing workloads to the default group, only executes once
-	// TODO: Re-enable when group functionality is complete
-	//migration.CheckAndPerformDefaultGroupMigration()
+	migration.CheckAndPerformDefaultGroupMigration()
 
 	// Skip update check for completion command or if we are running in kubernetes
 	if err := app.NewRootCmd(!app.IsCompletionCommand(os.Args) && !runtime.IsKubernetesRuntime()).Execute(); err != nil {