Merge branch 'main' into actions-consolidation-backport

mattdholloway · web-flow · commit 90499085d44a · 2025-12-12T14:57:52.000Z
diff --git a/internal/ghmcp/server.go b/internal/ghmcp/server.go
@@ -100,9 +100,10 @@ func NewMCPServer(cfg MCPServerConfig) (*mcp.Server, error) {
 
 	enabledToolsets := cfg.EnabledToolsets
 
-	// If dynamic toolsets are enabled, remove "all" from the enabled toolsets
+	// If dynamic toolsets are enabled, remove "all" and "default" from the enabled toolsets
 	if cfg.DynamicToolsets {
 		enabledToolsets = github.RemoveToolset(enabledToolsets, github.ToolsetMetadataAll.ID)
+		enabledToolsets = github.RemoveToolset(enabledToolsets, github.ToolsetMetadataDefault.ID)
 	}
 
 	// Clean up the passed toolsets

Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,10 @@ func NewMCPServer(cfg MCPServerConfig) (*mcp.Server, error) {`
`100`	`100`
`101`	`101`	`enabledToolsets := cfg.EnabledToolsets`
`102`	`102`
`103`		`- // If dynamic toolsets are enabled, remove "all" from the enabled toolsets`
	`103`	`+ // If dynamic toolsets are enabled, remove "all" and "default" from the enabled toolsets`
`104`	`104`	`if cfg.DynamicToolsets {`
`105`	`105`	`enabledToolsets = github.RemoveToolset(enabledToolsets, github.ToolsetMetadataAll.ID)`
	`106`	`+ enabledToolsets = github.RemoveToolset(enabledToolsets, github.ToolsetMetadataDefault.ID)`
`106`	`107`	`}`
`107`	`108`
`108`	`109`	`// Clean up the passed toolsets`