feat: add hub persistence to config for CLI and Web UI

Hub sources are now saved in config.yaml (both global and project),
replacing the Web UI's localStorage-based approach. This allows CLI
and UI to share the same hub list.

- Add HubConfig/HubEntry types and helper methods (resolve, add, remove)
- Add CLI subcommands: hub add/list/remove/default
- Search --hub now resolves saved labels (e.g. --hub team)
- Add REST API endpoints for hub CRUD (GET/PUT/POST/DELETE /api/hub/saved)
- Migrate SearchPage from localStorage to server API calls
This commit is contained in:
Willie
2026-02-13 14:21:37 +08:00
parent af8eae9005
commit 0bd79a438e
17 changed files with 1409 additions and 55 deletions
+78 -6
View File
@@ -17,14 +17,82 @@ func cmdHub(args []string) error {
return nil
}
switch args[0] {
subcmd := args[0]
subargs := args[1:]
// For subcommands that support --project/--global, parse mode
switch subcmd {
case "index":
return cmdHubIndex(args[1:])
return cmdHubIndex(subargs)
case "add":
mode, rest, err := parseModeArgs(subargs)
if err != nil {
return err
}
cwd, err := os.Getwd()
if err != nil {
return fmt.Errorf("cannot determine working directory: %w", err)
}
if mode == modeAuto && projectConfigExists(cwd) {
mode = modeProject
} else if mode == modeAuto {
mode = modeGlobal
}
applyModeLabel(mode)
return cmdHubAdd(rest, mode, cwd)
case "list", "ls":
mode, _, err := parseModeArgs(subargs)
if err != nil {
return err
}
cwd, err := os.Getwd()
if err != nil {
return fmt.Errorf("cannot determine working directory: %w", err)
}
if mode == modeAuto && projectConfigExists(cwd) {
mode = modeProject
} else if mode == modeAuto {
mode = modeGlobal
}
applyModeLabel(mode)
return cmdHubList(mode, cwd)
case "remove", "rm":
mode, rest, err := parseModeArgs(subargs)
if err != nil {
return err
}
cwd, err := os.Getwd()
if err != nil {
return fmt.Errorf("cannot determine working directory: %w", err)
}
if mode == modeAuto && projectConfigExists(cwd) {
mode = modeProject
} else if mode == modeAuto {
mode = modeGlobal
}
applyModeLabel(mode)
return cmdHubRemove(rest, mode, cwd)
case "default":
mode, rest, err := parseModeArgs(subargs)
if err != nil {
return err
}
cwd, err := os.Getwd()
if err != nil {
return fmt.Errorf("cannot determine working directory: %w", err)
}
if mode == modeAuto && projectConfigExists(cwd) {
mode = modeProject
} else if mode == modeAuto {
mode = modeGlobal
}
applyModeLabel(mode)
return cmdHubDefault(rest, mode, cwd)
case "help", "-h", "--help":
printHubHelp()
return nil
default:
return fmt.Errorf("unknown hub subcommand: %s\nRun 'skillshare hub help' for usage", args[0])
return fmt.Errorf("unknown hub subcommand: %s\nRun 'skillshare hub help' for usage", subcmd)
}
}
@@ -161,11 +229,15 @@ func resolveSourcePath(mode runMode, cwd string) (string, error) {
func printHubHelp() {
fmt.Println(`Usage: skillshare hub <subcommand> [options]
Manage private skill hubs.
Manage skill hubs — saved hub sources for search.
Subcommands:
index Build an index.json from source skills
help Show this help
add <url> Save a hub source (--label to set name)
list List saved hubs (* marks default)
remove <label> Remove a saved hub
default [label] Show or set the default hub (--reset to clear)
index Build an index.json from source skills
help Show this help
Run 'skillshare hub <subcommand> --help' for details.`)
}
+283
View File
@@ -0,0 +1,283 @@
package main
import (
"fmt"
"net/url"
"path/filepath"
"strings"
"skillshare/internal/config"
"skillshare/internal/ui"
)
func cmdHubAdd(args []string, mode runMode, cwd string) error {
var hubURL string
var label string
i := 0
for i < len(args) {
arg := args[i]
key, val, hasEq := strings.Cut(arg, "=")
switch {
case key == "--label" || key == "-l":
if hasEq {
label = strings.TrimSpace(val)
} else if i+1 >= len(args) {
return fmt.Errorf("--label requires a value")
} else {
i++
label = strings.TrimSpace(args[i])
}
case key == "--help" || key == "-h":
printHubAddHelp()
return nil
case strings.HasPrefix(arg, "-"):
return fmt.Errorf("unknown option: %s", arg)
default:
if hubURL != "" {
return fmt.Errorf("unexpected argument: %s", arg)
}
hubURL = strings.TrimSpace(arg)
}
i++
}
if hubURL == "" {
return fmt.Errorf("usage: skillshare hub add <url> [--label name]")
}
// Derive label from URL if not provided
if label == "" {
label = deriveLabelFromURL(hubURL)
}
hubCfg, saveFn, err := loadHubConfigForWrite(mode, cwd)
if err != nil {
return err
}
if err := hubCfg.AddHub(config.HubEntry{Label: label, URL: hubURL}); err != nil {
return err
}
// First add auto-sets default
if len(hubCfg.Hubs) == 1 {
hubCfg.Default = label
}
if err := saveFn(*hubCfg); err != nil {
return err
}
ui.Success("Added hub %q → %s", label, hubURL)
if hubCfg.Default == label {
ui.Info("Set as default hub")
}
return nil
}
func cmdHubList(mode runMode, cwd string) error {
hubCfg, err := loadHubConfigForRead(mode, cwd)
if err != nil {
return err
}
if len(hubCfg.Hubs) == 0 {
ui.Info("No saved hubs. Use 'skillshare hub add <url>' to add one.")
return nil
}
for _, h := range hubCfg.Hubs {
marker := " "
if strings.EqualFold(h.Label, hubCfg.Default) {
marker = "* "
}
annotation := ""
if h.BuiltIn {
annotation = " (built-in)"
}
fmt.Printf("%s%-20s %s%s\n", marker, h.Label, h.URL, annotation)
}
return nil
}
func cmdHubRemove(args []string, mode runMode, cwd string) error {
if len(args) == 0 {
return fmt.Errorf("usage: skillshare hub remove <label>")
}
label := strings.TrimSpace(args[0])
hubCfg, saveFn, err := loadHubConfigForWrite(mode, cwd)
if err != nil {
return err
}
if err := hubCfg.RemoveHub(label); err != nil {
return err
}
if err := saveFn(*hubCfg); err != nil {
return err
}
ui.Success("Removed hub %q", label)
return nil
}
func cmdHubDefault(args []string, mode runMode, cwd string) error {
var reset bool
var label string
for _, arg := range args {
switch arg {
case "--reset":
reset = true
case "--help", "-h":
printHubDefaultHelp()
return nil
default:
if strings.HasPrefix(arg, "-") {
return fmt.Errorf("unknown option: %s", arg)
}
label = strings.TrimSpace(arg)
}
}
hubCfg, saveFn, err := loadHubConfigForWrite(mode, cwd)
if err != nil {
return err
}
// Show current default
if label == "" && !reset {
if hubCfg.Default == "" {
ui.Info("No default hub set (using community hub)")
} else {
url, ok := hubCfg.ResolveHub(hubCfg.Default)
if ok {
fmt.Printf("%s → %s\n", hubCfg.Default, url)
} else {
fmt.Printf("%s (label not found in hubs)\n", hubCfg.Default)
}
}
return nil
}
// Reset default
if reset {
hubCfg.Default = ""
if err := saveFn(*hubCfg); err != nil {
return err
}
ui.Success("Default hub cleared (using community hub)")
return nil
}
// Set default
if !hubCfg.HasHub(label) {
return fmt.Errorf("hub %q not found; run 'skillshare hub list' to see available hubs", label)
}
hubCfg.Default = label
if err := saveFn(*hubCfg); err != nil {
return err
}
ui.Success("Default hub set to %q", label)
return nil
}
// loadHubConfigForRead loads the HubConfig from the appropriate config.
func loadHubConfigForRead(mode runMode, cwd string) (*config.HubConfig, error) {
if mode == modeProject {
pcfg, err := config.LoadProject(cwd)
if err != nil {
return &config.HubConfig{}, nil // graceful fallback
}
return &pcfg.Hub, nil
}
cfg, err := config.Load()
if err != nil {
return &config.HubConfig{}, nil // graceful fallback
}
return &cfg.Hub, nil
}
// loadHubConfigForWrite loads the HubConfig and returns a save function.
func loadHubConfigForWrite(mode runMode, cwd string) (*config.HubConfig, func(config.HubConfig) error, error) {
if mode == modeProject {
pcfg, err := config.LoadProject(cwd)
if err != nil {
return nil, nil, fmt.Errorf("failed to load project config: %w", err)
}
saveFn := func(h config.HubConfig) error {
pcfg.Hub = h
return pcfg.Save(cwd)
}
return &pcfg.Hub, saveFn, nil
}
cfg, err := config.Load()
if err != nil {
return nil, nil, fmt.Errorf("failed to load config: %w", err)
}
saveFn := func(h config.HubConfig) error {
cfg.Hub = h
return cfg.Save()
}
return &cfg.Hub, saveFn, nil
}
// deriveLabelFromURL extracts a short label from a URL or path.
func deriveLabelFromURL(rawURL string) string {
// Try parsing as URL
if u, err := url.Parse(rawURL); err == nil && u.Host != "" {
// Use last meaningful path segment
p := strings.TrimSuffix(u.Path, "/")
base := filepath.Base(p)
base = strings.TrimSuffix(base, filepath.Ext(base))
if base != "" && base != "." {
return base
}
return u.Host
}
// File path: use filename without extension
base := filepath.Base(rawURL)
base = strings.TrimSuffix(base, filepath.Ext(base))
if base != "" && base != "." {
return base
}
return rawURL
}
func printHubAddHelp() {
fmt.Println(`Usage: skillshare hub add <url> [options]
Add a hub source to your saved hubs list.
Options:
--label, -l <name> Label for the hub (default: derived from URL)
--project, -p Use project mode
--global, -g Use global mode
--help, -h Show this help
Examples:
skillshare hub add https://internal.corp/skills/hub.json
skillshare hub add https://internal.corp/hub.json --label team
skillshare hub add ./skillshare-hub.json --label local`)
}
func printHubDefaultHelp() {
fmt.Println(`Usage: skillshare hub default [label] [options]
Show or set the default hub. When set, 'search --hub' uses this hub
instead of the community hub.
Options:
--reset Clear default (revert to community hub)
--project, -p Use project mode
--global, -g Use global mode
--help, -h Show this help
Examples:
skillshare hub default Show current default
skillshare hub default team Set default to "team"
skillshare hub default --reset Clear default`)
}
+1 -1
View File
@@ -180,7 +180,7 @@ func printUsage() {
// Utilities
fmt.Println("UTILITIES")
cmd("audit", "[name]", "Scan skills for security threats")
cmd("hub", "index", "Build index.json for private skill search")
cmd("hub", "<subcommand>", "Manage hubs (add, list, remove, default, index)")
cmd("log", "", "View operation log")
cmd("ui", "", "Launch web dashboard")
cmd("doctor", "", "Check environment and diagnose issues")
+83 -5
View File
@@ -45,7 +45,8 @@ func cmdSearch(args []string) error {
var query string
var jsonOutput bool
var listOnly bool
var indexURL string
var hubInput string // raw --hub value
var hubBare bool // --hub with no value
var limit int = 20
// Parse remaining arguments
@@ -60,12 +61,12 @@ func cmdSearch(args []string) error {
listOnly = true
case key == "--hub":
if hasEq {
indexURL = strings.TrimSpace(val)
hubInput = strings.TrimSpace(val)
} else if i+1 < len(rest) && !strings.HasPrefix(rest[i+1], "-") {
i++
indexURL = strings.TrimSpace(rest[i])
hubInput = strings.TrimSpace(rest[i])
} else {
indexURL = defaultHubURL
hubBare = true
}
case key == "--limit" || key == "-n":
if hasEq {
@@ -100,6 +101,16 @@ func cmdSearch(args []string) error {
i++
}
// Resolve --hub value to a URL
var indexURL string
if hubInput != "" || hubBare {
resolved, err := resolveHubURL(hubInput, hubBare, mode, cwd, defaultHubURL)
if err != nil {
return err
}
indexURL = resolved
}
// JSON mode: silent search, output JSON
if jsonOutput {
return searchJSON(query, limit, indexURL)
@@ -654,5 +665,72 @@ Examples:
skillshare search --hub Browse skillshare-hub
skillshare search react --hub Search "react" in skillshare-hub
skillshare search --hub ./skillshare-hub.json Custom local index
skillshare search react --hub https://internal.corp/skills/index.json`)
skillshare search react --hub https://internal.corp/skills/index.json
# Hub search with saved hubs
skillshare hub add https://internal.corp/hub.json --label team
skillshare search --hub team Search using saved hub label
skillshare hub default team
skillshare search --hub Uses default hub`)
}
// resolveHubURL resolves the --hub flag value to a URL.
// - bare=true, input="" → config default → fallback to defaultHubURL
// - input looks like URL/path → passthrough
// - otherwise → label lookup in config
func resolveHubURL(input string, bare bool, mode runMode, cwd, defaultHubURL string) (string, error) {
if bare && input == "" {
// --hub with no value: try config default, then community hub
hubCfg := loadHubConfig(mode, cwd)
url, err := hubCfg.DefaultHub()
if err != nil {
return "", err
}
if url != "" {
return url, nil
}
return defaultHubURL, nil
}
// Check if input looks like a URL or path
if looksLikeURLOrPath(input) {
return input, nil
}
// Try label lookup
hubCfg := loadHubConfig(mode, cwd)
url, ok := hubCfg.ResolveHub(input)
if !ok {
return "", fmt.Errorf("hub %q not found; run 'skillshare hub list' to see saved hubs", input)
}
return url, nil
}
// looksLikeURLOrPath returns true if the value appears to be a URL or file path
// rather than a hub label.
func looksLikeURLOrPath(v string) bool {
return strings.HasPrefix(v, "http://") ||
strings.HasPrefix(v, "https://") ||
strings.HasPrefix(v, "file://") ||
strings.HasPrefix(v, "/") ||
strings.HasPrefix(v, "./") ||
strings.HasPrefix(v, "../") ||
strings.HasPrefix(v, "~")
}
// loadHubConfig loads the HubConfig from the appropriate config, returning
// an empty HubConfig on error (graceful fallback).
func loadHubConfig(mode runMode, cwd string) config.HubConfig {
if mode == modeProject {
pcfg, err := config.LoadProject(cwd)
if err != nil {
return config.HubConfig{}
}
return pcfg.Hub
}
cfg, err := config.Load()
if err != nil {
return config.HubConfig{}
}
return cfg.Hub
}