fix(skills): use registry-backed search for skills discovery
Signed-off-by: dwizzle204 <25712917+dwizzle204@users.noreply.github.com>
This commit is contained in:
parent
9c9524f934
commit
78a6d9426e
4 changed files with 36 additions and 28 deletions
|
|
@ -71,7 +71,7 @@ func NewSkillsCommand() *cobra.Command {
|
||||||
newInstallBuiltinCommand(workspaceFn),
|
newInstallBuiltinCommand(workspaceFn),
|
||||||
newListBuiltinCommand(),
|
newListBuiltinCommand(),
|
||||||
newRemoveCommand(installerFn),
|
newRemoveCommand(installerFn),
|
||||||
newSearchCommand(installerFn),
|
newSearchCommand(),
|
||||||
newShowCommand(loaderFn),
|
newShowCommand(loaderFn),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -215,34 +215,43 @@ func skillsListBuiltinCmd() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func skillsSearchCmd(installer *skills.SkillInstaller) {
|
func skillsSearchCmd(query string) {
|
||||||
fmt.Println("Searching for available skills...")
|
fmt.Println("Searching for available skills...")
|
||||||
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
cfg, err := internal.LoadConfig()
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
availableSkills, err := installer.ListAvailableSkills(ctx)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("✗ Failed to fetch skills list: %v\n", err)
|
fmt.Printf("✗ Failed to fetch skills list: %v\n", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(availableSkills) == 0 {
|
registryMgr := skills.NewRegistryManagerFromConfig(skills.RegistryConfig{
|
||||||
|
MaxConcurrentSearches: cfg.Tools.Skills.MaxConcurrentSearches,
|
||||||
|
ClawHub: skills.ClawHubConfig(cfg.Tools.Skills.Registries.ClawHub),
|
||||||
|
})
|
||||||
|
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
results, err := registryMgr.SearchAll(ctx, query, 20)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("✗ Failed to fetch skills list: %v\n", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(results) == 0 {
|
||||||
fmt.Println("No skills available.")
|
fmt.Println("No skills available.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Printf("\nAvailable Skills (%d):\n", len(availableSkills))
|
fmt.Printf("\nAvailable Skills (%d):\n", len(results))
|
||||||
fmt.Println("--------------------")
|
fmt.Println("--------------------")
|
||||||
for _, skill := range availableSkills {
|
for _, result := range results {
|
||||||
fmt.Printf(" 📦 %s\n", skill.Name)
|
fmt.Printf(" 📦 %s\n", result.DisplayName)
|
||||||
fmt.Printf(" %s\n", skill.Description)
|
fmt.Printf(" %s\n", result.Summary)
|
||||||
fmt.Printf(" Repo: %s\n", skill.Repository)
|
fmt.Printf(" Slug: %s\n", result.Slug)
|
||||||
if skill.Author != "" {
|
fmt.Printf(" Registry: %s\n", result.RegistryName)
|
||||||
fmt.Printf(" Author: %s\n", skill.Author)
|
if result.Version != "" {
|
||||||
}
|
fmt.Printf(" Version: %s\n", result.Version)
|
||||||
if len(skill.Tags) > 0 {
|
|
||||||
fmt.Printf(" Tags: %v\n", skill.Tags)
|
|
||||||
}
|
}
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,20 +2,19 @@ package skills
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
"github.com/sipeed/picoclaw/pkg/skills"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func newSearchCommand(installerFn func() (*skills.SkillInstaller, error)) *cobra.Command {
|
func newSearchCommand() *cobra.Command {
|
||||||
cmd := &cobra.Command{
|
cmd := &cobra.Command{
|
||||||
Use: "search",
|
Use: "search [query]",
|
||||||
Short: "Search available skills",
|
Short: "Search available skills",
|
||||||
RunE: func(_ *cobra.Command, _ []string) error {
|
Args: cobra.MaximumNArgs(1),
|
||||||
installer, err := installerFn()
|
RunE: func(_ *cobra.Command, args []string) error {
|
||||||
if err != nil {
|
query := ""
|
||||||
return err
|
if len(args) == 1 {
|
||||||
|
query = args[0]
|
||||||
}
|
}
|
||||||
skillsSearchCmd(installer)
|
skillsSearchCmd(query)
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,11 +8,11 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestNewSearchSubcommand(t *testing.T) {
|
func TestNewSearchSubcommand(t *testing.T) {
|
||||||
cmd := newSearchCommand(nil)
|
cmd := newSearchCommand()
|
||||||
|
|
||||||
require.NotNil(t, cmd)
|
require.NotNil(t, cmd)
|
||||||
|
|
||||||
assert.Equal(t, "search", cmd.Use)
|
assert.Equal(t, "search [query]", cmd.Use)
|
||||||
assert.Equal(t, "Search available skills", cmd.Short)
|
assert.Equal(t, "Search available skills", cmd.Short)
|
||||||
|
|
||||||
assert.Nil(t, cmd.Run)
|
assert.Nil(t, cmd.Run)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue