mirror of
https://github.com/runkids/skillshare.git
synced 2026-11-18 18:04:17 +00:00
Three previews disagreed with what sync does to a link no skill or agent maps to. The agent diff, in the CLI and the dashboard, listed every orphan link as a removal. Agent sync prunes a link only in merge mode, and only when it is broken or points into the source, so a live link to another location was listed forever. Both diffs now ask the function prune uses. The CLI diff listed no orphan links at all for merge-mode skills, so a skill removed from the source showed nothing until sync pruned its link. It now lists the links sync.OrphanLink says prune removes. doctor called a broken link "did not create, kept" whenever OwnsLink was false. Prune also removes a broken link under a name the manifest records in any form once no skill maps to it, so doctor told the user to delete by hand a link that sync removes. It now reports those as broken and suggests sync. An empty source counts as "every entry is an orphan"; only a failed discovery turns the check off. Closes #939 Closes #940 Closes #941
92 lines
3.2 KiB
Go
92 lines
3.2 KiB
Go
package server
|
|
|
|
import (
|
|
"skillshare/internal/config"
|
|
"skillshare/internal/resource"
|
|
ssync "skillshare/internal/sync"
|
|
)
|
|
|
|
// Kind constants for diff/sync operations.
|
|
const (
|
|
kindSkill = "skill"
|
|
kindAgent = "agent"
|
|
)
|
|
|
|
// discoverAllAgents discovers all agents (including disabled) from the source directory.
|
|
func discoverAllAgents(agentsSource string) []resource.DiscoveredResource {
|
|
if agentsSource == "" {
|
|
return nil
|
|
}
|
|
discovered, _ := resource.AgentKind{}.Discover(agentsSource)
|
|
return discovered
|
|
}
|
|
|
|
// discoverActiveAgents discovers agents from the given source directory,
|
|
// returning only non-disabled agents. Returns nil if source is empty.
|
|
func discoverActiveAgents(agentsSource string) []resource.DiscoveredResource {
|
|
return resource.ActiveAgents(discoverAllAgents(agentsSource))
|
|
}
|
|
|
|
// agentIgnorePayload returns JSON-serialisable fields describing .agentignore state.
|
|
// Pass pre-discovered agents to avoid duplicate filesystem traversal; nil triggers discovery.
|
|
func agentIgnorePayload(agentsSource string, all []resource.DiscoveredResource) map[string]any {
|
|
r := ssync.NewIgnoreReport(nil, agentsSource, all)
|
|
return map[string]any{
|
|
"agent_ignore_root": r.AgentIgnoreRoot,
|
|
"agent_ignored_count": r.AgentIgnoredCount,
|
|
"agent_ignored_skills": r.AgentIgnoredSkills,
|
|
}
|
|
}
|
|
|
|
// resolveAgentPath returns the expanded agent target path for a target,
|
|
// checking user config first, then builtin defaults. Returns "" if no path.
|
|
func resolveAgentPath(target config.TargetConfig, builtinAgents map[string]config.TargetConfig, name string, projectMode bool) string {
|
|
return ssync.ResolveAgentTargetPath(target, builtinAgents, name, projectMode)
|
|
}
|
|
|
|
// builtinAgentTargets returns the builtin agent target map for the server's mode.
|
|
func (s *Server) builtinAgentTargets() map[string]config.TargetConfig {
|
|
if s.IsProjectMode() {
|
|
return config.ProjectAgentTargets()
|
|
}
|
|
return config.DefaultAgentTargets()
|
|
}
|
|
|
|
// mergeAgentDiffItems appends agent diff items into the existing diffs slice,
|
|
// merging with an existing target entry or creating a new one.
|
|
func mergeAgentDiffItems(diffs []diffTarget, name string, items []diffItem) []diffTarget {
|
|
for i := range diffs {
|
|
if diffs[i].Target == name {
|
|
diffs[i].Items = append(diffs[i].Items, items...)
|
|
return diffs
|
|
}
|
|
}
|
|
return append(diffs, diffTarget{
|
|
Target: name,
|
|
Items: items,
|
|
})
|
|
}
|
|
|
|
// appendAgentDiffs merges agent diff items for every agent-capable target.
|
|
// Unlike sync-matrix, diff must still inspect targets when the source is empty
|
|
// so orphaned synced agents surface as prune drift, matching skills behavior.
|
|
func (s *Server) appendAgentDiffs(diffs []diffTarget, targets map[string]config.TargetConfig, agentsSource, filterTarget string) []diffTarget {
|
|
agents := discoverActiveAgents(agentsSource)
|
|
builtinAgents := s.builtinAgentTargets()
|
|
|
|
for name, target := range targets {
|
|
if filterTarget != "" && filterTarget != name {
|
|
continue
|
|
}
|
|
agentPath := resolveAgentPath(target, builtinAgents, name, s.IsProjectMode())
|
|
if agentPath == "" {
|
|
continue
|
|
}
|
|
if items := computeAgentTargetDiff(name, agentPath, agentsSource, target.AgentsConfig(), agents); len(items) > 0 {
|
|
diffs = mergeAgentDiffItems(diffs, name, items)
|
|
}
|
|
}
|
|
|
|
return diffs
|
|
}
|