Return registered groups from API (#1444)

Author: eleftherias

cmd/thv/app/client.go

@@ -215,54 +215,36 @@ func clientRemoveCmdFunc(cmd *cobra.Command, args []string) error {
 }
 
 func listRegisteredClientsCmdFunc(cmd *cobra.Command, _ []string) error {
-	cfg := config.GetConfig()
-
-	// Check if we have groups configured
-	groupManager, err := groups.NewManager()
+	clientManager, err := client.NewManager(cmd.Context())
 	if err != nil {
-		return fmt.Errorf("failed to create group manager: %w", err)
+		return fmt.Errorf("failed to create client manager: %w", err)
 	}
 
-	allGroups, err := groupManager.List(cmd.Context())
+	registeredClients, err := clientManager.ListClients(cmd.Context())
 	if err != nil {
-		return fmt.Errorf("failed to list groups: %w", err)
+		return fmt.Errorf("failed to list registered clients: %w", err)
 	}
 
-	hasGroups := len(allGroups) > 0
-	clientGroups := make(map[string][]string) // client -> groups
-	allRegisteredClients := make(map[string]bool)
-
-	if hasGroups {
-		// Collect clients from all groups
-		for _, group := range allGroups {
-			for _, clientName := range group.RegisteredClients {
-				allRegisteredClients[clientName] = true
-				clientGroups[clientName] = append(clientGroups[clientName], group.Name)
-			}
-		}
-	}
-
-	// Add clients from global config that might not be in any group
-	for _, clientName := range cfg.Clients.RegisteredClients {
-		if !allRegisteredClients[clientName] {
-			allRegisteredClients[clientName] = true
-			if hasGroups {
-				clientGroups[clientName] = []string{} // no groups
-			}
+	// Convert to UI format
+	var uiClients []ui.RegisteredClient
+	for _, regClient := range registeredClients {
+		uiClient := ui.RegisteredClient{
+			Name:   string(regClient.Name),
+			Groups: regClient.Groups,
 		}
+		uiClients = append(uiClients, uiClient)
 	}
 
-	// Convert to slice for table rendering
-	var registeredClients []ui.RegisteredClient
-	for clientName := range allRegisteredClients {
-		registered := ui.RegisteredClient{
-			Name:   clientName,
-			Groups: clientGroups[clientName],
+	// Determine if we have groups by checking if any client has groups
+	hasGroups := false
+	for _, regClient := range registeredClients {
+		if len(regClient.Groups) > 0 {
+			hasGroups = true
+			break
 		}
-		registeredClients = append(registeredClients, registered)
 	}
 
-	return ui.RenderRegisteredClientsTable(registeredClients, hasGroups)
+	return ui.RenderRegisteredClientsTable(uiClients, hasGroups)
 }
 
 func performClientRegistration(ctx context.Context, clients []client.Client, groupNames []string) error {

pkg/api/v1/clients.go

@@ -51,10 +51,10 @@ func ClientRouter(
 //	@Description	List all registered clients in ToolHive
 //	@Tags			clients
 //	@Produce		json
-//	@Success		200	{array}	client.Client
+//	@Success		200	{array}	client.RegisteredClient
 //	@Router			/api/v1beta/clients [get]
-func (c *ClientRoutes) listClients(w http.ResponseWriter, _ *http.Request) {
-	clients, err := c.clientManager.ListClients()
+func (c *ClientRoutes) listClients(w http.ResponseWriter, r *http.Request) {
+	clients, err := c.clientManager.ListClients(r.Context())
 	if err != nil {
 		logger.Errorf("Failed to list clients: %v", err)
 		http.Error(w, "Failed to list clients", http.StatusInternalServerError)

pkg/client/manager.go

@@ -22,12 +22,18 @@ type Client struct {
 	Name MCPClient `json:"name"`
 }
 
+// RegisteredClient represents a registered client with its associated groups.
+type RegisteredClient struct {
+	Name   MCPClient `json:"name"`
+	Groups []string  `json:"groups"`
+}
+
 // Manager is the interface for managing registered ToolHive clients.
 //
 //go:generate mockgen -destination=mocks/mock_manager.go -package=mocks -source=manager.go Manager
 type Manager interface {
-	// ListClients returns a list of all registered.
-	ListClients() ([]Client, error)
+	// ListClients returns a list of all registered clients with their group information.
+	ListClients(ctx context.Context) ([]RegisteredClient, error)
 	// RegisterClients registers multiple clients with ToolHive for the specified workloads.
 	RegisterClients(clients []Client, workloads []core.Workload) error
 	// UnregisterClients unregisters multiple clients from ToolHive for the specified workloads.
@@ -61,15 +67,49 @@ func NewManager(ctx context.Context) (Manager, error) {
 	}, nil
 }
 
-func (*defaultManager) ListClients() ([]Client, error) {
-	clients := []Client{}
-	appConfig := config.GetConfig()
+func (m *defaultManager) ListClients(ctx context.Context) ([]RegisteredClient, error) {
+	cfg := config.GetConfig()
+
+	// Get all groups
+	allGroups, err := m.groupManager.List(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to list groups: %w", err)
+	}
+
+	clientGroups := make(map[string][]string) // client -> groups
+	allRegisteredClients := make(map[string]bool)
+
+	if len(allGroups) > 0 {
+		// Collect clients from all groups
+		for _, group := range allGroups {
+			for _, clientName := range group.RegisteredClients {
+				allRegisteredClients[clientName] = true
+				clientGroups[clientName] = append(clientGroups[clientName], group.Name)
+			}
+		}
+	}
+
+	// Add clients from global config that might not be in any group
+	for _, clientName := range cfg.Clients.RegisteredClients {
+		if !allRegisteredClients[clientName] {
+			allRegisteredClients[clientName] = true
+			if len(allGroups) > 0 {
+				clientGroups[clientName] = []string{} // no groups
+			}
+		}
+	}
 
-	for _, clientName := range appConfig.Clients.RegisteredClients {
-		clients = append(clients, Client{Name: MCPClient(clientName)})
+	// Convert to slice for return
+	var registeredClients []RegisteredClient
+	for clientName := range allRegisteredClients {
+		registered := RegisteredClient{
+			Name:   MCPClient(clientName),
+			Groups: clientGroups[clientName],
+		}
+		registeredClients = append(registeredClients, registered)
 	}
 
-	return clients, nil
+	return registeredClients, nil
 }
 
 // RegisterClients registers multiple clients with ToolHive for the specified workloads.