Files
skillshare/internal/server/handler_targets.go
T
Willie ccdafd3293 feat(sync): add target_naming config option (flat/standard)
Add per-target target_naming setting that controls how skill directories
are named in sync targets. 'flat' (default) preserves the existing
flattened __ separator behavior. 'standard' uses the SKILL.md name field
directly, following the Agent Skills specification.

Standard mode:
- Validates SKILL.md names match directory basenames
- Detects and skips name collisions with warnings
- Auto-migrates managed entries when switching from flat to standard
- Preserves legacy entries when bare name is already occupied

Also includes:
- Per-target toggle via CLI (--target-naming), TUI (N key), and Web UI
- Collision output redesigned as deduplicated compact summary
- Config inheritance: global target_naming → per-target override
- JSON schema + UI validation for the new field

Closes #110
2026-04-01 00:32:49 +08:00

409 lines
10 KiB
Go

package server
import (
"encoding/json"
"io"
"net/http"
"os"
"path/filepath"
"time"
"skillshare/internal/config"
ssync "skillshare/internal/sync"
"skillshare/internal/utils"
)
type targetItem struct {
Name string `json:"name"`
Path string `json:"path"`
Mode string `json:"mode"`
TargetNaming string `json:"targetNaming"`
Status string `json:"status"`
LinkedCount int `json:"linkedCount"`
LocalCount int `json:"localCount"`
Include []string `json:"include"`
Exclude []string `json:"exclude"`
ExpectedSkillCount int `json:"expectedSkillCount"`
}
func (s *Server) handleListTargets(w http.ResponseWriter, r *http.Request) {
// Snapshot config under RLock, then release before I/O.
s.mu.RLock()
source := s.cfg.Source
cfgMode := s.cfg.Mode
targets := s.cloneTargets()
s.mu.RUnlock()
globalMode := cfgMode
if globalMode == "" {
globalMode = "merge"
}
items := make([]targetItem, 0, len(targets))
discovered, discoveredErr := ssync.DiscoverSourceSkills(source)
for name, target := range targets {
sc := target.SkillsConfig()
mode := sc.Mode
if mode == "" {
mode = globalMode
}
item := targetItem{
Name: name,
Path: sc.Path,
Mode: mode,
TargetNaming: config.EffectiveTargetNaming(sc.TargetNaming),
Include: func() []string {
if len(sc.Include) == 0 {
return []string{}
}
return append([]string(nil), sc.Include...)
}(),
Exclude: func() []string {
if len(sc.Exclude) == 0 {
return []string{}
}
return append([]string(nil), sc.Exclude...)
}(),
}
switch mode {
case "merge":
if discoveredErr == nil {
filtered, err := ssync.FilterSkills(discovered, sc.Include, sc.Exclude)
if err != nil {
writeError(w, http.StatusBadRequest, "invalid include/exclude for target "+name+": "+err.Error())
return
}
filtered = ssync.FilterSkillsByTarget(filtered, name)
item.ExpectedSkillCount = len(filtered)
}
status, linked, local := ssync.CheckStatusMerge(sc.Path, source)
item.Status = status.String()
item.LinkedCount = linked
item.LocalCount = local
case "copy":
if discoveredErr == nil {
filtered, err := ssync.FilterSkills(discovered, sc.Include, sc.Exclude)
if err != nil {
writeError(w, http.StatusBadRequest, "invalid include/exclude for target "+name+": "+err.Error())
return
}
filtered = ssync.FilterSkillsByTarget(filtered, name)
item.ExpectedSkillCount = len(filtered)
}
status, managed, local := ssync.CheckStatusCopy(sc.Path)
item.Status = status.String()
item.LinkedCount = managed // reuse field for managed count
item.LocalCount = local
default:
status := ssync.CheckStatus(sc.Path, source)
item.Status = status.String()
}
items = append(items, item)
}
// Count source skills for drift detection
sourceSkillCount := 0
if discoveredErr == nil {
sourceSkillCount = len(discovered)
}
writeJSON(w, map[string]any{"targets": items, "sourceSkillCount": sourceSkillCount})
}
func (s *Server) handleAddTarget(w http.ResponseWriter, r *http.Request) {
start := time.Now()
s.mu.Lock()
defer s.mu.Unlock()
var body struct {
Name string `json:"name"`
Path string `json:"path"`
}
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
writeError(w, http.StatusBadRequest, "invalid JSON body")
return
}
if body.Name == "" {
writeError(w, http.StatusBadRequest, "name is required")
return
}
// In project mode, path can be resolved from known targets
if body.Path == "" {
if s.IsProjectMode() {
if known, ok := config.LookupProjectTarget(body.Name); ok {
body.Path = known.Path
} else {
writeError(w, http.StatusBadRequest, "unknown target, path is required")
return
}
} else {
writeError(w, http.StatusBadRequest, "name and path are required")
return
}
}
if _, exists := s.cfg.Targets[body.Name]; exists {
writeError(w, http.StatusConflict, "target already exists: "+body.Name)
return
}
s.cfg.Targets[body.Name] = config.TargetConfig{Skills: &config.ResourceTargetConfig{Path: body.Path}}
// In project mode, also update the project config
if s.IsProjectMode() {
s.projectCfg.Targets = append(s.projectCfg.Targets, config.ProjectTargetEntry{Name: body.Name})
}
if err := s.saveAndReloadConfig(); err != nil {
writeError(w, http.StatusInternalServerError, err.Error())
return
}
s.writeOpsLog("target", "ok", start, map[string]any{
"action": "add",
"name": body.Name,
"target": body.Path,
"scope": "ui",
}, "")
writeJSON(w, map[string]any{"success": true})
}
func (s *Server) handleRemoveTarget(w http.ResponseWriter, r *http.Request) {
start := time.Now()
s.mu.Lock()
defer s.mu.Unlock()
name := r.PathValue("name")
target, exists := s.cfg.Targets[name]
if !exists {
writeError(w, http.StatusNotFound, "target not found: "+name)
return
}
sc := target.SkillsConfig()
// Clean up symlinks/manifest from the target before deleting from config
info, err := os.Lstat(sc.Path)
if err == nil {
if info.Mode()&os.ModeSymlink != 0 {
// Symlink mode: entire directory is a symlink
os.Remove(sc.Path)
} else if info.IsDir() {
// Remove manifest if present (merge/copy mode)
ssync.RemoveManifest(sc.Path)
// Merge mode: remove individual skill symlinks pointing to source
s.unlinkMergeSymlinks(sc.Path)
}
}
delete(s.cfg.Targets, name)
// In project mode, also remove from project config
if s.IsProjectMode() {
filtered := make([]config.ProjectTargetEntry, 0, len(s.projectCfg.Targets))
for _, t := range s.projectCfg.Targets {
if t.Name != name {
filtered = append(filtered, t)
}
}
s.projectCfg.Targets = filtered
}
if err := s.saveAndReloadConfig(); err != nil {
writeError(w, http.StatusInternalServerError, err.Error())
return
}
s.writeOpsLog("target", "ok", start, map[string]any{
"action": "remove",
"name": name,
"target": sc.Path,
"scope": "ui",
}, "")
writeJSON(w, map[string]any{"success": true, "name": name})
}
func (s *Server) handleUpdateTarget(w http.ResponseWriter, r *http.Request) {
start := time.Now()
s.mu.Lock()
defer s.mu.Unlock()
name := r.PathValue("name")
target, exists := s.cfg.Targets[name]
if !exists {
writeError(w, http.StatusNotFound, "target not found: "+name)
return
}
var body struct {
Include *[]string `json:"include"` // null = no change, [] = clear
Exclude *[]string `json:"exclude"`
Mode *string `json:"mode"`
TargetNaming *string `json:"target_naming"`
}
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
writeError(w, http.StatusBadRequest, "invalid JSON body")
return
}
target.EnsureSkills()
// Validate patterns
if body.Include != nil {
if _, err := ssync.FilterSkills(nil, *body.Include, nil); err != nil {
writeError(w, http.StatusBadRequest, "invalid include pattern: "+err.Error())
return
}
target.Skills.Include = *body.Include
}
if body.Exclude != nil {
if _, err := ssync.FilterSkills(nil, nil, *body.Exclude); err != nil {
writeError(w, http.StatusBadRequest, "invalid exclude pattern: "+err.Error())
return
}
target.Skills.Exclude = *body.Exclude
}
if body.Mode != nil {
switch *body.Mode {
case "merge", "symlink", "copy":
target.Skills.Mode = *body.Mode
default:
writeError(w, http.StatusBadRequest, "invalid mode: "+*body.Mode+"; must be merge, symlink, or copy")
return
}
}
if body.TargetNaming != nil {
if !config.IsValidTargetNaming(*body.TargetNaming) {
writeError(w, http.StatusBadRequest, "invalid target_naming: "+*body.TargetNaming+"; must be flat or standard")
return
}
target.Skills.TargetNaming = *body.TargetNaming
}
s.cfg.Targets[name] = target
// In project mode, also update the project config
if s.IsProjectMode() {
for i := range s.projectCfg.Targets {
if s.projectCfg.Targets[i].Name == name {
sk := s.projectCfg.Targets[i].EnsureSkills()
if body.Include != nil {
sk.Include = *body.Include
}
if body.Exclude != nil {
sk.Exclude = *body.Exclude
}
if body.Mode != nil {
sk.Mode = *body.Mode
}
if body.TargetNaming != nil {
sk.TargetNaming = *body.TargetNaming
}
break
}
}
}
if err := s.saveAndReloadConfig(); err != nil {
writeError(w, http.StatusInternalServerError, err.Error())
return
}
hasFilter := body.Include != nil || body.Exclude != nil
hasSetting := body.Mode != nil || body.TargetNaming != nil
action := "filter"
if hasSetting && hasFilter {
action = "settings+filter"
} else if hasSetting {
action = "settings"
}
s.writeOpsLog("target", "ok", start, map[string]any{
"action": action,
"name": name,
"scope": "ui",
}, "")
writeJSON(w, map[string]any{"success": true})
}
// unlinkMergeSymlinks removes symlinks in targetPath that point under the
// source directory and copies the skill contents back as real files.
func (s *Server) unlinkMergeSymlinks(targetPath string) {
entries, err := os.ReadDir(targetPath)
if err != nil {
return
}
absSource, err := filepath.Abs(s.cfg.Source)
if err != nil {
return
}
absSourcePrefix := absSource + string(filepath.Separator)
for _, entry := range entries {
skillPath := filepath.Join(targetPath, entry.Name())
if !utils.IsSymlinkOrJunction(skillPath) {
continue
}
absLink, err := utils.ResolveLinkTarget(skillPath)
if err != nil {
continue
}
if !utils.PathHasPrefix(absLink, absSourcePrefix) {
continue
}
// Remove symlink and copy the skill back if source still exists
os.Remove(skillPath)
if _, statErr := os.Stat(absLink); statErr == nil {
_ = copySkillDir(absLink, skillPath)
}
}
}
// copySkillDir copies a directory tree from src to dst.
func copySkillDir(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())
}
srcFile, err := os.Open(path)
if err != nil {
return err
}
defer srcFile.Close()
dstFile, err := os.OpenFile(dstPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, info.Mode())
if err != nil {
return err
}
defer dstFile.Close()
_, err = io.Copy(dstFile, srcFile)
return err
})
}