Migrate old auto_discovery to new client registration setup (#853)

Migrates old auto_discovery to new client registration setup 

Signed-off-by: lujunsan <[email protected]>

Author: lujunsan

cmd/thv/main.go

@@ -5,6 +5,7 @@ import (
 	"os"
 
 	"github.com/stacklok/toolhive/cmd/thv/app"
+	"github.com/stacklok/toolhive/pkg/client"
 	"github.com/stacklok/toolhive/pkg/container"
 	"github.com/stacklok/toolhive/pkg/logger"
 )
@@ -13,6 +14,10 @@ func main() {
 	// Initialize the logger
 	logger.Initialize()
 
+	// Check and perform auto-discovery migration if needed
+	// Handles the auto-discovery flag depreciation, only executes once on old config files
+	client.CheckAndPerformAutoDiscoveryMigration()
+
 	// Skip update check for completion command or if we are running in kubernetes
 	if err := app.NewRootCmd(!app.IsCompletionCommand(os.Args) && !container.IsKubernetesRuntime()).Execute(); err != nil {
 		os.Exit(1)

pkg/client/migration.go

@@ -0,0 +1,101 @@
+package client
+
+import (
+	"fmt"
+	"sync"
+
+	"github.com/stacklok/toolhive/pkg/config"
+	"github.com/stacklok/toolhive/pkg/logger"
+)
+
+// migrationOnce ensures the migration only runs once
+var migrationOnce sync.Once
+
+// CheckAndPerformAutoDiscoveryMigration checks if auto-discovery migration is needed and performs it
+// This is called once at application startup
+func CheckAndPerformAutoDiscoveryMigration() {
+	migrationOnce.Do(func() {
+		appConfig := config.GetConfig()
+
+		// Check if auto-discovery flag is set to true, use of deprecated object is expected here
+		if appConfig.Clients.AutoDiscovery {
+			performAutoDiscoveryMigration()
+		}
+	})
+}
+
+// performAutoDiscoveryMigration discovers and registers all installed clients
+func performAutoDiscoveryMigration() {
+	fmt.Println("Migrating from deprecated auto-discovery to manual client registration...")
+	fmt.Println()
+
+	// Get current client statuses to determine what to register
+	clientStatuses, err := GetClientStatus()
+	if err != nil {
+		logger.Errorf("Error discovering clients during migration: %v", err)
+		return
+	}
+
+	// Get current config to see what's already registered
+	appConfig := config.GetConfig()
+
+	var clientsToRegister []string
+	var alreadyRegistered = appConfig.Clients.RegisteredClients
+
+	// Find installed clients that aren't registered yet
+	for _, status := range clientStatuses {
+		if status.Installed && !status.Registered {
+			clientsToRegister = append(clientsToRegister, string(status.ClientType))
+			fmt.Println("Registering client", string(status.ClientType))
+		}
+	}
+
+	// Register new clients and remove the auto-discovery flag
+	err = config.UpdateConfig(func(c *config.Config) {
+		for _, clientName := range clientsToRegister {
+			// Double-check if not already registered (safety check)
+			found := false
+			for _, registered := range c.Clients.RegisteredClients {
+				if registered == clientName {
+					found = true
+					break
+				}
+			}
+
+			if !found {
+				c.Clients.RegisteredClients = append(c.Clients.RegisteredClients, clientName)
+			}
+		}
+
+		// Remove the auto-discovery flag during the same config update
+		c.Clients.AutoDiscovery = false
+	})
+
+	if err != nil {
+		logger.Errorf("Error updating config during migration: %v", err)
+		return
+	}
+
+	// Print success messages for newly registered clients
+	for _, clientName := range clientsToRegister {
+		fmt.Printf("  ✓ Automatically registered client: %s\n", clientName)
+	}
+
+	fmt.Println()
+	fmt.Println("NOTICE: Auto-discovery of MCP clients has been deprecated and is no longer supported.")
+	fmt.Println("Your existing clients have been automatically migrated to the new manual registration system.")
+	fmt.Println()
+	fmt.Println("Going forward, use 'thv client setup' to discover and register new MCP clients.")
+	fmt.Println("This provides better control and security for your client configurations.")
+	fmt.Println()
+
+	// Show all registered clients (both newly registered and previously registered)
+	allRegisteredClients := append(alreadyRegistered, clientsToRegister...)
+	if len(allRegisteredClients) > 0 {
+		fmt.Println("Registered clients:")
+		for _, clientName := range allRegisteredClients {
+			fmt.Printf("  - %s\n", clientName)
+		}
+		fmt.Println()
+	}
+}

pkg/config/config.go

@@ -71,6 +71,7 @@ func (s *Secrets) GetProviderType() (secrets.ProviderType, error) {
 // Clients contains settings for client configuration.
 type Clients struct {
 	RegisteredClients []string `yaml:"registered_clients"`
+	AutoDiscovery     bool     `yaml:"auto_discovery"` // Deprecated: kept for migration purposes only
 }
 
 // defaultPathGenerator generates the default config path using xdg