Skip to content

feat: Add Octicon icons to MCP tools, resources, and prompts#1603

Merged
SamMorrowDrums merged 22 commits intomainfrom
SamMorrowDrums/add-icons-to-tools
Dec 17, 2025
Merged

feat: Add Octicon icons to MCP tools, resources, and prompts#1603
SamMorrowDrums merged 22 commits intomainfrom
SamMorrowDrums/add-icons-to-tools

Conversation

@SamMorrowDrums
Copy link
Collaborator

@SamMorrowDrums SamMorrowDrums commented Dec 13, 2025 •
edited
Loading

Summary

Adds Octicon icons to all MCP tools, resources, and prompts for better visual identification in MCP clients.

Changes

  • Upgrade MCP Go SDK to v1.2.0-pre.1 which includes the Icons field support
  • Add Icon field to ToolsetMetadata - each toolset can specify an Octicon name
  • Create pkg/octicons package - handles icon loading and data URI generation
  • Light/dark theme support - icons are provided in both themes for client compatibility
  • Automatic icon inheritance - tools/resources/prompts inherit icons from their toolset if not explicitly set
  • Custom icons for repository resources - different icons for files, commits, branches, etc.

Icon Assignment

Toolset Icon
context person
repos repo
git git-branch
issues issue-opened
pull_requests git-pull-request
users people
orgs organization
actions workflow
code_security codescan
secret_protection shield-lock
dependabot dependabot
notifications bell
experiments beaker
discussions comment-discussion
gists logo-gist
security_advisories shield
projects project
stargazers star
dynamic tools
labels tag

Testing

  • All existing tests pass
  • Added tests for octicons package
  • Verified icons display correctly in VS Code MCP client

Notes

  • Icons are embedded as base64 data URIs (PNG format) for maximum client compatibility
  • Uses 24px icons from Octicons with theme-appropriate colors (light icons for dark theme, dark for light)

@SamMorrowDrums SamMorrowDrums requested a review from a team as a code owner December 13, 2025 23:22
Copilot AI review requested due to automatic review settings December 13, 2025 23:22
Copilot AI reviewed Dec 13, 2025
View reviewed changes
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR adds Octicon icons to all MCP tools by upgrading the MCP Go SDK from v1.1.0 to v1.2.0-pre.1 and implementing icon infrastructure that automatically applies icons based on toolset metadata.

Key Changes

  • Upgraded MCP Go SDK to v1.2.0-pre.1 to enable Icons field support
  • Added icon infrastructure in pkg/toolsets/server_tool.go with automatic icon application during tool registration
  • Assigned appropriate Octicon icons to all 22 toolset metadata constants

Reviewed changes

Copilot reviewed 4 out of 5 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
go.mod Upgraded modelcontextprotocol/go-sdk from v1.1.0 to v1.2.0-pre.1
go.sum Updated checksums for SDK upgrade and new golang-jwt/jwt/v5 dependency
pkg/github/server.go Migrated from deprecated HasTools/HasResources/HasPrompts to new Capabilities API structure
pkg/toolsets/server_tool.go Added Icon field to ToolsetMetadata, OcticonURL helper, Icons() method, and automatic icon application in RegisterFunc
pkg/github/tools.go Assigned Octicon icon names to all 22 toolset metadata constants

bretthowell714-source
bretthowell714-source approved these changes Dec 14, 2025
View reviewed changes
Copy link

@bretthowell714-source bretthowell714-source left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you

