Files
skillshare/internal/sync/sync.go
T
Willie c638b46096 fix(sync): replace copy-mode copies with links when switching back to merge (#506)
* fix(sync): replace copy-mode copies with links when switching back to merge

Switching a target from copy back to merge left every copy whose entry name
did not change as a real folder. Merge sync treated it as the user's own
folder, so status and doctor kept saying "run skillshare sync" while sync
changed nothing, and only `sync --force` turned it into a link.

Copy mode already replaces merge-mode links with copies on its own, so merge
sync now replaces a folder the manifest records with a checksum (a copy-mode
copy) with a link, without --force. Folders the manifest does not record, or
records as a link, stay untouched. The pre-sync target backup is unchanged.

The CLI and dashboard diffs name these entries as copies sync replaces
instead of suggesting --force, and the sync-modes docs describe the switch.

* fix(sync): keep copy-mode copies the user edited when switching to merge

The first version replaced any folder the manifest recorded as a copy-mode
copy. The manifest checksum is only a record, so a copy edited since copy
mode made it was deleted too, and `sync --json` and project-mode dashboard
sync take no pre-sync backup to restore it from.

Replace the folder only while it still hashes to the recorded checksum
(Manifest.OwnsCopy). An edited copy is kept and `sync --force` still
replaces it; diff keeps suggesting --force for it. A copy whose name: was
rewritten by prefixed naming, or that was made with custom ignore patterns,
no longer hashes to the source checksum and is kept the same way.

* fix(ui): say a copy-mode copy in a merge target is replaced by a link

The Sync page picks a row's text from the diff item's action alone. The
copy-mode copy that merge sync now replaces comes from the server as an
update, which the page worded as "Link is broken or points elsewhere. Will
be relinked" even though no link exists yet.

Match the server's reason and show "Copy made by copy mode. Will be replaced
by a link" instead, in all eleven dashboard languages.

* docs(sync): say only unedited copy-mode copies are replaced on merge sync

The sync-modes paragraph promised that copies copy mode made are replaced
with links without --force. Merge sync keeps a copy that no longer hashes to
the checksum copy mode recorded, so an edited copy, or one whose name: copy
mode rewrote for prefixed naming, still needs --force.

State the three cases in sync-modes and qualify the diff Modified and Local
override labels, in English and the ja, ko, zh-Hans and zh-Hant copies.

* fix(sync): keep the copy until its replacement link exists

Replacing a copy-mode copy removed the folder first and then created the
link. If creating the link failed (no symlink or junction rights on a
Windows or network filesystem), sync returned an error with the skill gone
from the target. This path now also runs on a plain sync, not only on
--force.

Park the folder beside the entry, create the link, then delete the parked
folder; on failure the folder is moved back. A parked folder left by a run
that died mid-way may be the only copy, so the next sync stops with a message
instead of deleting it. The manifest also forgets the copy-mode mtime and
naming records of an entry that is now a link.

* test(sourcefs): register replaceWithLink's target writes in the raw-write ratchet

The previous commit moved the merge-mode folder replacement into
replaceWithLink, which the ratchet reports as new raw os calls and the old
os.RemoveAll allowance as stale. All of them act on the sync target, not the
skills source, like the neighbouring entries.

* fix(sync): bound the parked copy's name and document the naming exception

The folder parked while a link is created was named after the entry, so an
entry near the 255-byte filename limit (a long flattened nested skill)
could not be moved aside and its replacement failed. The parked name is now
a fixed-length hash of the entry name.

sync-modes also says what happens when `target_naming` changes in the same
sync: the copy gets a new entry name and the prune pass removes it as an
orphan whether or not it was edited, as it did before this change.
2026-10-10 00:13:29 +08:00

1087 lines
37 KiB
Go

package sync
import (
"crypto/sha256"
"fmt"
"io"
"os"
"path/filepath"
"strings"
"skillshare/internal/config"
"skillshare/internal/skillignore"
"skillshare/internal/sourcewalk"
"skillshare/internal/utils"
)
// DiagOutput controls where diagnostic messages (dry-run notices, skip notices)
// are written. Defaults to stdout. Set to io.Discard for silent operation (e.g. JSON mode).
var DiagOutput io.Writer = os.Stdout
// DiscoveredSkill represents a skill found during recursive source directory scan.
type DiscoveredSkill struct {
SourcePath string // Full path: ~/.config/skillshare/skills/_team/frontend/ui
RelPath string // Relative path from source: _team/frontend/ui
FlatName string // Flat name for target: _team__frontend__ui
IsInRepo bool // Whether this skill is inside a tracked repo (_-prefixed directory)
RepoRelPath string // Tracked repo root relative to source (_team, or org/_team via --into); set when IsInRepo
Targets []string // From SKILL.md frontmatter; nil = all targets
DescChars int // Rune count of name + description (populated when collectContext)
BodyChars int // Rune count of body after frontmatter (populated when collectContext)
DescTokens int // Estimated tokens of name + description (populated when collectContext)
BodyTokens int // Estimated tokens of body (populated when collectContext)
Description string // Frontmatter description text (populated when collectContext)
LintIssues []LintIssue // Lint issues (populated when collectContext)
Disabled bool // Whether this skill is ignored by .skillignore
Local bool // Found in a target folder rather than the source; see TargetSkills
}
// isSkillIgnored checks whether a skill inside a tracked repo should be
// skipped based on the repo's .skillignore matcher.
// relPath and repoRelPath are slash paths relative to the source root, and
// ignoreMatchers is keyed by repo root in the same form.
func isSkillIgnored(relPath, repoRelPath string, ignoreMatchers map[string]*skillignore.Matcher) bool {
if relPath == repoRelPath {
return false
}
m, ok := ignoreMatchers[repoRelPath]
if !ok {
return false
}
return m.Match(strings.TrimPrefix(relPath, repoRelPath+"/"), false)
}
// walkOptions returns the optional traversal policy passed to a Discover
// function. Omitted, no source links are followed.
func walkOptions(walk []sourcewalk.Options) sourcewalk.Options {
if len(walk) == 0 {
return sourcewalk.Options{}
}
return walk[0]
}
// DiscoverSourceSkillsLite recursively scans the source directory for skills
// without parsing SKILL.md frontmatter. Targets is always nil for each skill.
// It also collects tracked repo paths (directories starting with _ that contain
// .git) during the same walk, eliminating the need for a separate GetTrackedRepos call.
//
// Use this for commands like list/uninstall that don't need per-skill target filtering.
func DiscoverSourceSkillsLite(sourcePath string, walk ...sourcewalk.Options) ([]DiscoveredSkill, []string, error) {
skills, trackedRepos, _, err := discoverSourceSkillsInternal(sourcePath, discoverOptions{
walk: walkOptions(walk),
parseFrontmatter: false,
collectIgnored: false,
collectTracked: true,
})
return skills, trackedRepos, err
}
// DiscoverSourceSkills recursively scans the source directory for skills.
// A skill is identified by the presence of a SKILL.md file.
// Returns all discovered skills with their metadata for syncing.
func DiscoverSourceSkills(sourcePath string, walk ...sourcewalk.Options) ([]DiscoveredSkill, error) {
skills, _, _, err := discoverSourceSkillsInternal(sourcePath, discoverOptions{
walk: walkOptions(walk),
parseFrontmatter: true,
collectIgnored: false,
collectTracked: false,
})
return skills, err
}
// DiscoverSourceSkillsForAnalyze scans skills and computes context usage
// (name+description chars, body chars) in a single pass. Avoids re-reading
// SKILL.md files in a separate analysis phase. Skills disabled by .skillignore
// are kept with Disabled=true, since a symlink-mode target still loads them;
// TargetSkills drops them for every other mode.
func DiscoverSourceSkillsForAnalyze(sourcePath string, walk ...sourcewalk.Options) ([]DiscoveredSkill, error) {
skills, _, _, err := discoverSourceSkillsInternal(sourcePath, discoverOptions{
walk: walkOptions(walk),
parseFrontmatter: true,
collectContext: true,
includeIgnored: true,
})
return skills, err
}
// DiscoverSourceSkillsWithStats recursively scans the source directory for skills
// and collects .skillignore statistics (which files are active, patterns, ignored paths).
// Use this for commands like doctor/status that need to report on .skillignore state.
func DiscoverSourceSkillsWithStats(sourcePath string, walk ...sourcewalk.Options) ([]DiscoveredSkill, *skillignore.IgnoreStats, error) {
skills, _, stats, err := discoverSourceSkillsInternal(sourcePath, discoverOptions{
walk: walkOptions(walk),
parseFrontmatter: true,
collectIgnored: true,
collectTracked: false,
})
return skills, stats, err
}
// DiscoverSourceSkillsWithStatsAndContext is like DiscoverSourceSkillsWithStats
// but also computes DescChars/BodyChars for each skill in a single walk pass.
// Use this for commands (e.g. sync) that need both ignore stats and context cost.
func DiscoverSourceSkillsWithStatsAndContext(sourcePath string, walk ...sourcewalk.Options) ([]DiscoveredSkill, *skillignore.IgnoreStats, error) {
skills, _, stats, err := discoverSourceSkillsInternal(sourcePath, discoverOptions{
walk: walkOptions(walk),
parseFrontmatter: true,
collectIgnored: true,
collectContext: true,
collectTracked: false,
})
return skills, stats, err
}
// DiscoverSourceSkillsAll scans the source directory and returns ALL skills
// including those ignored by .skillignore. Ignored skills have Disabled=true.
// Use this for list/UI commands that need to show disabled skills.
func DiscoverSourceSkillsAll(sourcePath string, walk ...sourcewalk.Options) ([]DiscoveredSkill, error) {
skills, _, _, err := discoverSourceSkillsInternal(sourcePath, discoverOptions{
walk: walkOptions(walk),
parseFrontmatter: true,
includeIgnored: true,
})
return skills, err
}
// TargetStatus represents the state of a target
type TargetStatus int
const (
StatusUnknown TargetStatus = iota
StatusLinked // Target is a symlink pointing to source
StatusNotExist // Target doesn't exist
StatusHasFiles // Target exists with files (needs migration)
StatusConflict // Target is a symlink pointing elsewhere
StatusBroken // Target is a broken symlink
StatusMerged // Target uses merge mode (individual skill symlinks)
StatusCopied // Target uses copy mode (individual skill copies + manifest)
)
func (s TargetStatus) String() string {
switch s {
case StatusLinked:
return "linked"
case StatusNotExist:
return "not exist"
case StatusHasFiles:
return "has files"
case StatusConflict:
return "conflict"
case StatusBroken:
return "broken"
case StatusMerged:
return "merged"
case StatusCopied:
return "copied"
default:
return "unknown"
}
}
// CheckStatus checks the status of a target
func CheckStatus(targetPath, sourcePath string) TargetStatus {
info, err := os.Lstat(targetPath)
if err != nil {
if os.IsNotExist(err) {
return StatusNotExist
}
return StatusUnknown
}
// Check if it's a symlink/junction
if utils.IsSymlinkOrJunction(targetPath) {
absLink, err := utils.ResolveLinkTarget(targetPath)
if err != nil {
return StatusUnknown
}
// Check if link points to our source
absSource, _ := filepath.Abs(sourcePath)
if utils.PathsEqual(absLink, absSource) {
// Verify the link is not broken
if _, err := os.Stat(targetPath); err != nil {
return StatusBroken
}
return StatusLinked
}
return StatusConflict
}
// It's a directory with files
if info.IsDir() {
return StatusHasFiles
}
return StatusUnknown
}
// MigrateToSource moves files from target to source, then creates symlink
func MigrateToSource(targetPath, sourcePath string) error {
// Ensure source parent directory exists
if err := os.MkdirAll(filepath.Dir(sourcePath), 0755); err != nil {
return fmt.Errorf("failed to create source parent: %w", err)
}
// Check if source already exists
if _, err := os.Stat(sourcePath); err == nil {
// Source exists - merge files
if err := mergeDirectories(targetPath, sourcePath); err != nil {
return fmt.Errorf("failed to merge directories: %w", err)
}
// Remove original target
if err := os.RemoveAll(targetPath); err != nil {
return fmt.Errorf("failed to remove target after merge: %w", err)
}
} else {
// Source doesn't exist - just move
if err := os.Rename(targetPath, sourcePath); err != nil {
// Cross-device? Try copy then delete
if err := copyDirectory(targetPath, sourcePath); err != nil {
return fmt.Errorf("failed to copy to source: %w", err)
}
if err := os.RemoveAll(targetPath); err != nil {
return fmt.Errorf("failed to remove original after copy: %w", err)
}
}
}
return nil
}
// resolveLinkRoot resolves an operation root like filepath.EvalSymlinks, but a
// root that is itself a link is first replaced by its physical target: since
// Go 1.23 EvalSymlinks leaves a Windows junction in place, and walking the
// junction entry would trip the cycle guard instead of copying its contents.
func resolveLinkRoot(root string) (string, error) {
if info, err := os.Lstat(root); err == nil && utils.IsLinkMode(root, info.Mode()) {
root = sourcewalk.Canonical(root)
}
return filepath.EvalSymlinks(root)
}
// CreateSymlink creates a symlink (or junction on Windows) from target to source.
// When projectRoot is non-empty and both paths reside under it, a relative symlink is created.
func CreateSymlink(targetPath, sourcePath, projectRoot string) error {
relative := shouldUseRelative(projectRoot, sourcePath, targetPath)
// Ensure target parent exists
if err := os.MkdirAll(filepath.Dir(targetPath), 0755); err != nil {
return fmt.Errorf("failed to create target parent: %w", err)
}
// Create link (uses junction on Windows, symlink on Unix)
if err := createLink(targetPath, sourcePath, relative, sourcePath); err != nil {
return fmt.Errorf("failed to create link: %w", err)
}
return nil
}
// SyncTarget performs the sync operation for a single target.
// projectRoot enables relative symlinks when non-empty.
func SyncTarget(name string, target config.TargetConfig, sourcePath string, dryRun bool, projectRoot string) error {
sc := target.SkillsConfig()
if !sc.IsEnabled() {
return nil
}
// Remove manifest if present (merge/copy → symlink conversion)
if !dryRun {
RemoveManifest(sc.Path) //nolint:errcheck
}
status := CheckStatus(sc.Path, sourcePath)
switch status {
case StatusLinked:
relative := shouldUseRelative(projectRoot, sourcePath, sc.Path)
dest, _ := os.Readlink(sc.Path)
if !linkNeedsReformat(dest, relative) {
return nil
}
// Correct target but wrong format — recreate
if dryRun {
fmt.Fprintf(DiagOutput, "[dry-run] Would reformat symlink: %s\n", sc.Path)
return nil
}
return reformatLink(sc.Path, sourcePath, relative, sourcePath)
case StatusNotExist:
if dryRun {
fmt.Fprintf(DiagOutput, "[dry-run] Would create symlink: %s -> %s\n", sc.Path, sourcePath)
return nil
}
return CreateSymlink(sc.Path, sourcePath, projectRoot)
case StatusHasFiles:
if dryRun {
fmt.Fprintf(DiagOutput, "[dry-run] Would migrate files from %s to %s, then create symlink\n", sc.Path, sourcePath)
return nil
}
if err := MigrateToSource(sc.Path, sourcePath); err != nil {
return err
}
return CreateSymlink(sc.Path, sourcePath, projectRoot)
case StatusConflict:
link, err := utils.ResolveLinkTarget(sc.Path)
if err != nil {
link = "(unable to resolve target)"
}
return fmt.Errorf("target is symlink to different location: %s -> %s", sc.Path, link)
case StatusBroken:
if dryRun {
fmt.Fprintf(DiagOutput, "[dry-run] Would remove broken symlink and recreate: %s\n", sc.Path)
return nil
}
os.Remove(sc.Path)
return CreateSymlink(sc.Path, sourcePath, projectRoot)
default:
return fmt.Errorf("unknown target status: %s", status)
}
}
// mergeDirectories copies files from src to dst, skipping existing files
func mergeDirectories(src, dst string) error {
return filepath.Walk(src, func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
}
relPath, _ := filepath.Rel(src, path)
dstPath := filepath.Join(dst, relPath)
if info.IsDir() {
return os.MkdirAll(dstPath, info.Mode())
}
// Skip if destination exists
if _, err := os.Stat(dstPath); err == nil {
fmt.Fprintf(DiagOutput, " skip (exists): %s\n", relPath)
return nil
}
return copyFile(path, dstPath)
})
}
// copyDirectory copies a directory recursively
func copyDirectory(src, dst string) error {
return copyDirectoryWithState(src, dst, map[string]bool{}, nil)
}
// copyDirectoryOpts controls behavior of copyDirectoryWithState.
type copyDirectoryOpts struct {
SkipGit bool // skip .git directories
Ignore *skillignore.Matcher
}
// copyDirectorySkipGit copies a directory recursively, skipping .git directories.
// Use this for collect/pull operations where .git is not wanted in the destination.
func copyDirectorySkipGit(src, dst string) error {
return copyDirectoryWithState(src, dst, map[string]bool{}, &copyDirectoryOpts{SkipGit: true})
}
func copyDirectoryWithIgnore(src, dst string, ignorePatterns []string) error {
return copyDirectoryWithState(src, dst, map[string]bool{}, &copyDirectoryOpts{
SkipGit: true,
Ignore: compileFileIgnore(ignorePatterns),
})
}
// copyDirectoryWithState copies recursively and dereferences directory symlinks.
// active tracks real paths in the current recursion stack to prevent cycles.
func copyDirectoryWithState(src, dst string, active map[string]bool, opts *copyDirectoryOpts) error {
resolvedSrc, err := resolveLinkRoot(src)
if err != nil {
return fmt.Errorf("failed to resolve source directory %s: %w", src, err)
}
if active[resolvedSrc] {
return fmt.Errorf("detected symlink directory cycle while copying: %s", src)
}
active[resolvedSrc] = true
defer delete(active, resolvedSrc)
skipGit := opts != nil && opts.SkipGit
var ignore *skillignore.Matcher
if opts != nil {
ignore = opts.Ignore
}
// Walk the operation root itself as a directory, not as a second link hop.
src = resolvedSrc
return filepath.Walk(src, func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
}
relPath, _ := filepath.Rel(src, path)
relPath = strings.ReplaceAll(relPath, "\\", "/")
dstPath := filepath.Join(dst, relPath)
if info.IsDir() {
if skipGit && info.Name() == ".git" {
return filepath.SkipDir
}
if relPath != "." && isFileIgnored(ignore, relPath, true) {
return filepath.SkipDir
}
return os.MkdirAll(dstPath, info.Mode())
}
if isFileIgnored(ignore, relPath, false) {
return nil
}
// In copy mode we need real files/dirs, so directory symlinks are
// dereferenced and copied as concrete directories.
if utils.IsLinkMode(path, info.Mode()) {
targetInfo, statErr := os.Stat(path)
if statErr != nil {
return fmt.Errorf("failed to stat symlink target %s: %w", path, statErr)
}
if targetInfo.IsDir() {
resolvedDir, resolveErr := filepath.EvalSymlinks(path)
if resolveErr != nil {
return fmt.Errorf("failed to resolve symlink directory %s: %w", path, resolveErr)
}
return copyDirectoryWithState(resolvedDir, dstPath, active, opts)
}
}
return copyFile(path, dstPath)
})
}
// copyFile copies a single file
func copyFile(src, dst string) error {
srcFile, err := os.Open(src)
if err != nil {
return err
}
defer srcFile.Close()
srcInfo, err := srcFile.Stat()
if err != nil {
return err
}
dstFile, err := os.OpenFile(dst, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, srcInfo.Mode())
if err != nil {
return err
}
defer dstFile.Close()
_, err = io.Copy(dstFile, srcFile)
return err
}
// MergeResult holds the result of a merge sync operation
type MergeResult struct {
Linked []string // Skills that were symlinked
Skipped []string // Skills that already exist in target (kept local)
Updated []string // Skills that had broken symlinks fixed
DirCreated string // Non-empty if target directory was auto-created (or would be in dry-run)
// UnmatchedIncludes are the include patterns that select no skill.
UnmatchedIncludes []UnmatchedInclude
}
// isSymlinkToSource checks whether targetPath is a symlink pointing to sourcePath.
// Both sides are canonicalized (EvalSymlinks) so that symlink aliases of the same
// physical directory are recognized as equal.
func isSymlinkToSource(targetPath, sourcePath string) bool {
absLink, err := utils.ResolveLinkTarget(targetPath)
if err != nil {
return false
}
absSource, _ := filepath.Abs(sourcePath)
// Fast path: direct string comparison covers the common case.
if utils.PathsEqual(absLink, absSource) {
return true
}
// Slow path: canonicalize both sides to detect symlink aliases.
canonLink := utils.ResolveSymlink(absLink)
canonSource := utils.ResolveSymlink(absSource)
return utils.PathsEqual(canonLink, canonSource)
}
// ensureRealTargetDir handles symlink→merge/copy conversion and verifies the
// target directory exists. Returns an error if the directory is missing or
// inaccessible (never auto-creates to catch typos).
// ensureRealTargetDir handles symlink→merge/copy conversion and auto-creates
// missing target directories. Returns (true, nil) when a directory was created
// (or would be in dry-run), (false, nil) when it already existed.
func ensureRealTargetDir(targetPath, sourcePath, modeName string, dryRun bool) (created bool, err error) {
info, lstatErr := os.Lstat(targetPath)
if lstatErr == nil && info != nil && utils.IsSymlinkOrJunction(targetPath) {
if isSymlinkToSource(targetPath, sourcePath) {
if dryRun {
fmt.Fprintf(DiagOutput, "[dry-run] Would convert from symlink mode to %s mode: %s\n", modeName, targetPath)
return false, nil
}
if err := os.Remove(targetPath); err != nil {
return false, fmt.Errorf("failed to remove symlink for %s conversion: %w", modeName, err)
}
if err := os.MkdirAll(targetPath, 0755); err != nil {
return false, fmt.Errorf("failed to create target directory after symlink conversion: %w", err)
}
return false, nil // converted — directory exists
}
// else: target is an external symlink (dotfiles manager, etc.) — keep it
}
// Auto-create target directory if missing, with a visible notification.
// This handles fresh CLI installs (e.g., ~/.claude/ exists but skills/ doesn't)
// and built-in targets like universal (~/.agents/skills) where the entire
// path tree may not exist yet.
fi, statErr := os.Stat(targetPath)
if statErr != nil {
if os.IsNotExist(statErr) {
if dryRun {
return true, nil
}
if err := os.MkdirAll(targetPath, 0755); err != nil {
return false, fmt.Errorf("failed to create target directory: %w", err)
}
return true, nil
}
return false, fmt.Errorf("cannot access target directory: %w", statErr)
}
if !fi.IsDir() {
return false, fmt.Errorf("target path is not a directory: %s", targetPath)
}
return false, nil
}
// SyncTargetMerge performs merge mode sync - creates symlinks for each skill individually
// while preserving target-specific skills.
// Supports nested skills: source path "personal/writing/email" becomes target symlink "personal__writing__email"
// If force is true, local copies will be replaced with symlinks. Copies that copy
// mode made and nobody edited since (the manifest checksum still matches) are replaced too.
func SyncTargetMerge(name string, target config.TargetConfig, sourcePath string, dryRun, force bool, projectRoot string) (*MergeResult, error) {
skills, err := DiscoverSourceSkills(sourcePath)
if err != nil {
return nil, fmt.Errorf("failed to discover skills: %w", err)
}
return SyncTargetMergeWithSkills(name, target, skills, sourcePath, dryRun, force, projectRoot)
}
// SyncTargetMergeWithSkills is like SyncTargetMerge but accepts pre-discovered skills,
// avoiding redundant filesystem walks when syncing multiple targets.
// sourcePath is the skills source directory, used to detect symlink-mode targets.
func SyncTargetMergeWithSkills(name string, target config.TargetConfig, allSkills []DiscoveredSkill, sourcePath string, dryRun, force bool, projectRoot string) (*MergeResult, error) {
sc := target.SkillsConfig()
result := &MergeResult{}
if !sc.IsEnabled() {
return result, nil
}
// Checked against sourcePath (root dir), not per-skill paths — all skills
// are children of sourcePath so the result is the same for every skill.
relative := shouldUseRelative(projectRoot, sourcePath, sc.Path)
// Convert from symlink mode if needed, auto-create if missing.
dirCreated, err := ensureRealTargetDir(sc.Path, sourcePath, "merge", dryRun)
if err != nil {
return nil, err
}
if dirCreated {
result.DirCreated = sc.Path
}
// When dry-run would create the directory, suppress per-skill diagnostic
// messages (they flood the terminal). Counts are still populated.
quietDryRun := dirCreated && dryRun
resolution, err := ResolveTargetSkillsForTarget(name, target.SkillsConfig(), allSkills)
if err != nil {
return nil, err
}
printResolutionSummary(resolution)
result.UnmatchedIncludes = resolution.UnmatchedIncludes
manifest, err := ReadManifest(sc.Path)
if err != nil {
return nil, fmt.Errorf("failed to read manifest: %w", err)
}
taken := resolution.ValidTargetNames()
for _, resolved := range resolution.Skills {
skill := resolved.Skill
activeName, err := selectActiveTargetNameForSync("merge", sc.Path, resolved, taken, manifest, dryRun)
if err != nil {
return nil, err
}
targetSkillPath := filepath.Join(sc.Path, activeName)
// Check if skill exists in target
_, err = os.Lstat(targetSkillPath)
if err == nil {
// Something exists at target path
if utils.IsSymlinkOrJunction(targetSkillPath) {
// It's a symlink/junction - check if it points to source
absLink, err := utils.ResolveLinkTarget(targetSkillPath)
if err != nil {
return nil, fmt.Errorf("failed to resolve link target for %s: %w", activeName, err)
}
absSource, _ := filepath.Abs(skill.SourcePath)
if utils.PathsEqual(absLink, absSource) {
rawDest, _ := os.Readlink(targetSkillPath)
if !linkNeedsReformat(rawDest, relative) {
// Already correctly linked with correct format
result.Linked = append(result.Linked, activeName)
continue
}
// Correct target but wrong format (abs↔rel) — recreate
if !dryRun {
if err := reformatLink(targetSkillPath, skill.SourcePath, relative, sourcePath); err != nil {
return nil, fmt.Errorf("failed to reformat link for %s: %w", activeName, err)
}
}
result.Updated = append(result.Updated, activeName)
continue
}
// Symlink points elsewhere - broken or wrong
if dryRun {
if !quietDryRun {
fmt.Fprintf(DiagOutput, "[dry-run] Would fix symlink: %s\n", activeName)
}
} else {
os.Remove(targetSkillPath)
if err := createLink(targetSkillPath, skill.SourcePath, relative, sourcePath); err != nil {
return nil, fmt.Errorf("failed to create link for %s: %w", activeName, err)
}
}
result.Updated = append(result.Updated, activeName)
} else {
// It's a real directory
if force || manifest.OwnsCopy(activeName, targetSkillPath) {
// Force, or an unedited copy left by copy mode: replace it with a symlink
if dryRun {
if !quietDryRun {
fmt.Fprintf(DiagOutput, "[dry-run] Would replace local copy: %s\n", activeName)
}
} else {
err := replaceWithLink(targetSkillPath, func() error {
return createLink(targetSkillPath, skill.SourcePath, relative, sourcePath)
})
if err != nil {
return nil, fmt.Errorf("failed to replace local copy %s with a link: %w", activeName, err)
}
}
result.Updated = append(result.Updated, activeName)
} else {
// Preserve local skill
result.Skipped = append(result.Skipped, activeName)
}
}
} else if os.IsNotExist(err) {
// Doesn't exist - create link
if dryRun {
if !quietDryRun {
fmt.Fprintf(DiagOutput, "[dry-run] Would create link: %s -> %s\n", targetSkillPath, skill.SourcePath)
}
} else {
if err := createLink(targetSkillPath, skill.SourcePath, relative, sourcePath); err != nil {
return nil, fmt.Errorf("failed to create link for %s: %w", activeName, err)
}
}
result.Linked = append(result.Linked, activeName)
} else {
return nil, fmt.Errorf("failed to check target skill %s: %w", activeName, err)
}
}
// Write manifest (additive: merge with existing entries)
if !dryRun {
for _, name := range result.Linked {
manifest.Managed[name] = manifestSymlink
}
for _, name := range result.Updated {
manifest.Remove(name) // drops what copy mode recorded for a copy that is now a link
manifest.Managed[name] = manifestSymlink
}
// Skipped items are NOT added — they are user-local copies
WriteManifest(sc.Path, manifest) //nolint:errcheck
}
return result, nil
}
// parkedPath is where replaceWithLink waits with the folder at path. The name is
// a fixed length because the entry's own name may already be near the filesystem limit.
func parkedPath(path string) string {
return filepath.Join(filepath.Dir(path), fmt.Sprintf(".skillshare-replaced-%x", sha256.Sum256([]byte(filepath.Base(path)))))
}
// replaceWithLink swaps the real folder at path for a link. The folder waits
// beside it until link has run, so a failed link leaves the folder as it was.
func replaceWithLink(path string, link func() error) error {
parked := parkedPath(path)
// A leftover may be the only copy if an earlier run died before it could restore it.
if _, err := os.Lstat(parked); err == nil {
return fmt.Errorf("%s is left from an earlier replacement; move or delete it, then sync again", parked)
}
if err := os.Rename(path, parked); err != nil {
return err
}
if err := link(); err != nil {
os.Remove(path)
if rbErr := os.Rename(parked, path); rbErr != nil {
return fmt.Errorf("%w (the local copy is kept at %s: %v)", err, parked, rbErr)
}
return err
}
return os.RemoveAll(parked)
}
// PruneResult holds the result of a prune operation
type PruneResult struct {
Removed []string // Items that were removed
Warnings []string // Items that were kept with warnings
LocalDirs []string // User-created entries (directories or links) not managed by skillshare
}
// PruneOptions holds parameters for PruneOrphanLinks / PruneOrphanCopies.
type PruneOptions struct {
TargetPath string
SourcePath string
Skills []DiscoveredSkill // pre-discovered; if nil, will be discovered from SourcePath
Include []string
Exclude []string
TargetNaming string
TargetName string
DryRun bool
Force bool
// ManagedOnly removes only entries that are provably skillshare's: broken
// links into the source and manifest-tracked links and directories. The name heuristic and
// broken-external-link cleanup are skipped. For directories that are not a
// configured target's own path.
ManagedOnly bool
}
// PruneOrphanLinks removes target entries that are no longer managed by sync.
// This includes:
// 1. Source-linked entries excluded by include/exclude filters (remove from target)
// 2. Orphan links/directories that no longer exist in source
// 3. Unknown local directories and live links skillshare never created (kept, reported as local)
// A link that still resolves into the source is only removed when the manifest
// records it (or force is set), so links created outside skillshare survive.
func PruneOrphanLinks(targetPath, sourcePath string, include, exclude []string, targetName, targetNaming string, dryRun, force bool) (*PruneResult, error) {
allSourceSkills, err := DiscoverSourceSkills(sourcePath)
if err != nil {
return nil, fmt.Errorf("failed to discover skills for pruning: %w", err)
}
return PruneOrphanLinksWithSkills(PruneOptions{
TargetPath: targetPath,
SourcePath: sourcePath,
Skills: allSourceSkills,
Include: include,
Exclude: exclude,
TargetNaming: targetNaming,
TargetName: targetName,
DryRun: dryRun,
Force: force,
})
}
// PruneOrphanLinksWithSkills is like PruneOrphanLinks but accepts pre-discovered skills
// via PruneOptions, avoiding redundant filesystem walks.
func PruneOrphanLinksWithSkills(opts PruneOptions) (*PruneResult, error) {
targetPath := opts.TargetPath
sourcePath := opts.SourcePath
allSourceSkills := opts.Skills
include := opts.Include
exclude := opts.Exclude
targetNaming := opts.TargetNaming
targetName := opts.TargetName
dryRun := opts.DryRun
force := opts.Force
result := &PruneResult{}
// Read manifest for managed-directory detection (may be empty/absent)
manifest, _ := ReadManifest(targetPath)
manifestChanged := false
resolution, err := ResolveTargetSkillsForTarget(targetName, config.ResourceTargetConfig{
Path: targetPath,
TargetNaming: targetNaming,
Include: include,
Exclude: exclude,
}, allSourceSkills)
if err != nil {
return nil, err
}
validTargetNames := resolution.ValidTargetNames()
legacyNames := resolution.LegacyNames("merge", targetPath, manifest)
naming := config.EffectiveTargetNaming(targetNaming)
// Scan target directory
entries, err := os.ReadDir(targetPath)
if err != nil {
if os.IsNotExist(err) {
return result, nil // Target doesn't exist, nothing to prune
}
return nil, fmt.Errorf("failed to read target directory: %w", err)
}
absSource, _ := filepath.Abs(sourcePath)
for _, entry := range entries {
name := entry.Name()
// Skip hidden files unless skillshare manages them
if manifest.SkipsHidden(name) {
continue
}
entryPath := filepath.Join(targetPath, name)
info, err := os.Lstat(entryPath)
if err != nil {
continue
}
// Check if this entry is still valid
if validTargetNames[name] {
continue // Still exists in source, keep it
}
if _, keepLegacy := legacyNames[name]; keepLegacy {
continue // Still exists in source, keep it
}
// Entry is orphan - determine if we should remove it
shouldRemove := false
reason := ""
if utils.IsSymlinkOrJunction(entryPath) {
absLink, err := utils.ResolveLinkTarget(entryPath)
if err != nil {
result.Warnings = append(result.Warnings,
fmt.Sprintf("%s: unable to resolve link target, kept", name))
continue
}
targetExists := false
if _, err := os.Stat(absLink); err == nil {
targetExists = true
}
if utils.PathHasPrefix(absLink, absSource+string(filepath.Separator)) {
if !targetExists {
shouldRemove = true
reason = "broken symlink to source"
} else if _, inManifest := manifest.Managed[name]; inManifest || force {
shouldRemove = true
reason = "orphan symlink to source"
} else {
// A live link into the source that skillshare never created is the
// user's own wiring. Keep it, like the directory branch below.
result.LocalDirs = append(result.LocalDirs, name)
continue
}
} else if !targetExists && !opts.ManagedOnly {
// External symlink whose target no longer exists (e.g. after data migration)
shouldRemove = true
reason = "broken external symlink"
} else if force {
// Valid external symlink, but force mode requested
shouldRemove = true
reason = "external symlink (force)"
} else {
result.Warnings = append(result.Warnings,
fmt.Sprintf("%s: symlink to external location (%s), kept", name, absLink))
}
} else if info.IsDir() {
// Check manifest first (most reliable)
if _, inManifest := manifest.Managed[name]; inManifest {
shouldRemove = true
reason = "orphan skillshare-managed directory (manifest)"
} else if naming == "flat" && !opts.ManagedOnly && (utils.HasNestedSeparator(name) || utils.IsTrackedRepoDir(name)) {
// Fallback: naming pattern heuristic
shouldRemove = true
reason = "orphan skillshare-managed directory"
} else {
// User-created local directory — record but don't warn
result.LocalDirs = append(result.LocalDirs, name)
}
}
if shouldRemove {
if dryRun {
fmt.Fprintf(DiagOutput, "[dry-run] Would remove %s: %s\n", reason, entryPath)
} else {
if err := os.RemoveAll(entryPath); err != nil {
result.Warnings = append(result.Warnings,
fmt.Sprintf("%s: failed to remove: %v", name, err))
continue
}
}
result.Removed = append(result.Removed, name)
// Track manifest changes for cleanup
if _, inManifest := manifest.Managed[name]; inManifest {
manifest.Remove(name)
manifestChanged = true
}
}
}
// Write back manifest if entries were removed (skip in dry-run)
if manifestChanged && !dryRun {
WriteManifest(targetPath, manifest) //nolint:errcheck
}
return result, nil
}
// NameCollision represents a conflict where multiple skills share the same name
type NameCollision struct {
Name string // The conflicting SKILL.md name
Paths []string // All paths that have this name
}
// CheckNameCollisions detects skills with duplicate names in SKILL.md.
// Returns a list of collisions (skills that share the same name).
func CheckNameCollisions(skills []DiscoveredSkill) []NameCollision {
// Map: skill name -> list of paths
nameMap := make(map[string][]string)
for _, skill := range skills {
// Parse the actual name from SKILL.md
name, err := utils.ParseSkillName(skill.SourcePath)
if err != nil || name == "" {
continue // Skip if we can't parse or no name
}
nameMap[name] = append(nameMap[name], skill.RelPath)
}
// Find collisions (names with multiple paths)
var collisions []NameCollision
for name, paths := range nameMap {
if len(paths) > 1 {
collisions = append(collisions, NameCollision{
Name: name,
Paths: paths,
})
}
}
return collisions
}
// TargetCollision holds name collisions that affect a specific target after filtering.
type TargetCollision struct {
TargetName string
Collisions []NameCollision
}
// CheckNameCollisionsForTargets checks name collisions both globally and per-target.
// Global collisions are computed on the unfiltered skill set.
// Per-target collisions apply each target's include/exclude filters first, then check.
// Symlink-mode targets are skipped (filters don't apply).
func CheckNameCollisionsForTargets(
skills []DiscoveredSkill,
targets map[string]config.TargetConfig,
) (global []NameCollision, perTarget []TargetCollision) {
global = CheckNameCollisions(skills)
for name, target := range targets {
sc := target.SkillsConfig()
if sc.Mode == "symlink" || !sc.IsEnabled() {
continue
}
// In flat naming mode without filters, per-target collisions are
// identical to the global check — skip the redundant resolution.
naming := config.EffectiveTargetNaming(sc.TargetNaming)
if naming == "flat" && len(sc.Include) == 0 && len(sc.Exclude) == 0 {
continue
}
resolution, err := ResolveTargetSkillsForTarget(name, sc, skills)
if err != nil {
continue
}
if len(resolution.Collisions) > 0 {
perTarget = append(perTarget, TargetCollision{
TargetName: name,
Collisions: resolution.Collisions,
})
}
}
return global, perTarget
}
// CheckStatusMerge checks the status of a target in merge mode
func CheckStatusMerge(targetPath, sourcePath string) (TargetStatus, int, int) {
// Returns: status, linked count, local count
info, err := os.Lstat(targetPath)
if err != nil {
if os.IsNotExist(err) {
return StatusNotExist, 0, 0
}
return StatusUnknown, 0, 0
}
// If it's a symlink/junction to source, it's using symlink mode not merge
if utils.IsSymlinkOrJunction(targetPath) {
absLink, err := utils.ResolveLinkTarget(targetPath)
if err != nil {
return StatusUnknown, 0, 0
}
absSource, _ := filepath.Abs(sourcePath)
if utils.PathsEqual(absLink, absSource) {
return StatusLinked, 0, 0
}
// External symlink (e.g., dotfiles manager) — follow it and treat
// the resolved directory as a normal target directory.
resolved, statErr := os.Stat(targetPath)
if statErr != nil || !resolved.IsDir() {
return StatusConflict, 0, 0
}
// Fall through to count linked/local skills in the resolved directory
} else if !info.IsDir() {
return StatusUnknown, 0, 0
}
// Count linked vs local skills
linkedCount := 0
localCount := 0
manifest, _ := ReadManifest(targetPath)
entries, _ := os.ReadDir(targetPath)
for _, entry := range entries {
if manifest.SkipsHidden(entry.Name()) {
continue
}
skillPath := filepath.Join(targetPath, entry.Name())
if utils.IsSymlinkOrJunction(skillPath) {
// It's a symlink/junction - check if it points to somewhere in source
absLink, err := utils.ResolveLinkTarget(skillPath)
if err != nil {
localCount++
continue
}
absSource, _ := filepath.Abs(sourcePath)
// Check if the symlink target is within the source directory
if utils.PathHasPrefix(absLink, absSource+string(filepath.Separator)) || utils.PathsEqual(absLink, absSource) {
linkedCount++
} else {
localCount++
}
} else {
localCount++
}
}
if linkedCount > 0 {
return StatusMerged, linkedCount, localCount
}
return StatusHasFiles, 0, localCount
}