Move ForMCPRequest call to HTTP handler & explicitly set capabilities

Author: omgitsads

pkg/github/server.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 	"time"
 
-	ghcontext "github.com/github/github-mcp-server/pkg/context"
 	gherrors "github.com/github/github-mcp-server/pkg/errors"
 	"github.com/github/github-mcp-server/pkg/inventory"
 	"github.com/github/github-mcp-server/pkg/octicons"
@@ -107,21 +106,16 @@ func NewMCPServer(ctx context.Context, cfg *MCPServerConfig, deps ToolDependenci
 		cfg.Logger.Warn("Warning: unrecognized toolsets ignored", "toolsets", strings.Join(unrecognized, ", "))
 	}
 
-	invToUse := inv
-	if methodInfo, ok := ghcontext.MCPMethod(ctx); ok && methodInfo != nil {
-		invToUse = inv.ForMCPRequest(methodInfo.Method, methodInfo.ItemName)
-	}
-
 	// Register GitHub tools/resources/prompts from the inventory.
 	// In dynamic mode with no explicit toolsets, this is a no-op since enabledToolsets
 	// is empty - users enable toolsets at runtime via the dynamic tools below (but can
 	// enable toolsets or tools explicitly that do need registration).
-	invToUse.RegisterAll(ctx, ghServer, deps)
+	inv.RegisterAll(ctx, ghServer, deps)
 
 	// Register dynamic toolset management tools (enable/disable) - these are separate
 	// meta-tools that control the inventory, not part of the inventory itself
 	if cfg.DynamicToolsets {
-		registerDynamicTools(ghServer, invToUse, deps, cfg.Translator)
+		registerDynamicTools(ghServer, inv, deps, cfg.Translator)
 	}
 
 	return ghServer, nil

pkg/http/handler.go

@@ -169,22 +169,38 @@ func withInsiders(next http.Handler) http.Handler {
 }
 
 func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	inventory, err := h.inventoryFactoryFunc(r)
+	inv, err := h.inventoryFactoryFunc(r)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
-	ghServer, err := h.githubMcpServerFactory(r, h.deps, inventory, &github.MCPServerConfig{
+	invToUse := inv
+	if methodInfo, ok := ghcontext.MCPMethod(r.Context()); ok && methodInfo != nil {
+		invToUse = inv.ForMCPRequest(methodInfo.Method, methodInfo.ItemName)
+	}
+
+	ghServer, err := h.githubMcpServerFactory(r, h.deps, invToUse, &github.MCPServerConfig{
 		Version:           h.config.Version,
 		Translator:        h.t,
 		ContentWindowSize: h.config.ContentWindowSize,
 		Logger:            h.logger,
 		RepoAccessTTL:     h.config.RepoAccessCacheTTL,
+		// Explicitly set empty capabilities. inv.ForMCPRequest currently returns nothing for Initialize.
+		ServerOptions: []github.MCPServerOption{
+			func(so *mcp.ServerOptions) {
+				so.Capabilities = &mcp.ServerCapabilities{
+					Tools:     &mcp.ToolCapabilities{},
+					Resources: &mcp.ResourceCapabilities{},
+					Prompts:   &mcp.PromptCapabilities{},
+				}
+			},
+		},
 	})
 
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
+		return
 	}
 
 	mcpHandler := mcp.NewStreamableHTTPHandler(func(_ *http.Request) *mcp.Server {