@SamMorrowDrums SamMorrowDrums force-pushed the SamMorrowDrums/server-tool-refactor-toolsets branch 6 times, most recently from a536c15 to 6b6a874 Compare December 14, 2025 23:50
@SamMorrowDrums SamMorrowDrums force-pushed the SamMorrowDrums/add-icons-to-tools branch 5 times, most recently from 813b441 to 29583e1 Compare December 15, 2025 22:42
@SamMorrowDrums SamMorrowDrums changed the base branch from SamMorrowDrums/server-tool-refactor-toolsets to SamMorrowDrums/registry-builder-pattern December 15, 2025 22:42
Base automatically changed from SamMorrowDrums/registry-builder-pattern to SamMorrowDrums/server-tool-refactor-toolsets December 16, 2025 18:53
Base automatically changed from SamMorrowDrums/server-tool-refactor-toolsets to SamMorrowDrums/server-tool-refactor-projects December 16, 2025 19:01
Base automatically changed from SamMorrowDrums/server-tool-refactor-projects to SamMorrowDrums/server-tool-refactor-security-advisories December 16, 2025 19:02
Base automatically changed from SamMorrowDrums/server-tool-refactor-security-advisories to SamMorrowDrums/server-tool-refactor-discussions December 16, 2025 19:02
Base automatically changed from SamMorrowDrums/server-tool-refactor-discussions to SamMorrowDrums/server-tool-refactor-code-scanning December 16, 2025 19:02
Base automatically changed from SamMorrowDrums/server-tool-refactor-code-scanning to SamMorrowDrums/server-tool-refactor-git December 16, 2025 19:02
Base automatically changed from SamMorrowDrums/server-tool-refactor-git to SamMorrowDrums/server-tool-refactor-actions December 16, 2025 19:03
Base automatically changed from SamMorrowDrums/server-tool-refactor-actions to SamMorrowDrums/server-tool-refactor-pullrequests December 16, 2025 19:03
Base automatically changed from SamMorrowDrums/server-tool-refactor-pullrequests to SamMorrowDrums/server-tool-refactor-issues December 16, 2025 19:36
Base automatically changed from SamMorrowDrums/server-tool-refactor-issues to SamMorrowDrums/server-tool-refactor-repositories December 16, 2025 19:38
Base automatically changed from SamMorrowDrums/server-tool-refactor-repositories to SamMorrowDrums/server-tool-refactor-notifications December 16, 2025 20:32
@SamMorrowDrums SamMorrowDrums force-pushed the SamMorrowDrums/server-tool-refactor-notifications branch from 33662a0 to daee6b8 Compare December 16, 2025 20:44
@SamMorrowDrums
Upgrade MCP Go SDK to v1.2.0-pre.1 and add Octicon icons to tools
0164670 
- Upgrade MCP Go SDK from v1.1.0 to v1.2.0-pre.1 for Icon support
- Add Icon field to ToolsetMetadata for Octicon name assignment
- Add OcticonURL() helper to generate CDN URLs for Octicon SVGs
- Add Icons() method on ToolsetMetadata to generate MCP Icon objects
- Apply icons automatically in RegisterFunc when tool is registered
- Add icons to all 22 toolset metadata constants with appropriate Octicons
- Update server.go to use new Capabilities API (fixes deprecation warnings)

This demonstrates how the toolsets refactor makes adding new features simpler:
icons are defined once in ToolsetMetadata and automatically applied to all
tools in that toolset during registration.
@SamMorrowDrums
Update third-party licenses for SDK upgrade
c9d74c3
@SamMorrowDrums
Address review feedback: enum size validation, mutation fix, tests
b6bf6cc 
- Replace runtime size validation with compile-time enum type (Size with SizeSM=16, SizeLG=24)
- Fix RegisterFunc mutation by making shallow copy of tool before modifying Icons
- Add comprehensive tests for octicons package (URL, Icons, Size constants)
- Add toolsets tests for ToolsetMetadata.Icons(), RegisterFunc mutation prevention,
  and existing icon preservation
- Improve icon choices for better visual semantics:
  - actions: play → workflow (more specific to GitHub Actions)
  - secret_protection: key → shield-lock (better represents protection)
  - gists: code → logo-gist (dedicated gist icon exists)
@SamMorrowDrums
Add GitHub mark icon to server metadata
a89bf6e 
Add the mark-github octicon to the server's Implementation struct
so that MCP clients can display the GitHub logo for this server.
The icon is provided in both 16x16 and 24x24 SVG sizes.
@SamMorrowDrums
Fix rebase conflicts: use Registry methods and NullTranslationHelper
d750be6 
- Remove duplicate old toolsets functions (AvailableToolsets, GetValidToolsetIDs, GetDefaultToolsetIDs)
- Use Registry.AvailableToolsets() and Registry.HasToolset() instead
- Replace stubTranslator with translations.NullTranslationHelper
- Use new SDK Capabilities struct instead of deprecated HasTools/HasResources/HasPrompts
- Add icon-related tests to registry_test.go
@SamMorrowDrums
Use embedded data URIs for Octicon icons
83b24eb 
- Embed SVG icons using go:embed for offline use and faster loading
- Convert icons to base64 data URIs at runtime
- Fall back to CDN URL for non-embedded icons
- Add test to verify all toolset icons are properly embedded
- 44 SVG files (22 icons × 2 sizes) totaling ~27KB
@SamMorrowDrums
Convert icons from SVG to PNG for MCP client compatibility
4c3ab5a 
MCP clients don't support SVG data URIs, so convert all embedded icons
to PNG format using rsvg-convert.

