From 86ff94fa8aabb59571e11672b13bee0c50db64e4 Mon Sep 17 00:00:00 2001 From: Willie Date: Fri, 9 Oct 2026 11:47:51 +0800 Subject: [PATCH] fix(target): check prefixed naming when turning skills back on Skills-off targets may now keep prefixed naming under a merge mode, but target --skills=true and the dashboard's skills toggle flipped them on without checking, so the next sync skipped the target and its agents. Refuse to turn skills on while the effective naming needs copy mode. --- cmd/skillshare/target_skills.go | 14 ++++++++++++++ internal/server/handler_targets.go | 3 ++- internal/server/handler_targets_test.go | 16 ++++++++++++++++ tests/integration/target_skills_off_test.go | 19 +++++++++++++++++++ 4 files changed, 51 insertions(+), 1 deletion(-) diff --git a/cmd/skillshare/target_skills.go b/cmd/skillshare/target_skills.go index db557d959..e1497d29f 100644 --- a/cmd/skillshare/target_skills.go +++ b/cmd/skillshare/target_skills.go @@ -1,6 +1,7 @@ package main import ( + "cmp" "fmt" "strings" "time" @@ -29,6 +30,13 @@ func stripNoSkillsFlag(args []string) ([]string, bool) { // off saves the config, then removes the folder's links into the source. func setTargetSkillsGlobal(cfg *config.Config, name string, target config.TargetConfig, enabled, dryRun bool) error { start := time.Now() + if enabled { + // An off target may keep a naming its mode cannot sync. + sc := target.SkillsConfig() + if err := config.TargetNamingModeError(sc.TargetNaming, cmp.Or(sc.Mode, cfg.Mode)); err != nil { + return err + } + } res, err := switchTargetSkills(name, enabled, dryRun, func() error { target.EnsureSkills().SetEnabled(enabled) cfg.Targets[name] = target @@ -44,6 +52,12 @@ func setTargetSkillsGlobal(cfg *config.Config, name string, target config.Target func setTargetSkillsProject(cfg *config.ProjectConfig, idx int, enabled, dryRun bool, root string) error { start := time.Now() name := cfg.Targets[idx].Name + if enabled { + sc := cfg.Targets[idx].SkillsConfig() + if err := config.TargetNamingModeError(sc.TargetNaming, sc.Mode); err != nil { + return err + } + } res, err := switchTargetSkills(name, enabled, dryRun, func() error { cfg.Targets[idx].EnsureSkills().SetEnabled(enabled) return cfg.Save(root) diff --git a/internal/server/handler_targets.go b/internal/server/handler_targets.go index 2ac3296ab..e25c158de 100644 --- a/internal/server/handler_targets.go +++ b/internal/server/handler_targets.go @@ -495,7 +495,8 @@ func (s *Server) handleUpdateTarget(w http.ResponseWriter, r *http.Request) { } target.Skills.TargetNaming = *body.TargetNaming } - if body.Mode != nil || body.TargetNaming != nil { + // Turning skills on counts too: an off target may keep a pair its mode cannot sync. + if body.Mode != nil || body.TargetNaming != nil || body.SkillsEnabled != nil && *body.SkillsEnabled { if err := config.TargetNamingModeError(target.SkillsConfig().TargetNaming, cmp.Or(target.Skills.Mode, s.cfg.Mode)); err != nil { writeError(w, http.StatusBadRequest, err.Error()) return diff --git a/internal/server/handler_targets_test.go b/internal/server/handler_targets_test.go index 0db8433ab..c2fe1ecde 100644 --- a/internal/server/handler_targets_test.go +++ b/internal/server/handler_targets_test.go @@ -663,3 +663,19 @@ func TestHandleAddTarget_GlobalPrefixedNamingUnderMergeUsesCopyMode(t *testing.T t.Fatalf("add config dir: got %d %s, mode %q; want copy", rr.Code, rr.Body.String(), tc.SkillsConfig().Mode) } } + +func TestHandleUpdateTarget_ReenablingSkillsChecksPrefixedNaming(t *testing.T) { + s, _ := newTestServer(t) + skills := &config.ResourceTargetConfig{Path: filepath.Join(t.TempDir(), "skills"), TargetNaming: "prefixed"} + skills.SetEnabled(false) // allowed while off: it syncs no skill + s.cfg.Mode = "merge" + s.cfg.Targets = map[string]config.TargetConfig{"claude": {Skills: skills}} + if err := s.saveConfig(); err != nil { + t.Fatal(err) + } + rr := httptest.NewRecorder() + s.handler.ServeHTTP(rr, httptest.NewRequest(http.MethodPatch, "/api/targets/claude", strings.NewReader(`{"skills_enabled":true}`))) + if rr.Code != http.StatusBadRequest || !strings.Contains(rr.Body.String(), "requires copy mode") { + t.Fatalf("re-enable under merge: got %d %s, want 400", rr.Code, rr.Body.String()) + } +} diff --git a/tests/integration/target_skills_off_test.go b/tests/integration/target_skills_off_test.go index 8912dc9d2..889feb9ab 100644 --- a/tests/integration/target_skills_off_test.go +++ b/tests/integration/target_skills_off_test.go @@ -235,3 +235,22 @@ func TestTargetProject_AddNoSkills(t *testing.T) { t.Errorf("project config should record enabled: false:\n%s", cfg) } } + +func TestTargetSkillsOn_RefusesPrefixedNamingOutsideCopyMode(t *testing.T) { + sb := testutil.NewSandbox(t) + defer sb.Cleanup() + targetPath := sb.CreateTarget("claude") + sb.WriteConfig(`source: ` + sb.SourcePath + ` +mode: merge +target_naming: prefixed +targets: + claude: + skills: + path: ` + targetPath + ` + enabled: false +`) + + result := sb.RunCLI("target", "claude", "--skills=true") + result.AssertFailure(t) + result.AssertAnyOutputContains(t, "requires copy mode") +}