Add skills methods to registry Provider interface

pkg/registry/provider.go

@@ -3,7 +3,10 @@
 
 package registry
 
-import types "github.com/stacklok/toolhive-core/registry/types"
+import (
+	types "github.com/stacklok/toolhive-core/registry/types"
+	"github.com/stacklok/toolhive/pkg/registry/api"
+)
 
 //go:generate mockgen -destination=mocks/mock_provider.go -package=mocks -source=provider.go Provider
 
@@ -30,4 +33,14 @@ type Provider interface {
 
 	// ListImageServers returns all available container servers
 	ListImageServers() ([]*types.ImageMetadata, error)
+
+	// Skills methods
+	// Providers that don't support skills (Local, Remote) return nil/empty results via BaseProvider.
+
+	// GetSkill returns a specific skill by namespace and name
+	GetSkill(namespace, name string) (*types.Skill, error)
+	// ListSkills returns all available skills
+	ListSkills(opts *api.SkillsListOptions) (*api.SkillsListResult, error)
+	// SearchSkills searches for skills matching the query
+	SearchSkills(query string) (*api.SkillsListResult, error)
 }

pkg/registry/provider_api.go

@@ -23,6 +23,7 @@ type APIRegistryProvider struct {
 	apiURL         string
 	allowPrivateIp bool
 	client         api.Client
+	skillsClient   api.SkillsClient
 }
 
 // NewAPIRegistryProvider creates a new API registry provider.
@@ -34,10 +35,17 @@ func NewAPIRegistryProvider(apiURL string, allowPrivateIp bool, tokenSource auth
 		return nil, fmt.Errorf("failed to create API client: %w", err)
 	}
 
+	// Create skills client
+	skillsClient, err := api.NewSkillsClient(apiURL, allowPrivateIp, tokenSource)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create skills client: %w", err)
+	}
+
 	p := &APIRegistryProvider{
 		apiURL:         apiURL,
 		allowPrivateIp: allowPrivateIp,
 		client:         client,
+		skillsClient:   skillsClient,
 	}
 
 	// Initialize the base provider with the GetRegistry function
@@ -188,6 +196,27 @@ func (p *APIRegistryProvider) GetImageServer(name string) (*types.ImageMetadata,
 	return nil, fmt.Errorf("server %s is not a container server", name)
 }
 
+// GetSkill returns a specific skill by namespace and name.
+func (p *APIRegistryProvider) GetSkill(namespace, name string) (*types.Skill, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	return p.skillsClient.GetSkill(ctx, namespace, name)
+}
+
+// ListSkills returns all available skills.
+func (p *APIRegistryProvider) ListSkills(opts *api.SkillsListOptions) (*api.SkillsListResult, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
+	defer cancel()
+	return p.skillsClient.ListSkills(ctx, opts)
+}
+
+// SearchSkills searches for skills matching the query.
+func (p *APIRegistryProvider) SearchSkills(query string) (*api.SkillsListResult, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	return p.skillsClient.SearchSkills(ctx, query)
+}
+
 // ConvertServerJSON converts an MCP Registry API ServerJSON to ToolHive ServerMetadata
 // Uses converters from converters.go (same package)
 // Note: Only handles OCI packages and remote servers, skips npm/pypi by design

pkg/registry/provider_base.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	types "github.com/stacklok/toolhive-core/registry/types"
+	"github.com/stacklok/toolhive/pkg/registry/api"
 )
 
 // BaseProvider provides common implementation for registry providers
@@ -131,6 +132,21 @@ func (p *BaseProvider) ListImageServers() ([]*types.ImageMetadata, error) {
 	return results, nil
 }
 
+// GetSkill returns nil for providers that don't support skills.
+func (*BaseProvider) GetSkill(_, _ string) (*types.Skill, error) {
+	return nil, nil
+}
+
+// ListSkills returns empty results for providers that don't support skills.
+func (*BaseProvider) ListSkills(_ *api.SkillsListOptions) (*api.SkillsListResult, error) {
+	return &api.SkillsListResult{}, nil
+}
+
+// SearchSkills returns empty results for providers that don't support skills.
+func (*BaseProvider) SearchSkills(_ string) (*api.SkillsListResult, error) {
+	return &api.SkillsListResult{}, nil
+}
+
 // matchesQuery checks if a server matches the search query
 func matchesQuery(name, description string, tags []string, query string) bool {
 	// Search in name

pkg/registry/provider_cached.go

@@ -30,6 +30,8 @@ const (
 // CachedAPIRegistryProvider wraps APIRegistryProvider with caching support.
 // Provides both in-memory and optional persistent file caching.
 // Works for both CLI (with persistent cache) and API server (memory only).
+// Skills methods (GetSkill, ListSkills, SearchSkills) are uncached pass-through
+// to the underlying APIRegistryProvider; skills caching may be added later.
 type CachedAPIRegistryProvider struct {
 	*APIRegistryProvider