Support microagents/ directory in load_org_skills for backwards compat

The existing openhands-config repo uses microagents/ directory. Update
load_org_skills() to check both skills/ (preferred) and microagents/
(legacy), matching the agent-server's load_org_skills_from_url() behavior.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: zparnold

openhands-sdk/openhands/sdk/context/skills/skill.py

@@ -934,37 +934,47 @@ def load_org_skills(
             logger.warning("Failed to access org skills repository")
             return all_skills
 
-        # Load skills from the local repository
-        skills_dir = repo_path / "skills"
-        if not skills_dir.exists():
-            logger.warning(
-                f"Skills directory not found in org repository: {skills_dir}"
-            )
-            return all_skills
-
-        # Find SKILL.md directories (AgentSkills format) and regular .md files
-        skill_md_files = find_skill_md_directories(skills_dir)
-        skill_md_dirs = {skill_md.parent for skill_md in skill_md_files}
-        regular_md_files = find_regular_md_files(skills_dir, skill_md_dirs)
-
-        all_skill_files = list(skill_md_files) + list(regular_md_files)
-        logger.info(
-            f"Found {len(all_skill_files)} skill files in org skills repository"
-        )
+        # Load skills from skills/ (preferred) and microagents/ (legacy)
+        for dir_name in ("skills", "microagents"):
+            search_dir = repo_path / dir_name
+            if not search_dir.exists():
+                continue
 
-        for skill_file in all_skill_files:
-            try:
-                skill = Skill.load(
-                    path=skill_file,
-                    skill_base_dir=repo_path,
-                )
-                if skill is None:
+            skill_md_files = find_skill_md_directories(search_dir)
+            skill_md_dirs = {skill_md.parent for skill_md in skill_md_files}
+            regular_md_files = find_regular_md_files(search_dir, skill_md_dirs)
+
+            all_skill_files = list(skill_md_files) + list(regular_md_files)
+            logger.info(f"Found {len(all_skill_files)} skill files in org {dir_name}/")
+
+            existing_names = {s.name for s in all_skills}
+            for skill_file in all_skill_files:
+                try:
+                    skill = Skill.load(
+                        path=skill_file,
+                        skill_base_dir=repo_path,
+                    )
+                    if skill is None:
+                        continue
+                    if skill.name in existing_names:
+                        logger.debug(
+                            f"Skipping duplicate org skill '{skill.name}' "
+                            f"from {dir_name}/"
+                        )
+                        continue
+                    all_skills.append(skill)
+                    existing_names.add(skill.name)
+                    logger.debug(f"Loaded org skill: {skill.name}")
+                except Exception as e:
+                    logger.warning(
+                        f"Failed to load skill from {skill_file.name}: {str(e)}"
+                    )
                     continue
-                all_skills.append(skill)
-                logger.debug(f"Loaded org skill: {skill.name}")
-            except Exception as e:
-                logger.warning(f"Failed to load skill from {skill_file.name}: {str(e)}")
-                continue
+
+        if not all_skills:
+            logger.warning(
+                "No skills/ or microagents/ directory found in org repository"
+            )
 
     except Exception as e:
         logger.warning(f"Failed to load org skills from {repo_url}: {str(e)}")