fix(target): add global targets in copy mode when they would inherit prefixed

Top-level prefixed naming with a merge global mode is valid while every
target overrides copy, but target add (CLI, dashboard, and Agent config
directories) wrote new targets without a mode, so they inherited the
invalid pair and failed at sync. Share one rule for global and project
additions: write copy mode when the inherited naming needs it.
This commit is contained in:
Willie
2026-10-09 11:26:40 +08:00
parent fae3439647
commit a9e3613282
12 changed files with 63 additions and 11 deletions
+1 -1
View File
@@ -220,7 +220,7 @@ func targetAdd(args []string) error {
return fmt.Errorf("target '%s' already exists", name)
}
skills := &config.ResourceTargetConfig{Path: path}
skills := &config.ResourceTargetConfig{Path: path, Mode: config.NewTargetSkillsMode(cfg.TargetNaming, cfg.Mode)}
skills.SetEnabled(!noSkills)
cfg.Targets[name] = config.TargetConfig{Skills: skills}
if err := cfg.Save(); err != nil {
+2 -2
View File
@@ -98,8 +98,8 @@ func targetAddProject(args []string, root string) error {
if noSkills {
entry.EnsureSkills().SetEnabled(false)
}
if cfg.TargetNaming == "prefixed" {
entry.EnsureSkills().Mode = "copy" // a project target defaults to merge, which prefixed cannot sync
if mode := config.NewTargetSkillsMode(cfg.TargetNaming, ""); mode != "" {
entry.EnsureSkills().Mode = mode // a project target defaults to merge
}
cfg.Targets = append(cfg.Targets, entry)
+5 -1
View File
@@ -172,7 +172,11 @@ func (c *Config) AddAgentConfigDirTarget(name, agent, dir, cli string) (string,
if c.Targets == nil {
c.Targets = map[string]TargetConfig{}
}
c.Targets[name] = TargetConfig{Agent: agent, ConfigDir: dir, CLI: cli, defaultTargetNaming: c.TargetNaming}
tc := TargetConfig{Agent: agent, ConfigDir: dir, CLI: cli, defaultTargetNaming: c.TargetNaming}
if mode := NewTargetSkillsMode(c.TargetNaming, c.Mode); mode != "" {
tc.Skills = &ResourceTargetConfig{Mode: mode}
}
c.Targets[name] = tc
if err := c.expandAgentConfigDirs(); err != nil {
delete(c.Targets, name)
return "", err
+9
View File
@@ -62,6 +62,15 @@ func TargetNamingModeError(naming, mode string) error {
return fmt.Errorf("target naming %q requires copy mode, but the target syncs in %q mode", "prefixed", mode)
}
// NewTargetSkillsMode is the skills mode a new target is written with: copy when it
// would otherwise inherit a naming its inherited mode cannot honour, else empty (inherit).
func NewTargetSkillsMode(naming, mode string) string {
if TargetNamingModeError(naming, mode) != nil {
return "copy"
}
return ""
}
// ResourceTargetConfig holds per-resource-kind target configuration (skills, agents, etc.).
type ResourceTargetConfig struct {
Path string `yaml:"path,omitempty"`
+5 -2
View File
@@ -304,6 +304,9 @@ func (s *Server) handleAddTarget(w http.ResponseWriter, r *http.Request) {
skillsOff := body.SkillsEnabled != nil && !*body.SkillsEnabled
tc := config.TargetConfig{Skills: &config.ResourceTargetConfig{Path: body.Path}, Instructions: body.Instructions}
if !s.IsProjectMode() {
tc.Skills.Mode = config.NewTargetSkillsMode(s.cfg.TargetNaming, s.cfg.Mode)
}
tc.Skills.SetEnabled(!skillsOff)
if body.AgentPath != "" {
tc.Agents = &config.ResourceTargetConfig{Path: body.AgentPath}
@@ -316,8 +319,8 @@ func (s *Server) handleAddTarget(w http.ResponseWriter, r *http.Request) {
if skillsOff {
entry.EnsureSkills().SetEnabled(false)
}
if s.projectCfg.TargetNaming == "prefixed" {
entry.EnsureSkills().Mode = "copy" // a project target defaults to merge, which prefixed cannot sync
if mode := config.NewTargetSkillsMode(s.projectCfg.TargetNaming, ""); mode != "" {
entry.EnsureSkills().Mode = mode // a project target defaults to merge
}
s.projectCfg.Targets = append(s.projectCfg.Targets, entry)
}
+25
View File
@@ -638,3 +638,28 @@ func TestHandleAddTarget_ProjectPrefixedNamingUsesCopyMode(t *testing.T) {
t.Fatalf("added target invalid: err = %v, invalid = %v", err, invalid)
}
}
func TestHandleAddTarget_GlobalPrefixedNamingUnderMergeUsesCopyMode(t *testing.T) {
s, _ := newTestServer(t)
s.cfg.Mode, s.cfg.TargetNaming = "merge", "prefixed" // valid while every target overrides copy
if err := s.saveConfig(); err != nil {
t.Fatal(err)
}
rr := httptest.NewRecorder()
body := `{"name":"cursor","path":"` + filepath.ToSlash(filepath.Join(t.TempDir(), "skills")) + `"}`
s.handler.ServeHTTP(rr, httptest.NewRequest(http.MethodPost, "/api/targets", strings.NewReader(body)))
if rr.Code != http.StatusOK {
t.Fatalf("add: got %d %s", rr.Code, rr.Body.String())
}
if tc := s.cfg.Targets["cursor"]; tc.SkillsConfig().Mode != "copy" {
mode := tc.SkillsConfig().Mode
t.Fatalf("new target mode = %q, want copy", mode)
}
rr = httptest.NewRecorder()
body = `{"name":"claude-work","agent":"claude","configDir":"` + filepath.ToSlash(filepath.Join(t.TempDir(), ".claude-work")) + `"}`
s.handler.ServeHTTP(rr, httptest.NewRequest(http.MethodPost, "/api/targets", strings.NewReader(body)))
if tc := s.cfg.Targets["claude-work"]; rr.Code != http.StatusOK || tc.SkillsConfig().Mode != "copy" {
t.Fatalf("add config dir: got %d %s, mode %q; want copy", rr.Code, rr.Body.String(), tc.SkillsConfig().Mode)
}
}
@@ -289,3 +289,14 @@ func TestDiff_TargetNamingChange_ReportsRename(t *testing.T) {
})
}
}
func TestTargetAdd_GlobalPrefixedNamingUnderMergeUsesCopyMode(t *testing.T) {
sb := testutil.NewSandbox(t)
defer sb.Cleanup()
targetPath := prefixedFixture(t, sb)
writeNamingConfig(sb, targetPath, "prefixed", "copy")
sb.WriteConfig(strings.Replace(sb.ReadFile(sb.ConfigPath), "targets:", "mode: merge\ntargets:", 1))
sb.RunCLI("target", "add", "cursor", sb.CreateTarget("cursor")).AssertSuccess(t)
sb.RunCLI("sync").AssertOutputNotContains(t, "requires copy mode")
}
+1 -1
View File
@@ -268,7 +268,7 @@ skillshare sync
- Relative links to sibling skills (`../other-skill/`) are not rewritten, the same as `flat` in copy mode.
- The name becomes what the tool shows; in Claude Code it is the slash command, e.g. `/mattpocock-skills-prototype`.
`prefixed` needs copy mode because merge links point at the source, where `name:` cannot change. A target that resolves to `prefixed` in merge or symlink mode fails validation and is skipped by sync. In a project whose top-level `target_naming` is `prefixed`, `target add` gives the new target copy mode.
`prefixed` needs copy mode because merge links point at the source, where `name:` cannot change. A target that resolves to `prefixed` in merge or symlink mode fails validation and is skipped by sync. When a new target would inherit `prefixed` in a mode other than copy (a project target defaults to merge), `target add` gives it copy mode.
```yaml
targets:
@@ -269,7 +269,7 @@ skillshare sync
- 兄弟 Skill への相対リンク(`../other-skill/`)は書き換えられません。これは copy mode の `flat` と同じです。
- この名前がツールに表示される名前になります。Claude Code ではスラッシュコマンドになります。例: `/mattpocock-skills-prototype`。
`prefixed` は copy mode が必要です。merge のリンクは source を指しており、そこでは `name:` を変更できないためです。merge mode または symlink mode で `prefixed` に解決される Target は、バリデーションに失敗し、sync でスキップされます。プロジェクトのトップレベルの `target_naming` が `prefixed` の場合、`target add` は新しい Target を copy mode にします。
`prefixed` は copy mode が必要です。merge のリンクは source を指しており、そこでは `name:` を変更できないためです。merge mode または symlink mode で `prefixed` に解決される Target は、バリデーションに失敗し、sync でスキップされます。新しい Target が copy 以外の mode で `prefixed` を継承する場合(プロジェクトの Target は既定で merge)、`target add` はその Target を copy mode にします。
```yaml
targets:
@@ -268,7 +268,7 @@ skillshare sync
- 형제 skill로의 상대 링크(`../other-skill/`)는 다시 쓰이지 않으며, 이는 copy mode의 `flat`과 같습니다.
- 이 이름이 도구에 표시되는 이름이 됩니다. Claude Code에서는 slash command이며, 예: `/mattpocock-skills-prototype`.
`prefixed`는 merge 링크가 source를 가리키고 그곳의 `name:`은 바꿀 수 없으므로 copy mode가 필요합니다. merge 또는 symlink mode에서 `prefixed`로 결정되는 target은 검증에 실패하며 sync에서 건너뛰어집니다. 프로젝트 최상위 `target_naming`이 `prefixed`이면 `target add`는 새 target을 copy mode로 추가합니다.
`prefixed`는 merge 링크가 source를 가리키고 그곳의 `name:`은 바꿀 수 없으므로 copy mode가 필요합니다. merge 또는 symlink mode에서 `prefixed`로 결정되는 target은 검증에 실패하며 sync에서 건너뛰어집니다. 새 target이 copy 이외의 mode에서 `prefixed`를 상속하게 되면(프로젝트 target 기본값은 merge) `target add`는 새 target을 copy mode로 추가합니다.
```yaml
targets:
@@ -268,7 +268,7 @@ skillshare sync
- 指向同级 skill 的相对链接(`../other-skill/`)不会被改写,与 copy 模式下的 `flat` 相同。
- 该名称就是工具中显示的名称;在 Claude Code 中它是 slash command,例如 `/mattpocock-skills-prototype`。
`prefixed` 需要 copy 模式,因为 merge 链接指向 source,而 source 中的 `name:` 不能被修改。在 merge 或 symlink 模式下解析为 `prefixed` 的 target 会校验失败,并被 sync 跳过。项目顶层的 `target_naming` 为 `prefixed` 时,`target add` 会让新 target 使用 copy 模式。
`prefixed` 需要 copy 模式,因为 merge 链接指向 source,而 source 中的 `name:` 不能被修改。在 merge 或 symlink 模式下解析为 `prefixed` 的 target 会校验失败,并被 sync 跳过。新 target 若会在 copy 以外的模式下继承 `prefixed`(项目 target 默认为 merge),`target add` 会让它使用 copy 模式。
```yaml
targets:
@@ -268,7 +268,7 @@ skillshare sync
- 指向同層 skill 的相對連結(`../other-skill/`)不會被改寫,與 copy mode 下的 `flat` 相同。
- 該名稱就是工具中顯示的名稱;在 Claude Code 中它是 slash command,例如 `/mattpocock-skills-prototype`。
`prefixed` 需要 copy mode,因為 merge 連結指向 source,而 source 中的 `name:` 不能被修改。在 merge 或 symlink mode 下解析為 `prefixed` 的 target 會驗證失敗,並被 sync 略過。專案最上層的 `target_naming` 為 `prefixed` 時,`target add` 會讓新 target 使用 copy mode。
`prefixed` 需要 copy mode,因為 merge 連結指向 source,而 source 中的 `name:` 不能被修改。在 merge 或 symlink mode 下解析為 `prefixed` 的 target 會驗證失敗,並被 sync 略過。新 target 若會在 copy 以外的 mode 下繼承 `prefixed`(專案 target 預設為 merge),`target add` 會讓它使用 copy mode。
```yaml
targets: