init mcp client test (#1429)

Author: nullfunc

pkgs/defang/cli.nix

@@ -7,7 +7,7 @@ buildGoModule {
   pname = "defang-cli";
   version = "git";
   src = ../../src;
-  vendorHash = "sha256-2BQght2PFjXOwV7K7C74hc3yFvIS46N15qoUmkxZAe8="; # TODO: use fetchFromGitHub
+  vendorHash = "sha256-m8xBhpKS6Tvoik2WZbkWgM52/FkCEhbdFNRwByi30zw="; # TODO: use fetchFromGitHub
 
   subPackages = [ "cmd/cli" ];
 

src/cmd/cli/command/mcp.go

@@ -8,9 +8,6 @@ import (
 	cliClient "github.com/DefangLabs/defang/src/pkg/cli/client"
 	"github.com/DefangLabs/defang/src/pkg/login"
 	"github.com/DefangLabs/defang/src/pkg/mcp"
-	"github.com/DefangLabs/defang/src/pkg/mcp/prompts"
-	"github.com/DefangLabs/defang/src/pkg/mcp/resources"
-	"github.com/DefangLabs/defang/src/pkg/mcp/tools"
 	"github.com/DefangLabs/defang/src/pkg/term"
 	"github.com/mark3labs/mcp-go/server"
 	"github.com/spf13/cobra"
@@ -42,48 +39,14 @@ var mcpServerCmd = &cobra.Command{
 			term.DefaultTerm = term.NewTerm(os.Stdin, logFile, logFile)
 		}
 
-		// Setup knowledge base
-		term.Debug("Setting up knowledge base")
-		if err := mcp.SetupKnowledgeBase(); err != nil {
-			return fmt.Errorf("failed to setup knowledge base: %w", err)
-		}
+		cluster := getCluster()
 
 		// Create a new MCP server
 		term.Debug("Creating MCP server")
-		s := server.NewMCPServer(
-			"Deploy with Defang",
-			RootCmd.Version,
-			server.WithResourceCapabilities(true, true), // Enable resource management and notifications
-			server.WithPromptCapabilities(true),         // Enable interactive prompts
-			server.WithToolCapabilities(true),           // Enable dynamic tool list updates
-			server.WithInstructions(`
-Defang provides tools for deploying web applications to cloud providers (AWS, GCP, Digital Ocean) using a compose.yaml file.
-
-There are a number of available tools to help with deployment, configuration, and manage applications deployed with Defang.
-
-deploy - This tool deploys a web application to the cloud using the compose.yaml file in the application's working directory.
-destroy - This tool spins down and removes a deployed project from the cloud, cleaning up all associated resources.
-estimate - This tool estimates the cost of running a deployed application based on its resource usage and cloud provider pricing.
-services - This tool lists all running services for a deployed application, providing status and resource usage information
-list_configs - This tool lists all configuration variables for a deployed application, allowing you to view current settings.
-remove_config - This tool removes a configuration variable for a deployed application, allowing you to clean up unused settings.
-set_config - This tool sets or updates configuration variables for a deployed application, allowing you to manage environment variables and secrets.
-			`),
-		)
-
-		cluster := getCluster()
-
-		// Setup resources
-		term.Debug("Setting up resources")
-		resources.SetupResources(s)
-
-		//setup prompts
-		term.Debug("Setting up prompts")
-		prompts.SetupPrompts(s, cluster, &providerID)
-
-		// Setup tools
-		term.Debug("Setting up tools")
-		tools.SetupTools(s, cluster, authPort, &providerID)
+		s, err := mcp.NewDefangMCPServer(RootCmd.Version, cluster, authPort, &providerID)
+		if err != nil {
+			return fmt.Errorf("failed to create MCP server: %w", err)
+		}
 
 		// Start auth server for docker login flow
 		if authPort != 0 {

src/pkg/mcp/mcp_server.go

@@ -0,0 +1,56 @@
+package mcp
+
+import (
+	"fmt"
+
+	"github.com/DefangLabs/defang/src/pkg/mcp/prompts"
+	"github.com/DefangLabs/defang/src/pkg/mcp/resources"
+	"github.com/DefangLabs/defang/src/pkg/mcp/tools"
+	"github.com/DefangLabs/defang/src/pkg/term"
+	"github.com/mark3labs/mcp-go/server"
+
+	// NewDefangMCPServer returns a new MCPServer instance with all resources, tools, and prompts registered.
+	cliClient "github.com/DefangLabs/defang/src/pkg/cli/client"
+)
+
+func NewDefangMCPServer(version string, cluster string, authPort int, providerID *cliClient.ProviderID) (*server.MCPServer, error) {
+	instructions := `Defang provides tools for deploying web applications to cloud providers (AWS, GCP, Digital Ocean) using a compose.yaml file.
+
+There are a number of available tools to help with deployment, configuration, and manage applications deployed with Defang.
+
+deploy - This tool deploys a web application to the cloud using the compose.yaml file in the application's working directory.
+destroy - This tool spins down and removes a deployed project from the cloud, cleaning up all associated resources.
+estimate - This tool estimates the cost of running a deployed application based on its resource usage and cloud provider pricing.
+services - This tool lists all running services for a deployed application, providing status and resource usage information
+list_configs - This tool lists all configuration variables for a deployed application, allowing you to view current settings.
+remove_config - This tool removes a configuration variable for a deployed application, allowing you to clean up unused settings.
+set_config - This tool sets or updates configuration variables for a deployed application, allowing you to manage environment variables and secrets.`
+
+	// Setup knowledge base
+	term.Debug("Setting up knowledge base")
+	if err := SetupKnowledgeBase(); err != nil {
+		return nil, fmt.Errorf("failed to setup knowledge base: %w", err)
+	}
+
+	s := server.NewMCPServer(
+		"Deploy with Defang",
+		version,
+		server.WithResourceCapabilities(true, true),
+		server.WithPromptCapabilities(true),
+		server.WithToolCapabilities(true),
+		server.WithInstructions(instructions),
+	)
+
+	// Setup resources
+	term.Debug("Setting up resources")
+	resources.SetupResources(s)
+
+	//setup prompts
+	term.Debug("Setting up prompts")
+	prompts.SetupPrompts(s, cluster, providerID)
+
+	// Setup tools
+	term.Debug("Setting up tools")
+	tools.SetupTools(s, cluster, authPort, providerID)
+	return s, nil
+}