chore: [ML-1220]: Add support for default toolsets (#54)

* chore: [ML-1220]: resolved comments

Signed-off-by: Saranya-jena <[email protected]>

* chore: [ML-1220]: resolved comments

Signed-off-by: Saranya-jena <[email protected]>

* chore: [ML-1220]: resolved comments

Signed-off-by: Saranya-jena <[email protected]>

* chore: [ML-1220]: Add support for default toolsets

Signed-off-by: Saranya-jena <[email protected]>

Author: Saranya-jena

README.md

@@ -8,6 +8,22 @@ The Harness MCP Server is a [Model Context Protocol (MCP)](https://modelcontextp
 
 The server implements several toolsets:
 
+#### Default Toolset
+
+The default toolset contains essential tools from various services:
+
+Toolset Name: `default`
+
+- `get_connector_details`: Get details of a specific connector
+- `list_connector_catalogue`: List the Harness connector catalogue
+- `list_pipelines`: List pipelines in a repository
+- `get_pipeline`: Get details of a specific pipeline
+- `get_execution`: Get details of a specific pipeline execution
+- `list_executions`: List pipeline executions
+- `fetch_execution_url`: Fetch the execution URL for a pipeline execution
+- `list_dashboards`: Lists all available Harness dashboards
+- `get_dashboard_data`: Retrieves the data from a specific Harness dashboard
+
 #### Pipelines Toolset 
 
 Toolset Name: `pipelines`
@@ -399,7 +415,7 @@ To use the Harness MCP Server with Amazon Q Developer CLI:
 
 The Harness MCP Server supports the following command line arguments:
 
-- `--toolsets`: Comma-separated list of tool groups to enable (default: "all")
+- `--toolsets`: Comma-separated list of tool groups to enable, if the list is empty or flag is not set, only default toolset is enabled (default: "")
 - `--read-only`: Run the server in read-only mode
 - `--log-file`: Path to log file for debugging
 - `--log-level`: Set the logging level (debug, info, warn, error)

pkg/harness/tools.go

@@ -17,7 +17,7 @@ import (
 )
 
 // Default tools to enable
-var DefaultTools = []string{"all"}
+var DefaultTools = []string{}
 
 // Service identity for JWT auth
 const serviceIdentity = "genaiservice" // TODO: can change once we have our own service, not needed at the moment
@@ -29,11 +29,69 @@ var defaultJWTLifetime = 1 * time.Hour
 // Default timeout for GenAI service
 const defaultGenaiTimeout = 300 * time.Second
 
+// createServiceClient is a helper function to create a service client with the given parameters
+func createServiceClient(config *config.Config, serviceBaseURL, baseURL, path, secret string, timeouts ...time.Duration) (*client.Client, error) {
+	url := buildServiceURL(config, serviceBaseURL, baseURL, path)
+	return createClient(url, config, secret, timeouts...)
+}
+
+// registerDefault registers the default toolset with essential tools from various services
+func registerDefault(config *config.Config, tsg *toolsets.ToolsetGroup) error {
+	// Create pipeline service client
+	pipelineClient, err := createServiceClient(config, config.PipelineSvcBaseURL, config.BaseURL, "pipeline", config.PipelineSvcSecret)
+	if err != nil {
+		return fmt.Errorf("failed to create client for pipeline service: %w", err)
+	}
+	pipelineServiceClient := &client.PipelineService{Client: pipelineClient}
+
+	// Create connector service client
+	connectorClient, err := createServiceClient(config, config.NgManagerBaseURL, config.BaseURL, "ng/api", config.NgManagerSecret)
+	if err != nil {
+		return fmt.Errorf("failed to create client for connectors: %w", err)
+	}
+	connectorServiceClient := &client.ConnectorService{Client: connectorClient}
+
+	// Create dashboard service client
+	customTimeout := 30 * time.Second
+	dashboardClient, err := createServiceClient(config, config.DashboardSvcBaseURL, config.BaseURL, "dashboard", config.DashboardSvcSecret, customTimeout)
+	if err != nil {
+		return fmt.Errorf("failed to create client for dashboard service: %w", err)
+	}
+	dashboardServiceClient := &client.DashboardService{Client: dashboardClient}
+
+	// Create the default toolset with essential tools
+	defaultToolset := toolsets.NewToolset("default", "Default essential Harness tools").AddReadTools(
+		// Connector Management tools
+		toolsets.NewServerTool(GetConnectorDetailsTool(config, connectorServiceClient)),
+		toolsets.NewServerTool(ListConnectorCatalogueTool(config, connectorServiceClient)),
+
+		// Pipeline Management tools
+		toolsets.NewServerTool(ListPipelinesTool(config, pipelineServiceClient)),
+		toolsets.NewServerTool(GetPipelineTool(config, pipelineServiceClient)),
+		toolsets.NewServerTool(FetchExecutionURLTool(config, pipelineServiceClient)),
+		toolsets.NewServerTool(GetExecutionTool(config, pipelineServiceClient)),
+		toolsets.NewServerTool(ListExecutionsTool(config, pipelineServiceClient)),
+
+		// Dashboard tools
+		toolsets.NewServerTool(ListDashboardsTool(config, dashboardServiceClient)),
+		toolsets.NewServerTool(GetDashboardDataTool(config, dashboardServiceClient)),
+	)
+
+	// Add the default toolset to the group
+	tsg.AddToolset(defaultToolset)
+	return nil
+}
+
 // InitToolsets initializes and returns the toolset groups
 func InitToolsets(config *config.Config) (*toolsets.ToolsetGroup, error) {
 	// Create a toolset group
 	tsg := toolsets.NewToolsetGroup(config.ReadOnly)
 
+	// Register default toolset with essential tools
+	if err := registerDefault(config, tsg); err != nil {
+		return nil, err
+	}
+
 	// Register pipelines
 	if err := registerPipelines(config, tsg); err != nil {
 		return nil, err
@@ -594,6 +652,7 @@ func registerCloudCostManagement(config *config.Config, tsg *toolsets.ToolsetGro
 
 // registerGenai registers the genai toolset
 func registerGenai(config *config.Config, tsg *toolsets.ToolsetGroup) error {
+
 	// Skip registration for external mode for now
 	if !config.Internal {
 		return nil

pkg/toolsets/toolsets.go

@@ -124,6 +124,13 @@ func (tg *ToolsetGroup) IsEnabled(name string) bool {
 
 // EnableToolsets enables multiple toolsets by name
 func (tg *ToolsetGroup) EnableToolsets(names []string) error {
+	if len(names) == 0 {
+		err := tg.EnableToolset("default")
+		if err != nil {
+			return err
+		}
+		return nil
+	}
 	for _, name := range names {
 		if name == "all" {
 			tg.everythingOn = true
@@ -160,7 +167,13 @@ func (tg *ToolsetGroup) EnableToolset(name string) error {
 
 // RegisterTools registers all enabled toolsets with the server
 func (tg *ToolsetGroup) RegisterTools(s *server.MCPServer) {
+	if tg == nil || len(tg.Toolsets) == 0 {
+		return
+	}
+
 	for _, toolset := range tg.Toolsets {
-		toolset.RegisterTools(s)
+		if toolset != nil {
+			toolset.RegisterTools(s)
+		}
 	}
 }