mirror of
https://github.com/runkids/skillshare.git
synced 2026-11-19 02:17:09 +00:00
* docs(proposals): propose agent-specific skill variants Tracked repositories can ship different files for the same skill across agents. Counting and syncing each copy independently sends incompatible instructions to every target unless users maintain routing filters. Propose repository-scoped logical identity and exact variant routing while preserving source files, explicit controls, and existing naming behavior. Leave activation and compatibility decisions for maintainer review. Refs #648 * docs(proposals): clarify variant routing compatibility Explain how recognition affects universal-only targets and how existing per-variant overrides preserve the desired routing. Fix the precedence between variant identity and generic host-style path inference. Include analyze, move, and catalog consumers while preserving physical identifiers and actual context-cost accounting. Refs #648 * docs(proposals): clarify activation assumptions and scope Make acceptance cases conditional on maintainer-approved recognition being enabled for the tracked source. Separate the provisional implementation estimate from this proposal-only PR so its size is clear. Refs #648 * docs(proposals): qualify naming and opt-in assumptions State that the reproduced routing behavior uses default flat target naming. Leave any opt-in surface with the maintainer's activation decision without ruling out future CLI or config fields. Refs #648 * feat: recognize and route tracked agent skill variants Count tracked variants as logical skills in source and repository summaries, while preserving physical paths, sync operations, and context costs. Select matching canonical agent variants, including account targets, through shared discovery and selection with existing explicit routing precedence. Refs #648 * fix: count logical skills in sync inventory summaries Use shared logical and physical inventory counts in global and project sync closing lines while preserving each target's operation totals. Refs #648 * fix: preserve variant routing diagnostics across previews Resolve target selections once so CLI and server previews keep ambiguity reasons and physical skip counts. Explain managed variants removed by automatic agent routing, and report logical inventory in doctor. Keep warning rows read-only, document upgrade recovery in translated filtering references, and remove the optional README-only addition. Refs #648 * fix: align sync matrix previews with shared variant selection Classify the full source selection once per target so matrix previews honor canonical aliases, account identity, exact-agent routing, and ambiguous variant skips. Preserve each rejected physical path's existing diagnostic and draft filter disambiguation; skipped preview rows remain read-only. Refs #648 * test: expect singular skill wording in doctor source checks Keep the undiscovered-link count assertion aligned with logical source inventory formatting for one skill in global and project mode. Refs #648 * fix: retain selection diagnostics in catalog and diff verdicts Report warning-only diff targets as requiring attention while preserving local-only folder semantics. Reuse shared per-path selection diagnostics in target-scoped catalogs without applying target naming to served paths. Compute source counts once in summary callers and require variant counts in the source status formatter. Refs #648 * test: tighten tracked variant preview fixtures Use a real committed tracked repository for status counts, verify sync preview banners retain server warnings, and use emitted ambiguity reason text in target preview fixtures. Refs #648 * fix(sync): keep agent variants in shared target folders Compatible targets sharing a skills folder need a combined selection so Codex and universal do not prune one another in merge or copy mode. Carry every shared reader through selection, pruning and previews, including project targets, account identities and path aliases. Require a matching skill suffix under two distinct agents before inferring variants, keeping ordinary agent-named categories unrestricted. Separate naming warnings from ambiguous selection in diff and explain ambiguous removals. Add global/project regression coverage for repeated sync, target-only sync, status JSON, diff and API consumers. * fix(variants): align consumer counts, hints and diagnostics Use logical source counts in list, tracked install and init summaries while matching audit caches against physical variants. Restore localized dashboard skip hints and explain symlink routing limits in status and doctor, including project and JSON output. Document paired-agent detection and compatible shared-folder selection in the proposal, built-in skill and English plus translated command pages. Add focused regressions for the affected consumers. * fix(sync): cover initial sync and ignored variant diagnostics Init syncs a fresh in-memory config, so resolve shared target identities before its first sync as well as when loading saved configuration. A whole-directory symlink exposes ignored skills too. Diagnose agent variants using physical inventory when active discovery has none, while keeping logical counts and merge/copy selection restricted to enabled skills. Cover global/project JSON status and doctor with regressions. Reuse sourcewalk directory and canonical-path helpers so traversal guards remain enforced and path resolution has a single existing owner. * fix(variants): address conversion, counts and selection diagnostics Ignore runtime agent identities when comparing convertible project targets and count logical skills during init. Keep selection warnings separate from naming warnings and preserve agent-named parent skills as ordinary skills. Cover account sync/prune, project ambiguity and overrides in merge/copy modes, and init/status agreement. Focused verification ran in an isolated Linux Codex container, not the devcontainer, as authorized. * refactor(variants): remove obsolete selection helpers Remove the unused FilterSkillsByTarget wrapper and prune agent parameter, cache canonical target aliases once, and restore catalog skip ordering to avoid an unrelated behavior change. Completes the optional cleanup from PR 649 review. * fix(ui): expose localized variant selection diagnostics Show target warnings with source paths, localize ambiguity across preview and detail consumers, and let skipped preview rows add a physical exclude pattern. Show tracked repository variant counts alongside logical skills. Drop display-only rendered cases while retaining mutation protection and plain TypeScript logic coverage. Inspect target states in Clean/Playful light/dark and Traditional Chinese. * docs(variants): explain diagnostics and add sync runbook Document doctor variant_routing and logical/physical counts, diff selection skips, and the nested parent-skill boundary. Keep all four command translations aligned and add isolated account/project E2E scenarios. Both runbook steps passed in the authorized Linux Codex container with separate HOME/XDG/TMPDIR fixtures. Website typecheck and all five locale builds passed. * test(config): use native paths in project conversion fixture The shared-agent regression fixture appended slash-separated suffixes to Windows temporary paths, so project path matching returned no candidates. Build each path with filepath.Join and preserve all conversion assertions. Focused project configuration tests passed in the authorized isolated Linux Codex container, not the devcontainer. Windows CI verifies the platform-specific fixture correction. * fix(ui): recompute shared skill routing for filter previews Evaluate edited include/exclude settings in the complete target map before classifying the draft, so a formerly shared folder no longer keeps its old union when the filters differ. Preserve the saved target configuration. * fix(mcp): keep parent skills when peer variants route elsewhere Do not treat an otherwise eligible variant for another agent as an unserved nested skill. Continue blocking parent publication for explicitly filtered, disabled, ambiguous, or invalid children so filters still hide their files. * fix(ui): distinguish agent selection from naming skips Expose separate naming and selection skip counts on target summaries. Show each applicable remedy in target details and sync previews so ambiguity keeps its filter/override guidance alongside naming and collision hints. * fix(list): include disabled rows in tracked repository counts Count the complete inventory that list displays, including ignored skills and physical variants, without changing the enabled counts used by status, install, or sync. Clone rows before counting to preserve disabled state. * docs: align variant counts and routing recovery guidance Show logical skill and physical variant counts in list/install documentation and keep the four translations aligned with the filtering examples. Explain that agent-named skill parents keep ordinary nested skills and retain the devcontainer-only runbook environment. Removal warnings now recommend a source-local override, since include filters cannot undo agent routing. * fix(mcp): preserve explicit target restrictions on nested variants Limit the differently routed child exemption to automatic layout inference. Frontmatter targets and dashboard source-local overrides must still prevent a parent from publishing files explicitly restricted to another target. * fix(ui): fill target name in naming warning guidance Pass the current target name when rendering localized warning hints so the same naming guidance shown beside the controls does not expose a placeholder in the warning banner. Verified in the populated target preview. --------- Co-authored-by: Willie <egg358358@gmail.com>
170 lines
6.1 KiB
Go
170 lines
6.1 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{
|
|
SharedTargets: sc.SharedTargets,
|
|
Agent: sc.Agent,
|
|
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 := pruneOrphanCopiesWithConfig(t.Name, sc, skills, 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)))
|
|
}
|
|
if warning := variantRemovalWarning(t.Name, sc, skills, res.Pruned, opts.DryRun); warning != "" {
|
|
res.Warnings = append(res.Warnings, warning)
|
|
}
|
|
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...)
|
|
}
|
|
}
|