Simplify load_marketplace_skill_names - remove unused source field extraction

Address review feedback:
- Remove load_marketplace_plugins function entirely
- Simplify load_marketplace_skill_names to directly extract skill names
- Update load_public_skills to use simplified interface
- No longer extract source field that was immediately discarded

This follows the "don't extract data you don't use" principle.

Co-authored-by: openhands <openhands@all-hands.dev>

Author: openhands-agent

.pr/demonstrate_marketplace_path.py

@@ -0,0 +1,54 @@
+#!/usr/bin/env python3
+"""Demonstration script for the marketplace_path feature.
+
+This script demonstrates:
+1. Loading skills from the default marketplace
+2. Loading skills with marketplace_path=None (all skills)
+"""
+
+import sys
+
+sys.path.insert(0, "openhands-sdk")
+
+from openhands.sdk.context.skills import load_public_skills
+
+
+def main():
+    print("=" * 60)
+    print("Marketplace Path Feature Demonstration")
+    print("=" * 60)
+
+    # 1. Load from default marketplace
+    print("\n1. Loading skills from default marketplace...")
+    default_skills = load_public_skills()
+    print(f"   Loaded {len(default_skills)} skills from default marketplace:")
+    for skill in sorted(default_skills, key=lambda s: s.name)[:5]:
+        print(f"   - {skill.name}")
+    if len(default_skills) > 5:
+        print(f"   ... and {len(default_skills) - 5} more")
+
+    # 2. Load all skills (no marketplace filtering)
+    print("\n2. Loading ALL skills (marketplace_path=None)...")
+    all_skills = load_public_skills(marketplace_path=None)
+    print(f"   Loaded {len(all_skills)} skills without filtering:")
+    for skill in sorted(all_skills, key=lambda s: s.name)[:5]:
+        print(f"   - {skill.name}")
+    if len(all_skills) > 5:
+        print(f"   ... and {len(all_skills) - 5} more")
+
+    # Verify feature works
+    print("\n" + "=" * 60)
+    print("VERIFICATION:")
+    if len(default_skills) > 0 and len(all_skills) >= len(default_skills):
+        print("✓ Default marketplace loaded successfully")
+        print("✓ All skills (no filter) loaded successfully")
+        print("✓ marketplace_path parameter works correctly!")
+    else:
+        print("✗ Something went wrong")
+        return 1
+    print("=" * 60)
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

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

@@ -853,7 +853,7 @@ def load_project_skills(work_dir: str | Path) -> list[Skill]:
 
 def load_marketplace_skill_names(
     repo_path: Path, marketplace_path: str
-) -> set[str] | None:
+) -> list[str] | None:
     """Load the list of skill names from a marketplace manifest file.
 
     Uses the existing Marketplace model from openhands.sdk.plugin to parse
@@ -864,30 +864,7 @@ def load_marketplace_skill_names(
         marketplace_path: Relative path to the marketplace JSON file within the repo.
 
     Returns:
-        Set of skill names to load, or None if marketplace file not found or invalid.
-    """
-    result = load_marketplace_plugins(repo_path, marketplace_path)
-    if result is None:
-        return None
-    return {name for name, _ in result}
-
-
-def load_marketplace_plugins(
-    repo_path: Path, marketplace_path: str
-) -> list[tuple[str, str | None]] | None:
-    """Load plugin names and sources from a marketplace manifest file.
-
-    Uses the existing Marketplace model from openhands.sdk.plugin to parse
-    the marketplace JSON file and extract plugin information.
-
-    Args:
-        repo_path: Path to the local repository.
-        marketplace_path: Relative path to the marketplace JSON file within the repo.
-
-    Returns:
-        List of (skill_name, source) tuples where source is the plugin source string
-        (e.g., "./skill-name" or "owner/repo:skills/skill-name"), or None if
-        marketplace file not found or invalid.
+        List of skill names to load, or None if marketplace file not found or invalid.
     """
     from openhands.sdk.plugin import Marketplace
 
@@ -903,15 +880,13 @@ def load_marketplace_plugins(
         # Use Marketplace model for validation and parsing
         marketplace = Marketplace.model_validate({**data, "path": str(repo_path)})
 
-        plugins = []
-        for plugin in marketplace.plugins:
-            source = plugin.source if isinstance(plugin.source, str) else None
-            plugins.append((plugin.name, source))
+        skill_names = [plugin.name for plugin in marketplace.plugins]
 
         logger.debug(
-            f"Loaded {len(plugins)} plugins from marketplace: {marketplace_path}"
+            f"Loaded {len(skill_names)} skill names from marketplace: "
+            f"{marketplace_path}"
         )
-        return plugins
+        return skill_names
 
     except json.JSONDecodeError as e:
         logger.warning(f"Failed to parse marketplace JSON {marketplace_file}: {e}")
@@ -988,10 +963,9 @@ def load_public_skills(
         # Load the marketplace to determine which skills to include
         skill_names_to_load: list[str] | None = None
         if marketplace_path:
-            marketplace_plugins = load_marketplace_plugins(repo_path, marketplace_path)
-            if marketplace_plugins is not None:
-                # Extract skill names from marketplace (ignore source field)
-                skill_names_to_load = [name for name, _ in marketplace_plugins]
+            skill_names_to_load = load_marketplace_skill_names(
+                repo_path, marketplace_path
+            )
 
         # Find the skills directory
         skills_dir = repo_path / "skills"

tests/sdk/context/skill/test_load_public_skills.py

@@ -641,7 +641,7 @@ def test_load_marketplace_skill_names_returns_skill_names(mock_repo_with_marketp
     )
 
     assert skill_names is not None
-    assert skill_names == {"git", "docker"}
+    assert set(skill_names) == {"git", "docker"}
 
 
 def test_load_marketplace_skill_names_returns_none_when_file_missing(tmp_path):