openhands-agent-server 1.35.0__tar.gz → 1.36.1__tar.gz

{openhands_agent_server-1.35.0 → openhands_agent_server-1.36.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openhands-agent-server
-Version: 1.35.0
+Version: 1.36.1
 Summary: OpenHands Agent Server - REST/WebSocket interface for OpenHands AI Agent
 Project-URL: Source, https://github.com/OpenHands/software-agent-sdk
 Project-URL: Homepage, https://github.com/OpenHands/software-agent-sdk

{openhands_agent_server-1.35.0 → openhands_agent_server-1.36.1}/openhands/agent_server/plugins_router.py

@@ -16,6 +16,7 @@ from pydantic import BaseModel, Field
 
 from openhands.agent_server.plugins_service import (
     MarketplacePluginInfo,
+    PluginSkillSummary,
     service_disable_plugin,
     service_enable_plugin,
     service_get_installed_plugin,
@@ -23,11 +24,13 @@ from openhands.agent_server.plugins_service import (
     service_install_plugin,
     service_list_available_plugins,
     service_list_installed_plugins,
+    service_load_plugin_contents,
+    service_plugin_contents,
     service_uninstall_plugin,
     service_update_plugin,
 )
 from openhands.sdk.extensions.fetch import ExtensionFetchError
-from openhands.sdk.plugin import InstalledPluginInfo, PluginFetchError
+from openhands.sdk.plugin import InstalledPluginInfo, Plugin, PluginFetchError
 
 
 plugins_router = APIRouter(prefix="/plugins", tags=["Plugins"])
@@ -73,6 +76,14 @@ class PluginInfo(BaseModel):
     name: str
     version: str = ""
     description: str = ""
+    path: str = Field(default="", description="Path to the plugin directory")
+    skills: list[PluginSkillSummary] = Field(
+        default_factory=list, description="Skills bundled in the plugin"
+    )
+    files: list[str] = Field(
+        default_factory=list,
+        description="Plugin files, relative to the plugin directory",
+    )
 
 
 class PluginsResponse(BaseModel):
@@ -119,6 +130,14 @@ class InstalledPluginResponse(BaseModel):
     )
     installed_at: str = Field(description="ISO 8601 timestamp of installation")
     install_path: str = Field(description="Path where the plugin is installed")
+    skills: list[PluginSkillSummary] | None = Field(
+        default=None,
+        description="Skills bundled in the plugin (None if it failed to load)",
+    )
+    files: list[str] | None = Field(
+        default=None,
+        description="Plugin files, relative to install_path (None if load failed)",
+    )
 
     @classmethod
     def from_plugin_info(cls, info: InstalledPluginInfo) -> "InstalledPluginResponse":
@@ -173,6 +192,28 @@ class MarketplaceCatalogResponse(BaseModel):
     plugins: list[MarketplacePluginInfo]
 
 
+def _installed_response(info: InstalledPluginInfo) -> InstalledPluginResponse:
+    """Build an installed-plugin response enriched with the plugin's contents."""
+    response = InstalledPluginResponse.from_plugin_info(info)
+    contents = service_load_plugin_contents(info.install_path)
+    if contents is not None:
+        response.skills, response.files = contents
+    return response
+
+
+def _plugin_info(plugin: Plugin) -> PluginInfo:
+    """Build an available-plugin summary including its contents."""
+    skills, files = service_plugin_contents(plugin)
+    return PluginInfo(
+        name=plugin.name,
+        version=plugin.version,
+        description=plugin.description,
+        path=plugin.path,
+        skills=skills,
+        files=files,
+    )
+
+
 # ---------------------------------------------------------------------------
 # Endpoints
 # ---------------------------------------------------------------------------
@@ -193,12 +234,7 @@ def get_plugins(request: PluginsRequest) -> PluginsResponse:
         load_project=request.load_project,
         project_dir=request.project_dir,
     )
-    return PluginsResponse(
-        plugins=[
-            PluginInfo(name=p.name, version=p.version, description=p.description)
-            for p in plugins
-        ]
-    )
+    return PluginsResponse(plugins=[_plugin_info(p) for p in plugins])
 
 
 @plugins_router.post(
@@ -219,7 +255,7 @@ def install_plugin_endpoint(request: InstallPluginRequest) -> InstalledPluginRes
             repo_path=request.repo_path,
             force=request.force,
         )
