mirror of
https://github.com/runkids/skillshare.git
synced 2026-11-20 12:23:22 +00:00
* fix(sync): close gaps found while simulating the prefixed naming switch Simulating the #497 reporter's switch from merge + flat to copy + prefixed turned up four problems: - `target X --mode copy --target-naming prefixed` applied only --mode, since the setter dispatch returned after the first flag. Both flags given together now check the final pair, then apply in an order that keeps the saved pair valid (copy mode first, any other mode last). - Skipped skills were only counted, so a prefixed name over 64 characters vanished with "1 skill(s) skipped". Sync now names the first five with their reason; the cap keeps huge sources from flooding the output. - In copy mode a merge-mode link to the skill was not a managed entry, so when a local folder held the new name the old link was pruned and the skill left the target, contrary to the documented "old managed entry is preserved". Copy mode now migrates such links like managed copies. - PATCH /api/targets validated the mode/naming pair against the current skills state, so disabling skills while changing mode was rejected. It now checks the state the request leaves the target in. * docs(target): drop stray space in the Japanese mode+naming sentence * fix(diff): save paired target settings once and report kept legacy entries - `target X --mode M --target-naming N` ran the two setters, each saving the config, so a failed second save left half the change behind (Codex on #504). Both fields are now set and saved once, after the final pair is checked. - When a local folder holds the name a skill's naming now gives it, sync keeps the skill under its old entry and leaves the folder alone, even with --force. diff still called the folder a "local copy" and suggested `sync --force`, which does nothing for it. CLI and Web API diff, copy and merge mode, now report the folder and the entry the skill stays at. * fix(sync): migrate only links the manifest records as merge-made Copy mode treated any link to the skill's source at an old naming's name as the entry merge mode left behind, so a user's own link was renamed and replaced with a copy (Codex on #504). A link now migrates only when the manifest records it as "symlink", which merge mode writes for links it makes; other links stay as the user left them. The value is now a named constant. * fix(diff): mark kept legacy entries as unaffected by force Two problems Codex found on #504: - The Web API diff sent a local folder on a skill's new name as a "skip", which the dashboard shows as an edited entry that Force replaces. Sync keeps that folder and the legacy entry even with force, so the preview promised a change that never happens. It is now its own "kept" action, shown with its reason and not counted. - `target X --mode M --target-naming N` printed the target's own naming as the old value, so a target inheriting standard or prefixed showed "flat -> ...". It now prints the naming the target had in effect. * fix(diff): keep kept-name conflicts out of the sync count Two problems Codex found on #504: - A local folder on a skill's new name counted toward "N to sync" and fell through to the plain `skillshare sync` hint, though sync changes nothing there until the folder is renamed or removed. Such rows now carry a kept flag, count as neither sync nor local, and print their own hint; a target whose only row is kept still shows that row. - The dashboard grouped targets by row name and icon only, so two targets keeping the same skill at different old entries merged and showed one target's old location for both. The row detail is now part of the key. * fix(diff): do not list a kept local folder's files as deletions A kept row (a local folder on a skill's new name) still pointed at that folder, so `diff --stat` and `--patch` listed each of its files as removed, though sync never touches the folder (Codex on #504). Kept rows no longer point at a target directory, so no file-level diff is built for them in the CLI or the TUI. * fix(diff): report kept skills consistently in every diff view An exhaustive review of the kept-row change (prompted by two Codex findings on #504) found the same gap in several places: - A target whose only rows were kept was summarized as "in sync", and mixed summaries left it out of every count. Such targets now count as "N kept under old name" with a warning mark, and the scan progress counts them. - Plain output and the TUI hid where the skill stays; rows now read "name (stays at old-name)". The TUI also lacked the kept Next hint and called kept-only targets "differs"; it now matches the plain output. - `diff --json` emitted kept rows as "remove", indistinguishable from local-only folders; it now emits "kept", as the Web API does. The diff docs' JSON example also showed actions the CLI never emits. - Renamed rows whose old entry is a merge-made link showed a bogus file stat, because the link was walked as a file; a link now stands for the folder it points to. - A dry-run migration printed "Would copy" to the old path; it now names the new one. * fix(sync): stop reporting kept folders and skipped skills as pending work (#509) Three reports told users to do something sync cannot do, or hid what it did: - Copy and merge sync kept a folder the user made on a skill's name but counted it as "up to date" with no hint. Sync now counts it as local and adds one capped line per target naming the folders and saying that `sync --force` replaces them. The line is added in SyncSkillTarget, so the dashboard gets it too. - status and doctor counted skills that sync skips on purpose (invalid names under standard or prefixed naming, name collisions) as "not synced — run skillshare sync". Running sync can never add them, so the advice looped. They now compare against the skills sync places. - diff marked a target whose only items were local-only folders as "to sync" and `synced: false`. Those items are still listed, but they no longer make the target pending. * fix(target): apply every setting flag, require flag values, report no-ops as unchanged (#507) * fix(target): apply every setting flag, require flag values, report no-ops as unchanged `skillshare target <name>` dispatched --mode, --agent-mode and --target-naming through an if-chain that returned after the first match, so `--agent-mode copy --target-naming prefixed` applied one setting and silently dropped the other. Filters, --skills and --dry-run had the same early-return problem. - Check --mode, --agent-mode and --target-naming as a whole and save once, in global and project mode (one targetSettingsUpdate replaces six per-flag functions). - Reject --mode/--agent-mode/--target-naming combined with filters or --skills, and --dry-run without --skills, instead of dropping them. - A value flag followed by another flag (or an empty string) now reports "<flag> requires a value"; `--target-naming -p` used to report an invalid naming '-p'. - A value the target already has is reported as unchanged and the config is not rewritten. * fix(target): leave the skills pair alone on agents-only changes A target with skills off may keep target_naming prefixed with a merge mode it cannot sync; validateGlobalTarget and validateProjectTarget only check that pair for enabled skills. The combined settings update ran the pair check for every setting, so `target claude --agent-mode copy` was refused on such a target although the old agent-mode handler never looked at skills settings. Check the pair only when --mode or --target-naming is given. * docs(target): show combined settings in --help and the built-in skill The combined --mode/--agent-mode/--target-naming form is now the way to move a target to copy + prefixed in one step, but neither the help examples nor the built-in skill's target reference showed it.
165 lines
5.9 KiB
Go
165 lines
5.9 KiB
Go
package sync
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
|
|
"skillshare/internal/config"
|
|
"skillshare/internal/sourcewalk"
|
|
"skillshare/internal/utils"
|
|
)
|
|
|
|
// ErrSymlinkConflict marks a symlink-mode target whose link points somewhere
|
|
// other than the source. Force replaces the link.
|
|
var ErrSymlinkConflict = errors.New("conflict")
|
|
|
|
// SkillTarget is one target a skill sync visits.
|
|
type SkillTarget struct {
|
|
Name string
|
|
Target config.TargetConfig
|
|
Mode string // resolved skills mode: merge, copy, or anything else for symlink
|
|
}
|
|
|
|
// SkillRunOptions holds what differs between skill sync callers.
|
|
type SkillRunOptions struct {
|
|
Source string // skills source directory
|
|
ProjectRoot string // "" in global mode
|
|
IgnorePatterns []string
|
|
DryRun bool
|
|
Force bool
|
|
// SourceIncomplete means a followed source link could not be read, so
|
|
// skills are missing from the list without being removed. Nothing is
|
|
// pruned; linking and copying still run.
|
|
SourceIncomplete bool
|
|
// OnProgress reports copy-mode progress; nil reports nothing.
|
|
OnProgress func(current, total int, skill string)
|
|
}
|
|
|
|
// SkillTargetResult is the outcome of a skill sync for one target.
|
|
type SkillTargetResult struct {
|
|
Name string
|
|
Mode string
|
|
Linked []string // merge: linked; copy: copied
|
|
Updated []string
|
|
Skipped []string
|
|
// KeptLocal are the skipped entries that are a user's folder on a skill's name.
|
|
KeptLocal []string
|
|
Pruned []string // nil when no prune ran or it returned nothing
|
|
// LocalDirs are user folders a merge prune kept.
|
|
LocalDirs []string
|
|
DirCreated string
|
|
// SymlinkStatus is the target path's status before a symlink-mode sync.
|
|
SymlinkStatus TargetStatus
|
|
Warnings []string // prune failure, the prune's own warnings, then the kept user folders
|
|
// UnmatchedIncludes are the include patterns that select no skill;
|
|
// UnmatchedWarnings renders them for the CLI.
|
|
UnmatchedIncludes []UnmatchedInclude
|
|
Err error // the target failed to sync; nothing else is set
|
|
}
|
|
|
|
// SyncSkillTarget links, copies, or symlinks skills into one target, then
|
|
// prunes orphans left by earlier syncs. It prints nothing and writes no oplog.
|
|
func SyncSkillTarget(t SkillTarget, skills []DiscoveredSkill, opts SkillRunOptions) SkillTargetResult {
|
|
res := SkillTargetResult{Name: t.Name, Mode: t.Mode}
|
|
sc := t.Target.SkillsConfig()
|
|
|
|
switch t.Mode {
|
|
case "merge":
|
|
result, err := SyncTargetMergeWithSkills(t.Name, t.Target, skills, opts.Source, opts.DryRun, opts.Force, opts.ProjectRoot)
|
|
if err != nil {
|
|
res.Err = err
|
|
return res
|
|
}
|
|
res.Linked, res.Updated, res.Skipped, res.DirCreated = result.Linked, result.Updated, result.Skipped, result.DirCreated
|
|
res.KeptLocal = result.Skipped // merge skips only folders the user made
|
|
// A partial source may hold what the filter names, so only a full one reports unmatched patterns.
|
|
if opts.SourceIncomplete {
|
|
break
|
|
}
|
|
res.UnmatchedIncludes = result.UnmatchedIncludes
|
|
prune, err := PruneOrphanLinksWithSkills(PruneOptions{
|
|
TargetPath: sc.Path, SourcePath: opts.Source, Skills: skills,
|
|
Include: sc.Include, Exclude: sc.Exclude, TargetNaming: sc.TargetNaming, TargetName: t.Name,
|
|
DryRun: opts.DryRun, Force: opts.Force,
|
|
})
|
|
res.addPrune(prune, err)
|
|
if prune != nil {
|
|
res.LocalDirs = prune.LocalDirs
|
|
}
|
|
|
|
case "copy":
|
|
result, err := SyncTargetCopyWithSkillsOptions(t.Name, t.Target, skills, opts.Source, opts.DryRun, opts.Force, opts.OnProgress, CopyOptions{IgnorePatterns: opts.IgnorePatterns})
|
|
if err != nil {
|
|
res.Err = err
|
|
return res
|
|
}
|
|
res.Linked, res.Updated, res.Skipped, res.DirCreated = result.Copied, result.Updated, result.Skipped, result.DirCreated
|
|
res.KeptLocal = result.KeptLocal
|
|
// A partial source may hold what the filter names, so only a full one reports unmatched patterns.
|
|
if opts.SourceIncomplete {
|
|
break
|
|
}
|
|
res.UnmatchedIncludes = result.UnmatchedIncludes
|
|
prune, err := PruneOrphanCopiesWithSkills(sc.Path, skills, sc.Include, sc.Exclude, t.Name, sc.TargetNaming, opts.DryRun)
|
|
res.addPrune(prune, err)
|
|
|
|
default:
|
|
res.SymlinkStatus = CheckStatus(sc.Path, opts.Source)
|
|
// A symlink pointing elsewhere is replaced only with force.
|
|
if res.SymlinkStatus == StatusConflict {
|
|
if !opts.Force {
|
|
link, err := utils.ResolveLinkTarget(sc.Path)
|
|
if err != nil {
|
|
link = "(unable to resolve target)"
|
|
}
|
|
res.Err = fmt.Errorf("%w - symlink points to %s (use --force to override)", ErrSymlinkConflict, link)
|
|
return res
|
|
}
|
|
if !opts.DryRun {
|
|
os.Remove(sc.Path)
|
|
}
|
|
}
|
|
res.Err = SyncTarget(t.Name, t.Target, opts.Source, opts.DryRun, opts.ProjectRoot)
|
|
}
|
|
if len(res.KeptLocal) > 0 {
|
|
res.Warnings = append(res.Warnings, fmt.Sprintf("%s: %s", res.Name, keptLocalWarning(res.KeptLocal)))
|
|
}
|
|
return res
|
|
}
|
|
|
|
// SourceLinkWarnings returns one warning per first-level source link the walk
|
|
// did not follow. With pruneSkipped, a warning for an unavailable link also
|
|
// says that target entries were kept.
|
|
func SourceLinkWarnings(walk sourcewalk.Options, pruneSkipped bool) []string {
|
|
var warnings []string
|
|
for _, s := range walk.Follow.Skipped() {
|
|
w := s.String()
|
|
if pruneSkipped && s.Unavailable {
|
|
w += "; kept existing target entries, nothing pruned this run"
|
|
}
|
|
warnings = append(warnings, w)
|
|
}
|
|
return warnings
|
|
}
|
|
|
|
// UnmatchedWarnings renders the unmatched include patterns, one line each, named by target.
|
|
func (res SkillTargetResult) UnmatchedWarnings() []string {
|
|
warnings := make([]string, 0, len(res.UnmatchedIncludes))
|
|
for _, u := range res.UnmatchedIncludes {
|
|
warnings = append(warnings, fmt.Sprintf("%s: %s", res.Name, u.Warning()))
|
|
}
|
|
return warnings
|
|
}
|
|
|
|
// addPrune records a prune's removals and reports its failure and warnings.
|
|
func (res *SkillTargetResult) addPrune(prune *PruneResult, err error) {
|
|
if err != nil {
|
|
res.Warnings = append(res.Warnings, fmt.Sprintf("%s: prune failed: %v", res.Name, err))
|
|
}
|
|
if prune != nil {
|
|
res.Pruned = prune.Removed
|
|
res.Warnings = append(res.Warnings, prune.Warnings...)
|
|
}
|
|
}
|