diff --git a/internal/server/handler_agent_diff_test.go b/internal/server/handler_agent_diff_test.go index 3deefd9aa..7f125109d 100644 --- a/internal/server/handler_agent_diff_test.go +++ b/internal/server/handler_agent_diff_test.go @@ -56,6 +56,36 @@ func TestComputeAgentTargetDiff_LocalFile(t *testing.T) { } } +func TestComputeAgentTargetDiff_SymlinkPointsElsewhere(t *testing.T) { + sourceDir := t.TempDir() + otherDir := t.TempDir() + targetDir := t.TempDir() + + srcFile := filepath.Join(sourceDir, "agent.md") + os.WriteFile(srcFile, []byte("# Agent"), 0644) + otherFile := filepath.Join(otherDir, "agent.md") + os.WriteFile(otherFile, []byte("# Other"), 0644) + + // Symlink points to otherFile, not srcFile + os.Symlink(otherFile, filepath.Join(targetDir, "agent.md")) + + agents := []resource.DiscoveredResource{ + {FlatName: "agent.md", AbsPath: srcFile, RelPath: "agent.md"}, + } + + items := computeAgentTargetDiff(targetDir, agents) + + if len(items) != 1 { + t.Fatalf("expected 1 item, got %d", len(items)) + } + if items[0].Action != "update" { + t.Errorf("expected action 'update', got %q", items[0].Action) + } + if items[0].Reason != "symlink points elsewhere" { + t.Errorf("expected reason 'symlink points elsewhere', got %q", items[0].Reason) + } +} + func TestComputeAgentTargetDiff_InSync(t *testing.T) { sourceDir := t.TempDir() targetDir := t.TempDir() diff --git a/internal/server/handler_diff_stream.go b/internal/server/handler_diff_stream.go index 12f8c38a9..84de9b8c1 100644 --- a/internal/server/handler_diff_stream.go +++ b/internal/server/handler_diff_stream.go @@ -29,6 +29,7 @@ func (s *Server) handleDiffStream(w http.ResponseWriter, r *http.Request) { // Snapshot config under RLock, then release before slow I/O. s.mu.RLock() source := s.cfg.Source + agentsSource := s.agentsSource() globalMode := s.cfg.Mode targets := s.cloneTargets() s.mu.RUnlock() @@ -68,7 +69,6 @@ func (s *Server) handleDiffStream(w http.ResponseWriter, r *http.Request) { } // Agent diffs — discover agents and compute per-target diffs - agentsSource := s.agentsSource() var agents []resource.DiscoveredResource if agentsSource != "" { discovered, _ := resource.AgentKind{}.Discover(agentsSource) diff --git a/internal/server/handler_sync.go b/internal/server/handler_sync.go index b47c98370..b5b4cd5e8 100644 --- a/internal/server/handler_sync.go +++ b/internal/server/handler_sync.go @@ -57,6 +57,11 @@ func (s *Server) handleSync(w http.ResponseWriter, r *http.Request) { // Default to non-dry-run, non-force, empty kind (both) } + if body.Kind != "" && body.Kind != "skill" && body.Kind != "agent" { + writeError(w, http.StatusBadRequest, "invalid kind: must be 'skill', 'agent', or empty") + return + } + globalMode := s.cfg.Mode if globalMode == "" { globalMode = "merge" diff --git a/ui/src/pages/SyncPage.tsx b/ui/src/pages/SyncPage.tsx index 7b700ac94..d2f101cd8 100644 --- a/ui/src/pages/SyncPage.tsx +++ b/ui/src/pages/SyncPage.tsx @@ -573,7 +573,7 @@ function DiffItemRow({ item }: { item: { action: string; skill: string; reason?: