Add specific icons for each repository resource type

- repository_content: repo icon
- repository_content_branch: git-branch icon
- repository_content_commit: git-commit icon (new)
- repository_content_tag: tag icon
- repository_content_pr: git-pull-request icon

Resources now have explicit icons set rather than relying on toolset fallback.

Author: SamMorrowDrums

pkg/github/repository_resource.go

@@ -14,6 +14,7 @@ import (
 	"strings"
 
 	"github.com/github/github-mcp-server/pkg/inventory"
+	"github.com/github/github-mcp-server/pkg/octicons"
 	"github.com/github/github-mcp-server/pkg/raw"
 	"github.com/github/github-mcp-server/pkg/translations"
 	"github.com/google/go-github/v79/github"
@@ -37,6 +38,7 @@ func GetRepositoryResourceContent(t translations.TranslationHelperFunc) inventor
 			Name:        "repository_content",
 			URITemplate: repositoryResourceContentURITemplate.Raw(),
 			Description: t("RESOURCE_REPOSITORY_CONTENT_DESCRIPTION", "Repository Content"),
+			Icons:       octicons.Icons("repo"),
 		},
 		repositoryResourceContentsHandlerFunc(repositoryResourceContentURITemplate),
 	)
@@ -50,6 +52,7 @@ func GetRepositoryResourceBranchContent(t translations.TranslationHelperFunc) in
 			Name:        "repository_content_branch",
 			URITemplate: repositoryResourceBranchContentURITemplate.Raw(),
 			Description: t("RESOURCE_REPOSITORY_CONTENT_BRANCH_DESCRIPTION", "Repository Content for specific branch"),
+			Icons:       octicons.Icons("git-branch"),
 		},
 		repositoryResourceContentsHandlerFunc(repositoryResourceBranchContentURITemplate),
 	)
@@ -63,6 +66,7 @@ func GetRepositoryResourceCommitContent(t translations.TranslationHelperFunc) in
 			Name:        "repository_content_commit",
 			URITemplate: repositoryResourceCommitContentURITemplate.Raw(),
 			Description: t("RESOURCE_REPOSITORY_CONTENT_COMMIT_DESCRIPTION", "Repository Content for specific commit"),
+			Icons:       octicons.Icons("git-commit"),
 		},
 		repositoryResourceContentsHandlerFunc(repositoryResourceCommitContentURITemplate),
 	)
@@ -76,6 +80,7 @@ func GetRepositoryResourceTagContent(t translations.TranslationHelperFunc) inven
 			Name:        "repository_content_tag",
 			URITemplate: repositoryResourceTagContentURITemplate.Raw(),
 			Description: t("RESOURCE_REPOSITORY_CONTENT_TAG_DESCRIPTION", "Repository Content for specific tag"),
+			Icons:       octicons.Icons("tag"),
 		},
 		repositoryResourceContentsHandlerFunc(repositoryResourceTagContentURITemplate),
 	)
@@ -89,6 +94,7 @@ func GetRepositoryResourcePrContent(t translations.TranslationHelperFunc) invent
 			Name:        "repository_content_pr",
 			URITemplate: repositoryResourcePrContentURITemplate.Raw(),
 			Description: t("RESOURCE_REPOSITORY_CONTENT_PR_DESCRIPTION", "Repository Content for specific pull request"),
+			Icons:       octicons.Icons("git-pull-request"),
 		},
 		repositoryResourceContentsHandlerFunc(repositoryResourcePrContentURITemplate),
 	)

pkg/inventory/registry.go

@@ -178,17 +178,31 @@ func (r *Inventory) RegisterTools(ctx context.Context, s *mcp.Server, deps any)
 
 // RegisterResourceTemplates registers all available resource templates with the server.
 // The context is used for feature flag evaluation.
+// Icons are automatically applied from the toolset metadata if not already set.
 func (r *Inventory) RegisterResourceTemplates(ctx context.Context, s *mcp.Server, deps any) {
 	for _, res := range r.AvailableResourceTemplates(ctx) {
-		s.AddResourceTemplate(&res.Template, res.Handler(deps))
+		// Make a shallow copy to avoid mutating the original
+		templateCopy := res.Template
+		// Apply icons from toolset metadata if not already set
+		if len(templateCopy.Icons) == 0 {
+			templateCopy.Icons = res.Toolset.Icons()
+		}
+		s.AddResourceTemplate(&templateCopy, res.Handler(deps))
 	}
 }
 
 // RegisterPrompts registers all available prompts with the server.
 // The context is used for feature flag evaluation.
+// Icons are automatically applied from the toolset metadata if not already set.
 func (r *Inventory) RegisterPrompts(ctx context.Context, s *mcp.Server) {
 	for _, prompt := range r.AvailablePrompts(ctx) {
-		s.AddPrompt(&prompt.Prompt, prompt.Handler)
+		// Make a shallow copy to avoid mutating the original
+		promptCopy := prompt.Prompt
+		// Apply icons from toolset metadata if not already set
+		if len(promptCopy.Icons) == 0 {
+			promptCopy.Icons = prompt.Toolset.Icons()
+		}
+		s.AddPrompt(&promptCopy, prompt.Handler)
 	}
 }
 

pkg/octicons/icons/git-commit-dark.png

@@ -108,7 +108,7 @@ func TestEmbeddedIconsExist(t *testing.T) {
 	expectedIcons := []string{
 		"apps", "beaker", "bell", "check-circle", "codescan",
 		"comment-discussion", "copilot", "dependabot", "file", "git-branch",
-		"git-merge", "git-pull-request", "issue-opened", "logo-gist", "mark-github",
+		"git-commit", "git-merge", "git-pull-request", "issue-opened", "logo-gist", "mark-github",
 		"organization", "people", "person", "project", "repo", "repo-forked",
 		"shield", "shield-lock", "star", "star-fill", "tag", "tools", "workflow",
 	}

pkg/octicons/icons/git-commit-light.png

@@ -25,6 +25,7 @@ DEFAULT_ICONS=(
     dependabot
     file
     git-branch
+    git-commit
     git-merge
     git-pull-request
     issue-opened