diff --git a/cmd/skillshare/install_project.go b/cmd/skillshare/install_project.go index 24f28b815..c0c4fce18 100644 --- a/cmd/skillshare/install_project.go +++ b/cmd/skillshare/install_project.go @@ -76,10 +76,6 @@ func cmdInstallProjectParsed(parsed *installArgs, root string) (installLogSummar return summary, err } if !parsed.opts.DryRun { - freshStore, loadErr := install.LoadMetadata(runtime.sourcePath) - if loadErr == nil { - runtime.skillsStore = freshStore - } return summary, reconcileProjectRemoteSkills(runtime) } return summary, nil @@ -95,13 +91,6 @@ func cmdInstallProjectParsed(parsed *installArgs, root string) (installLogSummar return summary, nil } - // Reload metadata store: install may have written new entries via WriteMeta - // that the pre-install runtime doesn't know about. - freshStore, loadErr := install.LoadMetadata(runtime.sourcePath) - if loadErr == nil { - runtime.skillsStore = freshStore - } - return summary, reconcileProjectRemoteSkills(runtime) } diff --git a/cmd/skillshare/project_skills.go b/cmd/skillshare/project_skills.go index f1779af2b..bc5732b51 100644 --- a/cmd/skillshare/project_skills.go +++ b/cmd/skillshare/project_skills.go @@ -2,8 +2,15 @@ package main import ( "skillshare/internal/config" + "skillshare/internal/install" ) func reconcileProjectRemoteSkills(runtime *projectRuntime) error { + // Installs write .metadata.json directly, so the store loaded before the + // install is stale. Reconciling with it prunes config entries for skills it + // never saw (#280) — always reload from disk first. + if fresh, err := install.LoadMetadata(runtime.sourcePath); err == nil { + runtime.skillsStore = fresh + } return config.ReconcileProjectSkills(runtime.root, runtime.config, runtime.skillsStore, runtime.sourcePath) } diff --git a/tests/integration/install_project_test.go b/tests/integration/install_project_test.go index 6ebd94298..d4d03d469 100644 --- a/tests/integration/install_project_test.go +++ b/tests/integration/install_project_test.go @@ -5,6 +5,7 @@ package integration import ( "os" "path/filepath" + "strings" "testing" "skillshare/internal/install" @@ -178,3 +179,34 @@ func TestInstallProject_AuditThresholdShortFlag_BlocksHighFinding(t *testing.T) t.Error("project install should be blocked when -T high is set") } } + +// Regression for #280: config-driven `install -p` must not prune the skills: +// entries it just installed from config.yaml. Uses a subdir source so the +// skill is a plain copy (no .git) — the case the stale store cannot see. +func TestInstallProject_FromConfig_KeepsConfigSkills(t *testing.T) { + sb := testutil.NewSandbox(t) + defer sb.Cleanup() + projectRoot := sb.SetupProjectDir("claude") + + repoPath := filepath.Join(sb.Root, "cfg-src") + os.MkdirAll(filepath.Join(repoPath, "skills", "cfg-skill"), 0755) + os.WriteFile(filepath.Join(repoPath, "skills", "cfg-skill", "SKILL.md"), []byte("---\nname: cfg-skill\n---\n# Cfg"), 0644) + initGitRepo(t, repoPath) + + sb.WriteProjectConfig(projectRoot, `targets: + - claude +skills: + - name: cfg-skill + source: file://`+repoPath+`//skills/cfg-skill +`) + + sb.RunCLIInDir(projectRoot, "install", "-p").AssertSuccess(t) + + if !sb.FileExists(filepath.Join(projectRoot, ".skillshare", "skills", "cfg-skill", "SKILL.md")) { + t.Fatal("skill should be installed from config") + } + cfg := sb.ReadFile(filepath.Join(projectRoot, ".skillshare", "config.yaml")) + if !strings.Contains(cfg, "name: cfg-skill") { + t.Errorf("config.yaml lost the skills entry after install -p:\n%s", cfg) + } +}