add instructions step to inventory creation both in stdio and http server

Author: tommaso-moro

internal/ghmcp/server.go

@@ -124,7 +124,8 @@ func NewStdioMCPServer(cfg github.MCPServerConfig) (*mcp.Server, error) {
 		WithDeprecatedAliases(github.DeprecatedToolAliases).
 		WithReadOnly(cfg.ReadOnly).
 		WithToolsets(cfg.EnabledToolsets).
-		WithTools(github.CleanTools(cfg.EnabledTools))
+		WithTools(github.CleanTools(cfg.EnabledTools)).
+		WithServerInstructions()
 		// WithFeatureChecker(createFeatureChecker(cfg.EnabledFeatures))
 
 	// Apply token scope filtering if scopes are known (for PAT filtering)

pkg/github/server.go

@@ -71,18 +71,9 @@ type MCPServerConfig struct {
 type MCPServerOption func(*mcp.ServerOptions)
 
 func NewMCPServer(cfg *MCPServerConfig, deps ToolDependencies, inventory *inventory.Inventory) (*mcp.Server, error) {
-	enabledToolsets := resolveEnabledToolsets(cfg)
 
-	// For instruction generation, we need actual toolset names (not nil).
-	// nil means "use defaults" in inventory, so expand it for instructions.
-	instructionToolsets := enabledToolsets
-	if instructionToolsets == nil {
-		instructionToolsets = GetDefaultToolsetIDs()
-	}
-
-	// Create the MCP server
 	serverOpts := &mcp.ServerOptions{
-		Instructions:      GenerateInstructions(instructionToolsets),
+		Instructions:      inventory.Instructions(),
 		Logger:            cfg.Logger,
 		CompletionHandler: CompletionsHandler(deps.GetClient),
 	}

pkg/http/handler.go

@@ -125,6 +125,7 @@ func DefaultInventoryFactory(cfg *HTTPServerConfig, t translations.TranslationHe
 		}
 
 		b = InventoryFiltersForRequestHeaders(r, b)
+		b = b.WithServerInstructions()
 		return b.Build()
 	}
 }