Changes:
- Convert all 44 SVG icons to PNG format
- Add 8 new icons: copilot, git-merge, repo-forked, star-fill
- Update octicons.go to use PNG MIME type
- Add script/fetch-icons for easy icon management
- Update tests and toolsnaps for PNG format
@SamMorrowDrums
Add mark-github icon for server metadata
b0080e1
@SamMorrowDrums
Add light/dark theme icons for tools, resources, and prompts
20878ea 
- Switch from size-based (16/24px) to theme-based (light/dark) icons
- Use only 16x16 icons for smaller bundle size
- Generate white (inverted) icons for dark theme backgrounds
- Add icons to resources and prompts (auto-applied from toolset metadata)
- Add 'file' icon for repository content resources
- Update fetch-icons script to generate both theme variants
@SamMorrowDrums
Use 24px icons with SVG fill modification for themes
a8cc231 
- Switch from 16px to 24px icons for better visibility
- Use SVG fill attribute (#24292f for light, #ffffff for dark) instead
  of ImageMagick color inversion for cleaner theme variants
- Remove ImageMagick dependency from fetch-icons script
@SamMorrowDrums
Add specific icons for each repository resource type
163e134 
- 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.
@SamMorrowDrums SamMorrowDrums changed the title Add Octicon icons to MCP tools feat: Add Octicon icons to MCP tools, resources, and prompts Dec 17, 2025
@SamMorrowDrums SamMorrowDrums force-pushed the SamMorrowDrums/add-icons-to-tools branch from dafbd5c to 163e134 Compare December 17, 2025 09:19
@SamMorrowDrums
fix: restore Icon fields to toolset metadata and add icons to docs
c619997 
- Add Icon field to all ToolsetMetadata definitions (lost during rebase conflict resolution)
- Update doc generator to include Octicon icons in toolsets table
- Update doc generator to include icons in tool section headers
- Use Primer Octicons CDN for GitHub markdown compatibility
@SamMorrowDrums
feat: add icons to individual tools in documentation
6f1f609
@SamMorrowDrums
fix: use repo-local icons with picture element for GitHub theme support
8e2583b 
- Reference icons from pkg/octicons/icons/ instead of external CDN
- Use picture element with prefers-color-scheme for light/dark mode
- GitHub markdown renderer will display these correctly
@SamMorrowDrums
fix: remove redundant icons from individual tools
f4a8d47 
Icons are kept on section headers and toolsets table only - having the same
icon on every tool within a section was visually noisy and redundant.
@SamMorrowDrums
Add icons to remote server toolsets documentation
6e7948c
@SamMorrowDrums
Fix icon paths for docs/remote-server.md
3df07ae
@SamMorrowDrums
Add remote-only toolsets with auto-generated documentation and icons …
54fac00 
…guide

- Add ToolsetMetadataCopilot, ToolsetMetadataCopilotSpaces, ToolsetMetadataSupportSearch
- Add RemoteOnlyToolsets() function to return remote-only toolset metadata
- Update doc generator to auto-generate remote-only toolsets table with icons
- Create docs/toolsets-and-icons.md explaining how to add icons to toolsets
- Add link to icons guide in CONTRIBUTING.md
@SamMorrowDrums
Add icon validation tests and single source of truth for required icons
03d2f16 
- Add pkg/octicons/required_icons.txt as single source of truth for icons
- Add RequiredIcons() function to read the required icons list
- Update script/fetch-icons to read from required_icons.txt
- Update octicons_test.go to use RequiredIcons() instead of hardcoded list
- Add pkg/github/toolset_icons_test.go with:
  - TestAllToolsetIconsExist: validates all toolset icons are embedded
  - TestToolsetMetadataHasIcons: ensures all toolsets have icons set
- Add 'book' icon for SupportSearch toolset
- Update docs/toolsets-and-icons.md with fetch-icons and CI validation docs
@SamMorrowDrums
fix: remove unused icon parameter from writeToolDoc
cb1ccd4 
- Remove unused 'icon' parameter from writeToolDoc function signature
- Fix whitespace inconsistency in octicons_test.go
- Fixes lint failure: unused-parameter revive error
@SamMorrowDrums
fix: combine icon with name column in remote docs for proper table re…
238263b 
…ndering

- Move icon from separate column to Name column with <br> separator
- Keep <picture> element for light/dark theme support
- Remove empty icon column that was collapsing to zero width
- Remove unused octiconSimpleImg function
@SamMorrowDrums SamMorrowDrums merged commit 6b3c375 into main Dec 17, 2025
17 checks passed
@SamMorrowDrums SamMorrowDrums deleted the SamMorrowDrums/add-icons-to-tools branch December 17, 2025 16:31
@chrisbonilla95 chrisbonilla95 mentioned this pull request Dec 18, 2025
Closed
@BrewTestBot BrewTestBot mentioned this pull request Dec 18, 2025
Closed
@github-actions github-actions bot mentioned this pull request Dec 18, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@JoannaaKL JoannaaKL JoannaaKL approved these changes

+1 more reviewer

@bretthowell714-source bretthowell714-source bretthowell714-source approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@SamMorrowDrums @JoannaaKL @bretthowell714-source