Add configurable server name and title via env/flag

Allows users running multiple GitHub MCP Server instances (e.g., for
github.com and GitHub Enterprise Server) to override the server name and
title in the MCP initialization response.

- Add --server-name / GITHUB_SERVER_NAME flag+env to override name
- Add --server-title / GITHUB_SERVER_TITLE flag+env to override title
- Defaults remain "github-mcp-server" and "GitHub MCP Server"
- Applies to both stdio and HTTP server modes
- Add tests for default and custom name/title

Co-authored-by: SamMorrowDrums <4811358+SamMorrowDrums@users.noreply.github.com>

Author: Copilot

cmd/github-mcp-server/main.go

@@ -80,6 +80,8 @@ var (
 			ttl := viper.GetDuration("repo-access-cache-ttl")
 			stdioServerConfig := ghmcp.StdioServerConfig{
 				Version:              version,
+				Name:                 viper.GetString("server-name"),
+				Title:                viper.GetString("server-title"),
 				Host:                 viper.GetString("host"),
 				Token:                token,
 				EnabledToolsets:      enabledToolsets,
@@ -108,6 +110,8 @@ var (
 			ttl := viper.GetDuration("repo-access-cache-ttl")
 			httpConfig := ghhttp.ServerConfig{
 				Version:              version,
+				Name:                 viper.GetString("server-name"),
+				Title:                viper.GetString("server-title"),
 				Host:                 viper.GetString("host"),
 				Port:                 viper.GetInt("port"),
 				BaseURL:              viper.GetString("base-url"),
@@ -133,6 +137,8 @@ func init() {
 	rootCmd.SetVersionTemplate("{{.Short}}\n{{.Version}}\n")
 
 	// Add global flags that will be shared by all commands
+	rootCmd.PersistentFlags().String("server-name", "", "Override the server name in the MCP initialization response")
+	rootCmd.PersistentFlags().String("server-title", "", "Override the server title in the MCP initialization response")
 	rootCmd.PersistentFlags().StringSlice("toolsets", nil, github.GenerateToolsetsHelp())
 	rootCmd.PersistentFlags().StringSlice("tools", nil, "Comma-separated list of specific tools to enable")
 	rootCmd.PersistentFlags().StringSlice("exclude-tools", nil, "Comma-separated list of tool names to disable regardless of other settings")
@@ -155,6 +161,8 @@ func init() {
 	httpCmd.Flags().Bool("scope-challenge", false, "Enable OAuth scope challenge responses")
 
 	// Bind flag to viper
+	_ = viper.BindPFlag("server-name", rootCmd.PersistentFlags().Lookup("server-name"))
+	_ = viper.BindPFlag("server-title", rootCmd.PersistentFlags().Lookup("server-title"))
 	_ = viper.BindPFlag("toolsets", rootCmd.PersistentFlags().Lookup("toolsets"))
 	_ = viper.BindPFlag("tools", rootCmd.PersistentFlags().Lookup("tools"))
 	_ = viper.BindPFlag("exclude_tools", rootCmd.PersistentFlags().Lookup("exclude-tools"))

internal/ghmcp/server.go

@@ -171,6 +171,14 @@ type StdioServerConfig struct {
 	// Version of the server
 	Version string
 
+	// Name overrides the server name in the MCP initialization response.
+	// If empty, defaults to "github-mcp-server".
+	Name string
+
+	// Title overrides the server title in the MCP initialization response.
+	// If empty, defaults to "GitHub MCP Server".
+	Title string
+
 	// GitHub Host to target for API requests (e.g. github.com or github.enterprise.com)
 	Host string
 
@@ -266,6 +274,8 @@ func RunStdioServer(cfg StdioServerConfig) error {
 
 	ghServer, err := NewStdioMCPServer(ctx, github.MCPServerConfig{
 		Version:           cfg.Version,
+		Name:              cfg.Name,
+		Title:             cfg.Title,
 		Host:              cfg.Host,
 		Token:             cfg.Token,
 		EnabledToolsets:   cfg.EnabledToolsets,

pkg/github/server.go

@@ -20,6 +20,14 @@ type MCPServerConfig struct {
 	// Version of the server
 	Version string
 
+	// Name overrides the server name in the MCP initialization response.
+	// If empty, defaults to "github-mcp-server".
+	Name string
+
+	// Title overrides the server title in the MCP initialization response.
+	// If empty, defaults to "GitHub MCP Server".
+	Title string
+
 	// GitHub Host to target for API requests (e.g. github.com or github.enterprise.com)
 	Host string
 
@@ -101,7 +109,7 @@ func NewMCPServer(ctx context.Context, cfg *MCPServerConfig, deps ToolDependenci
 		}
 	}
 
-	ghServer := NewServer(cfg.Version, serverOpts)
+	ghServer := NewServer(cfg.Version, cfg.Name, cfg.Title, serverOpts)
 
 	// Add middlewares. Order matters - for example, the error context middleware should be applied last so that it runs FIRST (closest to the handler) to ensure all errors are captured,
 	// and any middleware that needs to read or modify the context should be before it.
@@ -177,15 +185,22 @@ func addGitHubAPIErrorToContext(next mcp.MethodHandler) mcp.MethodHandler {
 }
 
 // NewServer creates a new GitHub MCP server with the specified GH client and logger.
-func NewServer(version string, opts *mcp.ServerOptions) *mcp.Server {
+func NewServer(version, name, title string, opts *mcp.ServerOptions) *mcp.Server {
 	if opts == nil {
 		opts = &mcp.ServerOptions{}
 	}
 
+	if name == "" {
+		name = "github-mcp-server"
+	}
+	if title == "" {
+		title = "GitHub MCP Server"
+	}
+
 	// Create a new MCP server
 	s := mcp.NewServer(&mcp.Implementation{
-		Name:    "github-mcp-server",
-		Title:   "GitHub MCP Server",
+		Name:    name,
+		Title:   title,
 		Version: version,
 		Icons:   octicons.Icons("mark-github"),
 	}, opts)

pkg/github/server_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/github/github-mcp-server/pkg/raw"
 	"github.com/github/github-mcp-server/pkg/translations"
 	gogithub "github.com/google/go-github/v82/github"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
 	"github.com/shurcooL/githubv4"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -150,7 +151,73 @@ func TestNewMCPServer_CreatesSuccessfully(t *testing.T) {
 	// is already tested in pkg/github/*_test.go.
 }
 
-// TestResolveEnabledToolsets verifies the toolset resolution logic.
+// TestNewServer_NameAndTitle verifies that the server name and title can be
+// overridden and fall back to sensible defaults when empty.
+func TestNewServer_NameAndTitle(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		name          string
+		serverName    string
+		serverTitle   string
+		expectedName  string
+		expectedTitle string
+	}{
+		{
+			name:          "defaults when empty",
+			serverName:    "",
+			serverTitle:   "",
+			expectedName:  "github-mcp-server",
+			expectedTitle: "GitHub MCP Server",
+		},
+		{
+			name:          "custom name and title",
+			serverName:    "my-github-server",
+			serverTitle:   "My GitHub MCP Server",
+			expectedName:  "my-github-server",
+			expectedTitle: "My GitHub MCP Server",
+		},
+		{
+			name:          "custom name only",
+			serverName:    "ghes-server",
+			serverTitle:   "",
+			expectedName:  "ghes-server",
+			expectedTitle: "GitHub MCP Server",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+
+			srv := NewServer("v1.0.0", tt.serverName, tt.serverTitle, nil)
+			require.NotNil(t, srv)
+
+			// Connect a client to retrieve the initialize result and verify ServerInfo.
+			st, ct := mcp.NewInMemoryTransports()
+			client := mcp.NewClient(&mcp.Implementation{Name: "test-client"}, nil)
+
+			var initResult *mcp.InitializeResult
+			go func() {
+				cs, err := client.Connect(context.Background(), ct, nil)
+				if err == nil {
+					initResult = cs.InitializeResult()
+				}
+			}()
+
+			_, err := srv.Connect(context.Background(), st, nil)
+			require.NoError(t, err)
+
+			// Give the goroutine time to complete
+			// (In-memory transport is synchronous, so this is safe)
+			require.Eventually(t, func() bool { return initResult != nil }, time.Second, 10*time.Millisecond)
+			require.NotNil(t, initResult.ServerInfo)
+			assert.Equal(t, tt.expectedName, initResult.ServerInfo.Name)
+			assert.Equal(t, tt.expectedTitle, initResult.ServerInfo.Title)
+		})
+	}
+}
+
 func TestResolveEnabledToolsets(t *testing.T) {
 	t.Parallel()
 

pkg/http/handler.go

@@ -201,6 +201,8 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	ghServer, err := h.githubMcpServerFactory(r, h.deps, invToUse, &github.MCPServerConfig{
 		Version:           h.config.Version,
+		Name:              h.config.Name,
+		Title:             h.config.Title,
 		Translator:        h.t,
 		ContentWindowSize: h.config.ContentWindowSize,
 		Logger:            h.logger,

pkg/http/server.go

@@ -31,6 +31,14 @@ type ServerConfig struct {
 	// Version of the server
 	Version string
 
+	// Name overrides the server name in the MCP initialization response.
+	// If empty, defaults to "github-mcp-server".
+	Name string
+
+	// Title overrides the server title in the MCP initialization response.
+	// If empty, defaults to "GitHub MCP Server".
+	Title string
+
 	// GitHub Host to target for API requests (e.g. github.com or github.enterprise.com)
 	Host string