-        return InstalledPluginResponse.from_plugin_info(info)
+        return _installed_response(info)
     except FileExistsError:
         raise HTTPException(
             status_code=409,
@@ -242,7 +278,7 @@ def list_installed_plugins_endpoint() -> InstalledPluginsListResponse:
     """List all installed plugins (enabled and disabled)."""
     plugins = service_list_installed_plugins()
     return InstalledPluginsListResponse(
-        plugins=[InstalledPluginResponse.from_plugin_info(info) for info in plugins]
+        plugins=[_installed_response(info) for info in plugins]
     )
 
 
@@ -261,7 +297,7 @@ def get_installed_plugin_endpoint(
             status_code=404,
             detail=f"Plugin '{plugin_name}' is not installed",
         )
-    return InstalledPluginResponse.from_plugin_info(info)
+    return _installed_response(info)
 
 
 @plugins_router.patch(
@@ -312,7 +348,7 @@ def refresh_plugin_endpoint(plugin_name: PluginNamePath) -> UpdatePluginResponse
         )
     return UpdatePluginResponse(
         message=f"Plugin '{plugin_name}' updated",
-        plugin=InstalledPluginResponse.from_plugin_info(info),
+        plugin=_installed_response(info),
     )
 
 

{openhands_agent_server-1.35.0 → openhands_agent_server-1.36.1}/openhands/agent_server/plugins_service.py

@@ -14,6 +14,7 @@ counterparts (``skills_service.py``) so the router stays focused on HTTP:
 """
 
 import json
+import os
 from pathlib import Path
 from time import monotonic
 
@@ -127,6 +128,73 @@ def service_list_available_plugins(
     return list(available.values())
 
 
+# ---------------------------------------------------------------------------
+# Plugin contents (bundled skills + file listing)
+# ---------------------------------------------------------------------------
+
+# Directories never listed in a plugin's file tree. Whole-repo installs copy
+# the fetched clone verbatim (including ``.git``), which would flood the
+# listing with repository internals.
+_PLUGIN_FILES_EXCLUDED_DIRS = {".git"}
+# Upper bound on listed files so a pathological plugin (e.g. a whole-repo
+# install of a large repository) cannot bloat API payloads.
+_PLUGIN_FILES_LIMIT = 2000
+
+
+class PluginSkillSummary(BaseModel):
+    """Summary of a skill bundled in a plugin."""
+
+    name: str
+    description: str | None = None
+
+
+def _list_plugin_files(root: Path) -> list[str]:
+    """List a plugin directory's files as sorted, POSIX, root-relative paths.
+
+    Uses ``os.walk`` so excluded directories are pruned before being descended
+    into, and symlinked directories are never followed (real plugins ship
+    manifest-dir symlinks such as ``.claude-plugin -> .plugin``).
+    """
+    files: list[str] = []
+    for dirpath, dirnames, filenames in os.walk(root):
+        dirnames[:] = [d for d in dirnames if d not in _PLUGIN_FILES_EXCLUDED_DIRS]
+        for filename in filenames:
+            files.append((Path(dirpath) / filename).relative_to(root).as_posix())
+    files.sort()
+    return files[:_PLUGIN_FILES_LIMIT]
+
+
+def service_plugin_contents(
+    plugin: Plugin,
+) -> tuple[list[PluginSkillSummary], list[str]]:
+    """Contents of an already-loaded plugin: bundled skills + file listing.
+
+    Skills include command-derived ones (``<plugin>:<command>``), matching what
+    the plugin actually contributes to a conversation.
+    """
+    skills = [
+        PluginSkillSummary(name=skill.name, description=skill.description)
+        for skill in plugin.get_all_skills()
+    ]
+    return skills, _list_plugin_files(Path(plugin.path))
+
+
+def service_load_plugin_contents(
+    plugin_dir: str | Path,
+) -> tuple[list[PluginSkillSummary], list[str]] | None:
+    """Load a plugin directory's contents, or None if it cannot be loaded.
+
+    Never raises: a corrupt or vanished plugin directory must not break the
+    listings that embed these contents.
+    """
+    try:
+        plugin = Plugin.load(plugin_dir)
+    except Exception as e:
+        logger.warning(f"Failed to load plugin contents from {plugin_dir}: {e}")
+        return None
+    return service_plugin_contents(plugin)
+
+
 # ---------------------------------------------------------------------------
 # Plugins-only marketplace catalog
 # ---------------------------------------------------------------------------
@@ -151,6 +219,12 @@ class MarketplacePluginInfo(BaseModel):
     ref: str | None = None
     repo_path: str | None = None
     installed: bool
+    # Local contents — populated when the entry resolves to a directory in the
+    # local marketplace clone; None when contents are not locally available
+    # (e.g. a structured source pointing at another repository).
+    path: str | None = None
+    skills: list[PluginSkillSummary] | None = None
+    files: list[str] | None = None
 
 
 # ---------------------------------------------------------------------------
@@ -163,9 +237,13 @@ class MarketplacePluginInfo(BaseModel):
 # transient fetch failure) is NOT cached, so one flaky fetch does not blank the
 # catalog for the whole TTL.
 #
-# Type: (timestamp, list-of-(name, description, source, ref, repo_path)) or None
-_PluginCatalogEntry = tuple[str, str | None, str, str | None, str | None]
-_plugin_catalog_cache: tuple[float, list[_PluginCatalogEntry]] | None = None
+# Cached entries are full MarketplacePluginInfo objects (including contents)
+# stored with ``installed=False``; serving stamps the fresh installed flag via
+# a shallow ``model_copy``, so the ``skills``/``files`` lists are shared across
+# requests — they are never mutated after construction.
+#
+# Type: (timestamp, catalog entries with installed=False) or None
+_plugin_catalog_cache: tuple[float, list[MarketplacePluginInfo]] | None = None
 _PLUGIN_CATALOG_TTL_SECONDS = 300  # 5 minutes
 
 
@@ -211,15 +289,8 @@ def service_get_plugins_marketplace_catalog(
         p.name for p in list_installed_plugins(installed_dir=installed_dir)
     }
     return [
-        MarketplacePluginInfo(
-            name=name,
-            description=desc,
-            source=src,
-            ref=ref,
-            repo_path=repo_path,
-            installed=name in installed_names,
-        )
-        for name, desc, src, ref, repo_path in entries
+        entry.model_copy(update={"installed": entry.name in installed_names})
+        for entry in entries
     ]
 
 
@@ -238,12 +309,15 @@ def _is_true_plugin(raw_source: object) -> bool:
     return subpath.startswith(_PLUGINS_SUBPATH_PREFIX)
 
 
-def _fetch_plugin_catalog_entries(marketplace_path: str) -> list[_PluginCatalogEntry]:
+def _fetch_plugin_catalog_entries(
+    marketplace_path: str,
+) -> list[MarketplacePluginInfo]:
     """Fetch the marketplace and keep only true plugins.
 
-    Slow path: git fetch + read the marketplace JSON. Returns
-    ``(name, description, source, ref, repo_path)`` tuples, or an empty list on
-    error.
+    Slow path: git fetch + read the marketplace JSON. Returns catalog entries
+    with ``installed=False`` (the caller stamps the fresh value), enriched with
+    local contents (``path``/``skills``/``files``) when an entry resolves to a
+    directory inside the local clone. Returns an empty list on error.
     """
     cache_dir = get_skills_cache_dir()
     repo_path = update_skills_repository(
@@ -282,7 +356,7 @@ def _fetch_plugin_catalog_entries(marketplace_path: str) -> list[_PluginCatalogE
             logger.warning(f"Failed to load marketplace: {e}, {e2}")
             return []
 
-    entries: list[_PluginCatalogEntry] = []
+    entries: list[MarketplacePluginInfo] = []
     for plugin in marketplace.plugins:
         if not _is_true_plugin(plugin.source):
             continue
@@ -290,6 +364,29 @@ def _fetch_plugin_catalog_entries(marketplace_path: str) -> list[_PluginCatalogE
         # this yields an absolute path with ref/repo_path None; structured
         # github/url sources yield their ref + subpath.
         source, ref, repo_path = marketplace.resolve_plugin_source(plugin)
-        entries.append((plugin.name, plugin.description, source, ref, repo_path))
+        entry = MarketplacePluginInfo(
+            name=plugin.name,
+            description=plugin.description,
+            source=source,
+            ref=ref,
+            repo_path=repo_path,
+            installed=False,
+        )
+        # A local ./plugins/<name> entry resolves to a directory inside the
+        # cached clone, so its contents can be loaded from disk. Structured
+        # github/url sources may point at other repositories — no local copy,
+        # so their contents stay None.
+        if ref is None and repo_path is None and Path(source).is_dir():
+            contents = service_load_plugin_contents(source)
+            if contents is not None:
+                skills, files = contents
+                entry = entry.model_copy(
+                    update={
+                        "path": to_posix_path(source),
+                        "skills": skills,
+                        "files": files,
+                    }
+                )
+        entries.append(entry)
 
     return entries

{openhands_agent_server-1.35.0 → openhands_agent_server-1.36.1}/openhands/agent_server/skills_router.py

@@ -104,8 +104,8 @@ class SkillsRequest(BaseModel):
         default_factory=list,
         description=(
             "Marketplace registrations for plugin-based skill loading. Registrations "
-            "with auto_load=True or a list of plugin names replace legacy public "
-            "skills."
+            "with auto_load=True or a list of plugin names add their skills to the "
+            "public skills."
         ),
     )
 

{openhands_agent_server-1.35.0 → openhands_agent_server-1.36.1}/openhands/agent_server/skills_service.py

@@ -345,33 +345,7 @@ def load_all_skills(
     marketplace_path: str | None = DEFAULT_MARKETPLACE_PATH,
     registered_marketplaces: list[MarketplaceRegistration] | None = None,
 ) -> SkillLoadResult:
-    """Load and merge skills from all configured sources.
-
-    Skills are loaded from multiple sources and merged with the following
-    precedence (later overrides earlier for duplicate names):
-    1. Sandbox skills (lowest) - Exposed URLs from sandbox
-    2. Registered marketplace skills or public skills legacy fallback
-    3. User skills - From ~/.openhands/skills/
-    4. Organization skills - From {org}/.openhands or equivalent
-    5. Project skills (highest) - From {workspace}/.openhands/skills/
-
-    Args:
-        load_public: Whether to load public skills from OpenHands/extensions repo.
-        load_user: Whether to load user skills from ~/.openhands/skills/.
-        load_project: Whether to load project skills from workspace.
-        load_org: Whether to load organization-level skills.
-        project_dir: Workspace directory path for project skills.
-        org_repos: Pre-authenticated (Git URL, org name) pairs for org skills.
-            All repos are loaded and merged into the single org tier.
-        sandbox_exposed_urls: List of exposed URLs from sandbox.
-        marketplace_path: Relative marketplace JSON path for public skills.
-            Pass None to load all public skills without marketplace filtering.
-        registered_marketplaces: Marketplace registrations whose auto-load plugins
-            replace legacy public skills when provided.
-
-    Returns:
-        SkillLoadResult containing merged skills and source counts.
-    """
+    """Merge skills: sandbox < marketplace < public < user < org < project."""
     sources: dict[str, int] = {}
     skill_lists: list[list[Skill]] = []
 
@@ -396,15 +370,11 @@ def load_all_skills(
     sources["registered_marketplaces"] = len(marketplace_skills)
     skill_lists.append(marketplace_skills)
 
-    # 2-3. Load legacy public + user skills via helper (no project yet — org sits
-    # between). Auto-load registered marketplaces replace legacy public skills,
-    # while user skills keep their existing precedence above the public marketplace
-    # tier.
     sdk_base = load_available_skills(
         work_dir=None,
         include_user=load_user,
         include_project=False,
-        include_public=load_public and not auto_load_registrations,
+        include_public=load_public,
         marketplace_path=marketplace_path,
     )
     sources["sdk_base"] = len(sdk_base)

{openhands_agent_server-1.35.0 → openhands_agent_server-1.36.1}/openhands_agent_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openhands-agent-server
-Version: 1.35.0
+Version: 1.36.1
 Summary: OpenHands Agent Server - REST/WebSocket interface for OpenHands AI Agent
 Project-URL: Source, https://github.com/OpenHands/software-agent-sdk
 Project-URL: Homepage, https://github.com/OpenHands/software-agent-sdk

{openhands_agent_server-1.35.0 → openhands_agent_server-1.36.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "openhands-agent-server"
-version = "1.35.0"
+version = "1.36.1"
 description = "OpenHands Agent Server - REST/WebSocket interface for OpenHands AI Agent"
 
 requires-python = ">=3.12"