Support remote servers in workload management commands (stop/restart/rm) (#1541)

Author: amirejaz

cmd/thv/app/restart.go

@@ -18,9 +18,11 @@ var (
 )
 
 var restartCmd = &cobra.Command{
-	Use:               "restart [workload-name]",
-	Short:             "Restart a tooling server",
-	Long:              `Restart a running tooling server managed by ToolHive. If the server is not running, it will be started.`,
+	Use:   "restart [workload-name]",
+	Short: "Restart a tooling server",
+	Long: `Restart a running tooling server managed by ToolHive.
+If the server is not running, it will be started.
+Supports both container-based and remote MCP servers.`,
 	Args:              cobra.RangeArgs(0, 1),
 	RunE:              restartCmdFunc,
 	ValidArgsFunction: completeMCPServerNames,
@@ -76,7 +78,7 @@ func restartCmdFunc(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("failed to restart workload %s: %v", workloadName, err)
 	}
 
-	fmt.Printf("Container %s restarted successfully\n", workloadName)
+	fmt.Printf("Workload %s restarted successfully\n", workloadName)
 	return nil
 }
 
@@ -88,7 +90,7 @@ func restartAllContainers(ctx context.Context, workloadManager workloads.Manager
 	}
 
 	if len(allWorkloads) == 0 {
-		fmt.Println("No MCP servers found to restart")
+		fmt.Println("No workloads found to restart")
 		return nil
 	}
 
@@ -124,7 +126,7 @@ func restartWorkloadsByGroup(ctx context.Context, workloadManager workloads.Mana
 	}
 
 	if len(workloadNames) == 0 {
-		fmt.Printf("No MCP servers found in group '%s' to restart\n", groupName)
+		fmt.Printf("No workloads found in group '%s' to restart\n", groupName)
 		return nil
 	}
 
@@ -142,7 +144,7 @@ func restartMultipleWorkloads(
 	failedCount := 0
 	var errors []string
 
-	fmt.Printf("Restarting %d MCP server(s)...\n", len(workloadNames))
+	fmt.Printf("Restarting %d workload(s)...\n", len(workloadNames))
 
 	var restartRequests []*errgroup.Group
 	// First, trigger the restarts concurrently.

cmd/thv/app/run_flags.go

@@ -495,18 +495,19 @@ func getRemoteAuthFromRemoteServerMetadata(remoteServerMetadata *registry.Remote
 
 	if remoteServerMetadata.OAuthConfig != nil {
 		return &runner.RemoteAuthConfig{
-			ClientID:     runFlags.RemoteAuthFlags.RemoteAuthClientID,
-			ClientSecret: runFlags.RemoteAuthFlags.RemoteAuthClientSecret,
-			Scopes:       remoteServerMetadata.OAuthConfig.Scopes,
-			SkipBrowser:  runFlags.RemoteAuthFlags.RemoteAuthSkipBrowser,
-			Timeout:      runFlags.RemoteAuthFlags.RemoteAuthTimeout,
-			CallbackPort: remoteServerMetadata.OAuthConfig.CallbackPort,
-			Issuer:       remoteServerMetadata.OAuthConfig.Issuer,
-			AuthorizeURL: remoteServerMetadata.OAuthConfig.AuthorizeURL,
-			TokenURL:     remoteServerMetadata.OAuthConfig.TokenURL,
-			OAuthParams:  remoteServerMetadata.OAuthConfig.OAuthParams,
-			Headers:      remoteServerMetadata.Headers,
-			EnvVars:      remoteServerMetadata.EnvVars,
+			EnableRemoteAuth: runFlags.RemoteAuthFlags.EnableRemoteAuth || runFlags.RemoteAuthFlags.RemoteAuthClientID != "",
+			ClientID:         runFlags.RemoteAuthFlags.RemoteAuthClientID,
+			ClientSecret:     runFlags.RemoteAuthFlags.RemoteAuthClientSecret,
+			Scopes:           remoteServerMetadata.OAuthConfig.Scopes,
+			SkipBrowser:      runFlags.RemoteAuthFlags.RemoteAuthSkipBrowser,
+			Timeout:          runFlags.RemoteAuthFlags.RemoteAuthTimeout,
+			CallbackPort:     remoteServerMetadata.OAuthConfig.CallbackPort,
+			Issuer:           remoteServerMetadata.OAuthConfig.Issuer,
+			AuthorizeURL:     remoteServerMetadata.OAuthConfig.AuthorizeURL,
+			TokenURL:         remoteServerMetadata.OAuthConfig.TokenURL,
+			OAuthParams:      remoteServerMetadata.OAuthConfig.OAuthParams,
+			Headers:          remoteServerMetadata.Headers,
+			EnvVars:          remoteServerMetadata.EnvVars,
 		}
 	}
 	return nil

docs/cli/thv_restart.md

@@ -39,4 +39,6 @@ type Workload struct {
 	Group string `json:"group,omitempty"`
 	// ToolsFilter is the filter on tools applied to the workload.
 	ToolsFilter []string `json:"tools,omitempty"`
+	// Remote indicates whether this is a remote workload (true) or a container workload (false).
+	Remote bool `json:"remote,omitempty"`
 }

docs/server/docs.go

@@ -365,10 +365,16 @@ func (c *RunConfig) WithEnvFile(filePath string) (*RunConfig, error) {
 
 // WithContainerName generates container name if not already set
 func (c *RunConfig) WithContainerName() *RunConfig {
-	if c.ContainerName == "" && c.Image != "" {
-		containerName, baseName := container.GetOrGenerateContainerName(c.Name, c.Image)
-		c.ContainerName = containerName
-		c.BaseName = baseName
+	if c.ContainerName == "" {
+		if c.Image != "" {
+			// For container-based servers
+			containerName, baseName := container.GetOrGenerateContainerName(c.Name, c.Image)
+			c.ContainerName = containerName
+			c.BaseName = baseName
+		} else if c.RemoteURL != "" && c.Name != "" {
+			// For remote servers, use the provided name as base name
+			c.BaseName = c.Name
+		}
 	}
 	return c
 }

docs/server/swagger.json

@@ -321,7 +321,7 @@ func (r *Runner) handleRemoteAuthentication(ctx context.Context) (*oauth2.TokenS
 	authHandler := NewRemoteAuthHandler(r.Config.RemoteAuthConfig)
 
 	// Perform authentication
-	tokenSource, err := authHandler.Authenticate(ctx, r.Config.Image)
+	tokenSource, err := authHandler.Authenticate(ctx, r.Config.RemoteURL)
 	if err != nil {
 		return nil, fmt.Errorf("remote authentication failed: %w", err)
 	}