Skip to content

Commit 54e0aff

Browse files
committed
Default to ignore unknown toolsets
1 parent b4391c0 commit 54e0aff

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

internal/ghmcp/server.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"github.com/github/github-mcp-server/pkg/github"
1818
mcplog "github.com/github/github-mcp-server/pkg/log"
1919
"github.com/github/github-mcp-server/pkg/raw"
20-
"github.com/github/github-mcp-server/pkg/toolsets"
2120
"github.com/github/github-mcp-server/pkg/translations"
2221
gogithub "github.com/google/go-github/v74/github"
2322
"github.com/mark3labs/mcp-go/mcp"
@@ -143,7 +142,7 @@ func NewMCPServer(cfg MCPServerConfig) (*server.MCPServer, error) {
143142

144143
// Create default toolsets
145144
tsg := github.DefaultToolsetGroup(cfg.ReadOnly, getClient, getGQLClient, getRawClient, cfg.Translator, cfg.ContentWindowSize)
146-
err = tsg.EnableToolsets(enabledToolsets, &toolsets.EnableToolsetsOptions{})
145+
err = tsg.EnableToolsets(enabledToolsets, nil)
147146

148147
if err != nil {
149148
return nil, fmt.Errorf("failed to enable toolsets: %w", err)

pkg/toolsets/toolsets.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ type EnableToolsetsOptions struct {
210210
func (tg *ToolsetGroup) EnableToolsets(names []string, options *EnableToolsetsOptions) error {
211211
if options == nil {
212212
options = &EnableToolsetsOptions{
213-
IgnoreUnknown: false,
213+
IgnoreUnknown: true,
214214
}
215215
}
216216

pkg/toolsets/toolsets_test.go

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,19 +148,26 @@ func TestEnableToolsets(t *testing.T) {
148148
}
149149

150150
// Test with non-existent toolset in the list
151-
err = tsg.EnableToolsets([]string{"toolset1", "non-existent"}, &EnableToolsetsOptions{})
151+
err = tsg.EnableToolsets([]string{"toolset1", "non-existent"}, nil)
152+
if err != nil {
153+
t.Errorf("Expected no error when ignoring unknown toolsets, got: %v", err)
154+
}
155+
156+
err = tsg.EnableToolsets([]string{"toolset1", "non-existent"}, &EnableToolsetsOptions{
157+
IgnoreUnknown: true,
158+
})
159+
if err != nil {
160+
t.Errorf("Expected no error when ignoring unknown toolsets, got: %v", err)
161+
}
162+
163+
err = tsg.EnableToolsets([]string{"toolset1", "non-existent"}, &EnableToolsetsOptions{IgnoreUnknown: false})
152164
if err == nil {
153165
t.Error("Expected error when enabling list with non-existent toolset")
154166
}
155167
if !errors.Is(err, NewToolsetDoesNotExistError("non-existent")) {
156168
t.Errorf("Expected ToolsetDoesNotExistError when enabling non-existent toolset, got: %v", err)
157169
}
158170

159-
err = tsg.EnableToolsets([]string{"toolset1", "non-existent"}, &EnableToolsetsOptions{IgnoreUnknown: true})
160-
if err != nil {
161-
t.Errorf("Expected no error when ignoring unknown toolsets, got: %v", err)
162-
}
163-
164171
// Test with empty list
165172
err = tsg.EnableToolsets([]string{}, &EnableToolsetsOptions{})
166173
if err != nil {

0 commit comments

Comments
 (0)