From d750be66f4455af00a2d8c4f53b90ac2630e028a Mon Sep 17 00:00:00 2001
From: Sam Morrow <info@sam-morrow.com>
Date: Mon, 15 Dec 2025 23:27:05 +0100
Subject: [PATCH] Fix rebase conflicts: use Registry methods and
 NullTranslationHelper

- 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
---
 internal/ghmcp/server.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/internal/ghmcp/server.go b/internal/ghmcp/server.go
index 0b5e41e3..4842b2c6 100644
--- a/internal/ghmcp/server.go
+++ b/internal/ghmcp/server.go
@@ -179,9 +179,11 @@ func NewMCPServer(cfg MCPServerConfig) (*mcp.Server, error) {
 	// In dynamic mode, explicitly advertise capabilities since tools/resources/prompts
 	// may be enabled at runtime even if none are registered initially.
 	if cfg.DynamicToolsets {
-		serverOpts.HasTools = true
-		serverOpts.HasResources = true
-		serverOpts.HasPrompts = true
+		serverOpts.Capabilities = &mcp.ServerCapabilities{
+			Tools:     &mcp.ToolCapabilities{},
+			Resources: &mcp.ResourceCapabilities{},
+			Prompts:   &mcp.PromptCapabilities{},
+		}
 	}
 
 	ghServer := github.NewServer(cfg.Version, serverOpts)