move resources to a toolset

SamMorrowDrums · SamMorrowDrums · commit 1969f25e90a3 · 2025-06-10T14:57:56.000+02:00
diff --git a/internal/ghmcp/server.go b/internal/ghmcp/server.go
@@ -120,8 +120,6 @@ func NewMCPServer(cfg MCPServerConfig) (*server.MCPServer, error) {
 		return nil, fmt.Errorf("failed to enable toolsets: %w", err)
 	}
 
-	github.RegisterResources(ghServer, getClient, cfg.Translator)
-
 	// Register the tools with the server
 	tsg.RegisterTools(ghServer)
 
diff --git a/pkg/github/resources.go b/pkg/github/resources.go
diff --git a/pkg/github/tools.go b/pkg/github/tools.go
@@ -38,6 +38,13 @@ func DefaultToolsetGroup(readOnly bool, getClient GetClientFn, getGQLClient GetG
 			toolsets.NewServerTool(CreateBranch(getClient, t)),
 			toolsets.NewServerTool(PushFiles(getClient, t)),
 			toolsets.NewServerTool(DeleteFile(getClient, t)),
+		).
+		AddResourceTemplates(
+			toolsets.NewServerResourceTemplate(GetRepositoryResourceContent(getClient, t)),
+			toolsets.NewServerResourceTemplate(GetRepositoryResourceBranchContent(getClient, t)),
+			toolsets.NewServerResourceTemplate(GetRepositoryResourceCommitContent(getClient, t)),
+			toolsets.NewServerResourceTemplate(GetRepositoryResourceTagContent(getClient, t)),
+			toolsets.NewServerResourceTemplate(GetRepositoryResourcePrContent(getClient, t)),
 		)
 	issues := toolsets.NewToolset("issues", "GitHub Issues related tools").
 		AddReadTools(
diff --git a/pkg/toolsets/toolsets.go b/pkg/toolsets/toolsets.go
@@ -33,13 +33,29 @@ func NewServerTool(tool mcp.Tool, handler server.ToolHandlerFunc) server.ServerT
 	return server.ServerTool{Tool: tool, Handler: handler}
 }
 
+func NewServerResourceTemplate(resourceTemplate mcp.ResourceTemplate, handler server.ResourceTemplateHandlerFunc) ServerResourceTemplate {
+	return ServerResourceTemplate{
+		resourceTemplate: resourceTemplate,
+		handler:          handler,
+	}
+}
+
+// ServerResource represents a resource that can be registered with the MCP server.
+type ServerResourceTemplate struct {
+	resourceTemplate mcp.ResourceTemplate
+	handler          server.ResourceTemplateHandlerFunc
+}
+
 type Toolset struct {
 	Name        string
 	Description string
 	Enabled     bool
 	readOnly    bool
 	writeTools  []server.ServerTool
 	readTools   []server.ServerTool
+	// resources are not tools, but the community seems to be moving towards namespaces as a broader concept
+	// and in order to have multiple servers running concurrently, we want to avoid overlapping resources too.
+	resourceTemplates []ServerResourceTemplate
 }
 
 func (t *Toolset) GetActiveTools() []server.ServerTool {
@@ -73,6 +89,31 @@ func (t *Toolset) RegisterTools(s *server.MCPServer) {
 	}
 }
 
+func (t *Toolset) AddResourceTemplates(templates ...ServerResourceTemplate) *Toolset {
+	t.resourceTemplates = append(t.resourceTemplates, templates...)
+	return t
+}
+
+func (t *Toolset) GetActiveResourceTemplates() []ServerResourceTemplate {
+	if !t.Enabled {
+		return nil
+	}
+	return t.resourceTemplates
+}
+
+func (t *Toolset) GetAvailableResourceTemplates() []ServerResourceTemplate {
+	return t.resourceTemplates
+}
+
+func (t *Toolset) RegisterResourcesTemplates(s *server.MCPServer) {
+	if !t.Enabled {
+		return
+	}
+	for _, resource := range t.resourceTemplates {
+		s.AddResourceTemplate(resource.resourceTemplate, resource.handler)
+	}
+}
+
 func (t *Toolset) SetReadOnly() {
 	// Set the toolset to read-only
 	t.readOnly = true

Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,6 @@ func NewMCPServer(cfg MCPServerConfig) (*server.MCPServer, error) {`
`120`	`120`	`return nil, fmt.Errorf("failed to enable toolsets: %w", err)`
`121`	`121`	`}`
`122`	`122`
`123`		`- github.RegisterResources(ghServer, getClient, cfg.Translator)`
`124`		`-`
`125`	`123`	`// Register the tools with the server`
`126`	`124`	`tsg.RegisterTools(ghServer)`
`127`	`125`