Merge branch 'http-routes' of https://github.com/github/github-mcp-server into http-routes

Author: omgitsads

pkg/context/request.go

@@ -33,3 +33,19 @@ func GetToolsets(ctx context.Context) []string {
 	}
 	return nil
 }
+
+// toolsCtxKey is a context key for tools
+type toolsCtxKey struct{}
+
+// WithTools adds the tools to the context
+func WithTools(ctx context.Context, tools []string) context.Context {
+	return context.WithValue(ctx, toolsCtxKey{}, tools)
+}
+
+// GetTools retrieves the tools from the context
+func GetTools(ctx context.Context) []string {
+	if tools, ok := ctx.Value(toolsCtxKey{}).([]string); ok {
+		return tools
+	}
+	return nil
+}

pkg/http/handler.go

@@ -177,7 +177,7 @@ func InventoryFiltersForRequest(r *http.Request, builder *inventory.Builder) *in
 		builder = builder.WithToolsets(toolsets)
 	}
 
-	if tools := headers.ParseCommaSeparated(r.Header.Get(headers.MCPToolsHeader)); len(tools) > 0 {
+	if tools := ghcontext.GetTools(ctx); len(tools) > 0 {
 		if len(ghcontext.GetToolsets(ctx)) == 0 {
 			builder = builder.WithToolsets([]string{})
 		}

pkg/http/handler_test.go

@@ -7,7 +7,6 @@ import (
 	"testing"
 
 	ghcontext "github.com/github/github-mcp-server/pkg/context"
-	"github.com/github/github-mcp-server/pkg/http/headers"
 	"github.com/github/github-mcp-server/pkg/inventory"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 	"github.com/stretchr/testify/assert"
@@ -38,7 +37,6 @@ func TestInventoryFiltersForRequest(t *testing.T) {
 	tests := []struct {
 		name          string
 		contextSetup  func(context.Context) context.Context
-		headers       map[string]string
 		expectedTools []string
 	}{
 		{
@@ -61,22 +59,18 @@ func TestInventoryFiltersForRequest(t *testing.T) {
 			expectedTools: []string{"get_file_contents", "create_repository"},
 		},
 		{
-			name: "context toolset takes precedence over header",
+			name: "tools alone clears default toolsets",
 			contextSetup: func(ctx context.Context) context.Context {
-				return ghcontext.WithToolsets(ctx, []string{"repos"})
-			},
-			headers: map[string]string{
-				headers.MCPToolsetsHeader: "issues",
+				return ghcontext.WithTools(ctx, []string{"list_issues"})
 			},
-			expectedTools: []string{"get_file_contents", "create_repository"},
+			expectedTools: []string{"list_issues"},
 		},
 		{
 			name: "tools are additive with toolsets",
 			contextSetup: func(ctx context.Context) context.Context {
-				return ghcontext.WithToolsets(ctx, []string{"repos"})
-			},
-			headers: map[string]string{
-				headers.MCPToolsHeader: "list_issues",
+				ctx = ghcontext.WithToolsets(ctx, []string{"repos"})
+				ctx = ghcontext.WithTools(ctx, []string{"list_issues"})
+				return ctx
 			},
 			expectedTools: []string{"get_file_contents", "create_repository", "list_issues"},
 		},
@@ -85,9 +79,6 @@ func TestInventoryFiltersForRequest(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			req := httptest.NewRequest(http.MethodGet, "/", nil)
-			for k, v := range tt.headers {
-				req.Header.Set(k, v)
-			}
 			req = req.WithContext(tt.contextSetup(req.Context()))
 
 			builder := inventory.NewBuilder().

pkg/http/middleware/request_config.go

@@ -22,6 +22,10 @@ func WithRequestConfig(next http.Handler) http.Handler {
 			ctx = ghcontext.WithToolsets(ctx, toolsets)
 		}
 
+		if tools := headers.ParseCommaSeparated(r.Header.Get(headers.MCPToolsHeader)); len(tools) > 0 {
+			ctx = ghcontext.WithTools(ctx, tools)
+		}
+
 		next.ServeHTTP(w, r.WithContext(ctx))
 	})
 }