From 2cb6cc315943209f62dfd4c45b7eec5cb65683c0 Mon Sep 17 00:00:00 2001 From: Willie Date: Wed, 25 Feb 2026 05:33:48 +0800 Subject: [PATCH] refactor: update all callers to pass Registry to reconcile functions - install_context: read skills from Registry instead of Config - project_runtime: load Registry on init - install/search: pass Registry to ReconcileGlobalSkills - uninstall: load/save Registry for skill removal - server: hold registry field, reload on config refresh --- cmd/skillshare/install.go | 10 ++++- cmd/skillshare/install_context.go | 9 +++-- cmd/skillshare/install_handlers.go | 8 +++- cmd/skillshare/project_runtime.go | 7 ++++ cmd/skillshare/project_skills.go | 2 +- cmd/skillshare/search.go | 6 ++- cmd/skillshare/uninstall.go | 58 ++++++++++++++++------------- cmd/skillshare/uninstall_project.go | 21 ++++++----- internal/server/handler_install.go | 12 +++--- internal/server/server.go | 28 +++++++++++--- 10 files changed, 106 insertions(+), 55 deletions(-) diff --git a/cmd/skillshare/install.go b/cmd/skillshare/install.go index 0b7277c9d..739a21cd6 100644 --- a/cmd/skillshare/install.go +++ b/cmd/skillshare/install.go @@ -326,7 +326,10 @@ func cmdInstall(args []string) error { summary.Source = parsed.sourceArg } if err == nil && !parsed.opts.DryRun && len(summary.InstalledSkills) > 0 { - if rErr := config.ReconcileGlobalSkills(cfg); rErr != nil { + reg, regErr := config.LoadRegistry(filepath.Dir(config.ConfigPath())) + if regErr != nil { + ui.Warning("Failed to load registry: %v", regErr) + } else if rErr := config.ReconcileGlobalSkills(cfg, reg); rErr != nil { ui.Warning("Failed to reconcile global skills config: %v", rErr) } } @@ -342,7 +345,10 @@ func cmdInstall(args []string) error { summary.Source = parsed.sourceArg } if err == nil && !parsed.opts.DryRun && len(summary.InstalledSkills) > 0 { - if rErr := config.ReconcileGlobalSkills(cfg); rErr != nil { + reg, regErr := config.LoadRegistry(filepath.Dir(config.ConfigPath())) + if regErr != nil { + ui.Warning("Failed to load registry: %v", regErr) + } else if rErr := config.ReconcileGlobalSkills(cfg, reg); rErr != nil { ui.Warning("Failed to reconcile global skills config: %v", rErr) } } diff --git a/cmd/skillshare/install_context.go b/cmd/skillshare/install_context.go index c3346f3d6..b7801919a 100644 --- a/cmd/skillshare/install_context.go +++ b/cmd/skillshare/install_context.go @@ -35,13 +35,16 @@ func toSkillEntryDTOs(skills []config.SkillEntry) []install.SkillEntryDTO { // globalInstallContext implements install.InstallContext for global mode. type globalInstallContext struct { cfg *config.Config + reg *config.Registry } func (g *globalInstallContext) SourcePath() string { return g.cfg.Source } func (g *globalInstallContext) ConfigSkills() []install.SkillEntryDTO { - return toSkillEntryDTOs(g.cfg.Skills) + return toSkillEntryDTOs(g.reg.Skills) +} +func (g *globalInstallContext) Reconcile() error { + return config.ReconcileGlobalSkills(g.cfg, g.reg) } -func (g *globalInstallContext) Reconcile() error { return config.ReconcileGlobalSkills(g.cfg) } func (g *globalInstallContext) PostInstallSkill(string) error { return nil } func (g *globalInstallContext) Mode() string { return "global" } @@ -56,7 +59,7 @@ type projectInstallContext struct { func (p *projectInstallContext) SourcePath() string { return p.runtime.sourcePath } func (p *projectInstallContext) ConfigSkills() []install.SkillEntryDTO { - return toSkillEntryDTOs(p.runtime.config.Skills) + return toSkillEntryDTOs(p.runtime.registry.Skills) } func (p *projectInstallContext) Reconcile() error { return reconcileProjectRemoteSkills(p.runtime) diff --git a/cmd/skillshare/install_handlers.go b/cmd/skillshare/install_handlers.go index 7bcc7a183..a13be323b 100644 --- a/cmd/skillshare/install_handlers.go +++ b/cmd/skillshare/install_handlers.go @@ -760,10 +760,14 @@ func installFromGlobalConfig(cfg *config.Config, opts install.InstallOptions) (i AuditVerbose: opts.AuditVerbose, } - ctx := &globalInstallContext{cfg: cfg} + reg, regErr := config.LoadRegistry(filepath.Dir(config.ConfigPath())) + if regErr != nil { + return summary, fmt.Errorf("failed to load registry: %w", regErr) + } + ctx := &globalInstallContext{cfg: cfg, reg: reg} if len(ctx.ConfigSkills()) == 0 { - ui.Info("No remote skills defined in config.yaml") + ui.Info("No remote skills defined in registry") ui.Info("Install a skill first: skillshare install ") return summary, nil } diff --git a/cmd/skillshare/project_runtime.go b/cmd/skillshare/project_runtime.go index 60736059d..c00f666ec 100644 --- a/cmd/skillshare/project_runtime.go +++ b/cmd/skillshare/project_runtime.go @@ -9,6 +9,7 @@ import ( type projectRuntime struct { root string config *config.ProjectConfig + registry *config.Registry sourcePath string targets map[string]config.TargetConfig } @@ -24,9 +25,15 @@ func loadProjectRuntime(root string) (*projectRuntime, error) { return nil, err } + reg, err := config.LoadRegistry(filepath.Join(root, ".skillshare")) + if err != nil { + return nil, err + } + return &projectRuntime{ root: root, config: cfg, + registry: reg, sourcePath: filepath.Join(root, ".skillshare", "skills"), targets: targets, }, nil diff --git a/cmd/skillshare/project_skills.go b/cmd/skillshare/project_skills.go index 550dd6010..1a563c2dc 100644 --- a/cmd/skillshare/project_skills.go +++ b/cmd/skillshare/project_skills.go @@ -5,5 +5,5 @@ import ( ) func reconcileProjectRemoteSkills(runtime *projectRuntime) error { - return config.ReconcileProjectSkills(runtime.root, runtime.config, runtime.sourcePath) + return config.ReconcileProjectSkills(runtime.root, runtime.config, runtime.registry, runtime.sourcePath) } diff --git a/cmd/skillshare/search.go b/cmd/skillshare/search.go index aa38c551f..f36d9ced0 100644 --- a/cmd/skillshare/search.go +++ b/cmd/skillshare/search.go @@ -578,7 +578,11 @@ func installFromSearchResult(result search.SearchResult, cfg *config.Config) (er logSummary.InstalledSkills = []string{result.Name} // Reconcile global config with installed skills - if rErr := config.ReconcileGlobalSkills(cfg); rErr != nil { + reg, _ := config.LoadRegistry(filepath.Dir(config.ConfigPath())) + if reg == nil { + reg = &config.Registry{} + } + if rErr := config.ReconcileGlobalSkills(cfg, reg); rErr != nil { ui.Warning("Failed to reconcile global skills config: %v", rErr) } diff --git a/cmd/skillshare/uninstall.go b/cmd/skillshare/uninstall.go index 3f7b420e2..d61e3d9b2 100644 --- a/cmd/skillshare/uninstall.go +++ b/cmd/skillshare/uninstall.go @@ -786,35 +786,41 @@ func cmdUninstall(args []string) error { } // --- Phase 7: FINALIZE --- - // Batch-remove succeeded skills from config - if len(succeeded) > 0 && len(cfg.Skills) > 0 { - removedNames := map[string]bool{} - for _, t := range succeeded { - removedNames[t.name] = true - } - updated := make([]config.SkillEntry, 0, len(cfg.Skills)) - for _, s := range cfg.Skills { - fullName := s.FullName() - if removedNames[fullName] { - continue + // Batch-remove succeeded skills from registry + if len(succeeded) > 0 { + regDir := filepath.Dir(config.ConfigPath()) + reg, regErr := config.LoadRegistry(regDir) + if regErr != nil { + ui.Warning("Failed to load registry: %v", regErr) + } else if len(reg.Skills) > 0 { + removedNames := map[string]bool{} + for _, t := range succeeded { + removedNames[t.name] = true } - // When a group directory is uninstalled, also remove its member skills - memberOfRemoved := false - for name := range removedNames { - if strings.HasPrefix(fullName, name+"/") { - memberOfRemoved = true - break + updated := make([]config.SkillEntry, 0, len(reg.Skills)) + for _, s := range reg.Skills { + fullName := s.FullName() + if removedNames[fullName] { + continue } + // When a group directory is uninstalled, also remove its member skills + memberOfRemoved := false + for name := range removedNames { + if strings.HasPrefix(fullName, name+"/") { + memberOfRemoved = true + break + } + } + if memberOfRemoved { + continue + } + updated = append(updated, s) } - if memberOfRemoved { - continue - } - updated = append(updated, s) - } - if len(updated) != len(cfg.Skills) { - cfg.Skills = updated - if saveErr := cfg.Save(); saveErr != nil { - ui.Warning("Failed to update config after uninstall: %v", saveErr) + if len(updated) != len(reg.Skills) { + reg.Skills = updated + if saveErr := reg.Save(regDir); saveErr != nil { + ui.Warning("Failed to update registry after uninstall: %v", saveErr) + } } } } diff --git a/cmd/skillshare/uninstall_project.go b/cmd/skillshare/uninstall_project.go index 4b9ce2125..1381ef03c 100644 --- a/cmd/skillshare/uninstall_project.go +++ b/cmd/skillshare/uninstall_project.go @@ -384,16 +384,17 @@ func cmdUninstallProject(args []string, root string) error { // --- Phase 7: FINALIZE --- if len(succeeded) > 0 { - cfg, err := config.LoadProject(root) - if err != nil { - ui.Warning("Failed to load project config: %v", err) - } else { + regDir := filepath.Join(root, ".skillshare") + reg, regErr := config.LoadRegistry(regDir) + if regErr != nil { + ui.Warning("Failed to load registry: %v", regErr) + } else if len(reg.Skills) > 0 { removedNames := map[string]bool{} for _, t := range succeeded { removedNames[t.name] = true } - updated := make([]config.SkillEntry, 0, len(cfg.Skills)) - for _, s := range cfg.Skills { + updated := make([]config.SkillEntry, 0, len(reg.Skills)) + for _, s := range reg.Skills { fullName := s.FullName() if removedNames[fullName] { continue @@ -411,9 +412,11 @@ func cmdUninstallProject(args []string, root string) error { } updated = append(updated, s) } - cfg.Skills = updated - if err := cfg.Save(root); err != nil { - ui.Warning("Failed to update project config: %v", err) + if len(updated) != len(reg.Skills) { + reg.Skills = updated + if saveErr := reg.Save(regDir); saveErr != nil { + ui.Warning("Failed to update registry after uninstall: %v", saveErr) + } } } } diff --git a/internal/server/handler_install.go b/internal/server/handler_install.go index 8dedce3d5..4d2c1ebf0 100644 --- a/internal/server/handler_install.go +++ b/internal/server/handler_install.go @@ -193,11 +193,11 @@ func (s *Server) handleInstallBatch(w http.ResponseWriter, r *http.Request) { // Reconcile config after install if installed > 0 { if s.IsProjectMode() { - if rErr := config.ReconcileProjectSkills(s.projectRoot, s.projectCfg, s.cfg.Source); rErr != nil { + if rErr := config.ReconcileProjectSkills(s.projectRoot, s.projectCfg, s.registry, s.cfg.Source); rErr != nil { log.Printf("warning: failed to reconcile project skills config: %v", rErr) } } else { - if rErr := config.ReconcileGlobalSkills(s.cfg); rErr != nil { + if rErr := config.ReconcileGlobalSkills(s.cfg, s.registry); rErr != nil { log.Printf("warning: failed to reconcile global skills config: %v", rErr) } } @@ -277,11 +277,11 @@ func (s *Server) handleInstall(w http.ResponseWriter, r *http.Request) { } // Reconcile config after tracked repo install if s.IsProjectMode() { - if rErr := config.ReconcileProjectSkills(s.projectRoot, s.projectCfg, s.cfg.Source); rErr != nil { + if rErr := config.ReconcileProjectSkills(s.projectRoot, s.projectCfg, s.registry, s.cfg.Source); rErr != nil { log.Printf("warning: failed to reconcile project skills config: %v", rErr) } } else { - if rErr := config.ReconcileGlobalSkills(s.cfg); rErr != nil { + if rErr := config.ReconcileGlobalSkills(s.cfg, s.registry); rErr != nil { log.Printf("warning: failed to reconcile global skills config: %v", rErr) } } @@ -352,11 +352,11 @@ func (s *Server) handleInstall(w http.ResponseWriter, r *http.Request) { // Reconcile config after single install if s.IsProjectMode() { - if rErr := config.ReconcileProjectSkills(s.projectRoot, s.projectCfg, s.cfg.Source); rErr != nil { + if rErr := config.ReconcileProjectSkills(s.projectRoot, s.projectCfg, s.registry, s.cfg.Source); rErr != nil { log.Printf("warning: failed to reconcile project skills config: %v", rErr) } } else { - if rErr := config.ReconcileGlobalSkills(s.cfg); rErr != nil { + if rErr := config.ReconcileGlobalSkills(s.cfg, s.registry); rErr != nil { log.Printf("warning: failed to reconcile global skills config: %v", rErr) } } diff --git a/internal/server/server.go b/internal/server/server.go index eb8d513a4..dcc5561ff 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -7,6 +7,7 @@ import ( "net/http" "os" "os/signal" + "path/filepath" "strings" "sync" "syscall" @@ -18,11 +19,12 @@ import ( // Server holds the HTTP server state type Server struct { - cfg *config.Config - addr string - mux *http.ServeMux - handler http.Handler - mu sync.Mutex // protects write operations and config reloads + cfg *config.Config + registry *config.Registry + addr string + mux *http.ServeMux + handler http.Handler + mu sync.Mutex // protects write operations and config reloads startTime time.Time // for uptime reporting in health check @@ -42,8 +44,13 @@ type Server struct { // New creates a new Server for global mode. // uiDistDir, when non-empty, serves UI from disk instead of the embedded SPA. func New(cfg *config.Config, addr, uiDistDir string) *Server { + reg, _ := config.LoadRegistry(filepath.Dir(config.ConfigPath())) + if reg == nil { + reg = &config.Registry{} + } s := &Server{ cfg: cfg, + registry: reg, addr: addr, mux: http.NewServeMux(), uiDistDir: uiDistDir, @@ -56,8 +63,13 @@ func New(cfg *config.Config, addr, uiDistDir string) *Server { // NewProject creates a new Server for project mode. // uiDistDir, when non-empty, serves UI from disk instead of the embedded SPA. func NewProject(cfg *config.Config, projectCfg *config.ProjectConfig, projectRoot, addr, uiDistDir string) *Server { + reg, _ := config.LoadRegistry(filepath.Join(projectRoot, ".skillshare")) + if reg == nil { + reg = &config.Registry{} + } s := &Server{ cfg: cfg, + registry: reg, addr: addr, mux: http.NewServeMux(), projectRoot: projectRoot, @@ -103,6 +115,9 @@ func (s *Server) reloadConfig() error { return err } s.cfg.Targets = targets + if reg, err := config.LoadRegistry(filepath.Join(s.projectRoot, ".skillshare")); err == nil { + s.registry = reg + } return nil } newCfg, err := config.Load() @@ -110,6 +125,9 @@ func (s *Server) reloadConfig() error { return err } s.cfg = newCfg + if reg, err := config.LoadRegistry(filepath.Dir(config.ConfigPath())); err == nil { + s.registry = reg + } return nil }