switch to chi group

Author: mattdholloway

pkg/http/handler.go

@@ -93,16 +93,11 @@ func NewHTTPMcpHandler(
 // RegisterRoutes registers the routes for the MCP server
 // URL-based values take precedence over header-based values
 func (h *Handler) RegisterRoutes(r chi.Router) {
-	mcpRouter := chi.NewRouter()
-	mcpRouter.Use(middleware.WithRequestConfig)
-
-	mcpRouter.Mount("/", h)
+	r.Mount("/", h)
 	// Mount readonly and toolset routes
-	mcpRouter.With(withToolset).Mount("/x/{toolset}", h)
-	mcpRouter.With(withReadonly, withToolset).Mount("/x/{toolset}/readonly", h)
-	mcpRouter.With(withReadonly).Mount("/readonly", h)
-
-	r.Mount("/", mcpRouter)
+	r.With(withToolset).Mount("/x/{toolset}", h)
+	r.With(withReadonly, withToolset).Mount("/x/{toolset}/readonly", h)
+	r.With(withReadonly).Mount("/readonly", h)
 }
 
 // withReadonly is middleware that sets readonly mode in the request context

pkg/http/handler_test.go

@@ -11,6 +11,7 @@ import (
 	ghcontext "github.com/github/github-mcp-server/pkg/context"
 	"github.com/github/github-mcp-server/pkg/github"
 	"github.com/github/github-mcp-server/pkg/http/headers"
+	"github.com/github/github-mcp-server/pkg/http/middleware"
 	"github.com/github/github-mcp-server/pkg/inventory"
 	"github.com/github/github-mcp-server/pkg/translations"
 	"github.com/go-chi/chi/v5"
@@ -262,6 +263,7 @@ func TestHTTPHandlerRoutes(t *testing.T) {
 
 			// Create router and register routes
 			r := chi.NewRouter()
+			r.Use(middleware.WithRequestConfig)
 			handler.RegisterRoutes(r)
 
 			// Create request

pkg/http/server.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/github/github-mcp-server/pkg/github"
+	"github.com/github/github-mcp-server/pkg/http/middleware"
 	"github.com/github/github-mcp-server/pkg/http/oauth"
 	"github.com/github/github-mcp-server/pkg/lockdown"
 	"github.com/github/github-mcp-server/pkg/translations"
@@ -113,11 +114,20 @@ func RunHTTPServer(cfg ServerConfig) error {
 	if err != nil {
 		return fmt.Errorf("failed to create OAuth handler: %w", err)
 	}
-	oauthHandler.RegisterRoutes(r)
-	logger.Info("OAuth protected resource endpoints registered", "baseURL", cfg.BaseURL)
 
 	handler := NewHTTPMcpHandler(ctx, &cfg, deps, t, logger, WithOAuthConfig(oauthCfg))
-	handler.RegisterRoutes(r)
+
+	// MCP routes with middleware
+	r.Group(func(r chi.Router) {
+		r.Use(middleware.WithRequestConfig)
+		handler.RegisterRoutes(r)
+	})
+
+	// OAuth routes without MCP middleware
+	r.Group(func(r chi.Router) {
+		oauthHandler.RegisterRoutes(r)
+	})
+	logger.Info("OAuth protected resource endpoints registered", "baseURL", cfg.BaseURL)
 
 	addr := fmt.Sprintf(":%d", cfg.Port)
 	httpSvr := http.Server{