Handle toolset filtering for Dynamic & with tools.

Author: omgitsads

internal/ghmcp/server.go

@@ -133,7 +133,7 @@ func NewStdioMCPServer(ctx context.Context, cfg github.MCPServerConfig) (*mcp.Se
 	inventoryBuilder := github.NewInventory(cfg.Translator).
 		WithDeprecatedAliases(github.DeprecatedToolAliases).
 		WithReadOnly(cfg.ReadOnly).
-		WithToolsets(cfg.EnabledToolsets).
+		WithToolsets(github.ResolvedEnabledToolsets(cfg.DynamicToolsets, cfg.EnabledToolsets, cfg.EnabledTools)).
 		WithTools(github.CleanTools(cfg.EnabledTools)).
 		WithServerInstructions().
 		WithFeatureChecker(featureChecker)

pkg/github/server.go

@@ -134,25 +134,23 @@ func registerDynamicTools(server *mcp.Server, inventory *inventory.Inventory, de
 	}
 }
 
-// resolveEnabledToolsets determines which toolsets should be enabled based on config.
+// ResolvedEnabledToolsets determines which toolsets should be enabled based on config.
 // Returns nil for "use defaults", empty slice for "none", or explicit list.
-func resolveEnabledToolsets(cfg *MCPServerConfig) []string {
-	enabledToolsets := cfg.EnabledToolsets
-
+func ResolvedEnabledToolsets(dynamicToolsets bool, enabledToolsets []string, enabledTools []string) []string {
 	// In dynamic mode, remove "all" and "default" since users enable toolsets on demand
-	if cfg.DynamicToolsets && enabledToolsets != nil {
+	if dynamicToolsets && enabledToolsets != nil {
 		enabledToolsets = RemoveToolset(enabledToolsets, string(ToolsetMetadataAll.ID))
 		enabledToolsets = RemoveToolset(enabledToolsets, string(ToolsetMetadataDefault.ID))
 	}
 
 	if enabledToolsets != nil {
 		return enabledToolsets
 	}
-	if cfg.DynamicToolsets {
+	if dynamicToolsets {
 		// Dynamic mode with no toolsets specified: start empty so users enable on demand
 		return []string{}
 	}
-	if len(cfg.EnabledTools) > 0 {
+	if len(enabledTools) > 0 {
 		// When specific tools are requested but no toolsets, don't use default toolsets
 		// This matches the original behavior: --tools=X alone registers only X
 		return []string{}

pkg/github/server_test.go

@@ -214,7 +214,7 @@ func TestResolveEnabledToolsets(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
-			result := resolveEnabledToolsets(&tc.cfg)
+			result := ResolvedEnabledToolsets(tc.cfg.DynamicToolsets, tc.cfg.EnabledToolsets, tc.cfg.EnabledTools)
 			assert.Equal(t, tc.expectedResult, result)
 		})
 	}

pkg/http/handler.go

@@ -199,12 +199,15 @@ func InventoryFiltersForRequest(r *http.Request, builder *inventory.Builder) *in
 		builder = builder.WithReadOnly(true)
 	}
 
-	if toolsets := ghcontext.GetToolsets(ctx); len(toolsets) > 0 {
-		builder = builder.WithToolsets(toolsets)
+	toolsets := ghcontext.GetToolsets(ctx)
+	tools := ghcontext.GetTools(ctx)
+
+	if len(toolsets) > 0 {
+		builder = builder.WithToolsets(github.ResolvedEnabledToolsets(false, toolsets, tools)) // No dynamic toolsets in HTTP mode
 	}
 
-	if tools := ghcontext.GetTools(ctx); len(tools) > 0 {
-		if len(ghcontext.GetToolsets(ctx)) == 0 {
+	if len(tools) > 0 {
+		if len(toolsets) == 0 {
 			builder = builder.WithToolsets([]string{})
 		}
 		builder = builder.WithTools(github.CleanTools(tools))