From 90c096b8e9405cd992f48d8bdb3858eeed17d1d5 Mon Sep 17 00:00:00 2001 From: Willie Date: Mon, 16 Mar 2026 16:40:58 +0800 Subject: [PATCH] fix(project): add trash/ to .skillshare/.gitignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Project mode uninstall moves skills to .skillshare/trash/, but this directory was not gitignored — soft-deleted skills could be accidentally committed. - ensureProjectGitignore now adds both logs/ and trash/ via a single UpdateGitIgnoreBatch call (replaces two separate UpdateGitIgnore calls) - uninstall_project.go calls ensureProjectGitignore for backward compat, patching projects created before this fix on next uninstall run --- cmd/skillshare/init_project.go | 4 ++-- cmd/skillshare/uninstall_project.go | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/skillshare/init_project.go b/cmd/skillshare/init_project.go index d4ae47b0b..b455920a1 100644 --- a/cmd/skillshare/init_project.go +++ b/cmd/skillshare/init_project.go @@ -501,8 +501,8 @@ func ensureProjectGitignore(root string) error { } } - // Always ignore project logs to avoid committing operational noise. - if err := install.UpdateGitIgnore(gitignoreDir, "logs"); err != nil { + // Always ignore operational directories to avoid committing noise. + if err := install.UpdateGitIgnoreBatch(gitignoreDir, []string{"logs", "trash"}); err != nil { return fmt.Errorf("failed to update .skillshare/.gitignore: %w", err) } diff --git a/cmd/skillshare/uninstall_project.go b/cmd/skillshare/uninstall_project.go index b20590f73..1fd43afa2 100644 --- a/cmd/skillshare/uninstall_project.go +++ b/cmd/skillshare/uninstall_project.go @@ -89,6 +89,9 @@ func cmdUninstallProject(args []string, root string) error { sourceDir := filepath.Join(root, ".skillshare", "skills") trashDir := trash.ProjectTrashDir(root) + // Backward compat: ensure operational dirs are gitignored for projects created before v0.17.3. + _ = ensureProjectGitignore(root) + // --- Phase 1: RESOLVE --- var targets []*uninstallTarget seen := map[string]bool{}