openhands-agent-server 1.34.0__tar.gz → 1.36.0__tar.gz

{openhands_agent_server-1.34.0 → openhands_agent_server-1.36.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openhands-agent-server
-Version: 1.34.0
+Version: 1.36.0
 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.34.0 → openhands_agent_server-1.36.0}/openhands/agent_server/docker/Dockerfile

@@ -181,7 +181,7 @@ RUN set -ux; \
         PATH="$ACP_NODE_DIR/bin:$PATH"; \
         if "$ACP_NODE_DIR/bin/npm" install -g \
             @agentclientprotocol/claude-agent-acp@0.44.0 \
-            @zed-industries/codex-acp@0.16.0 \
+            @agentclientprotocol/codex-acp@1.1.2 \
             @google/gemini-cli@0.46.0; then \
           # Create wrappers in /usr/local/bin that prepend ACP's Node 22 to PATH.
           # This ensures the ACP binary's #!/usr/bin/env node shebang resolves

{openhands_agent_server-1.34.0 → openhands_agent_server-1.36.0}/openhands/agent_server/file_router.py

@@ -10,6 +10,7 @@ import tempfile
 import zipfile
 from pathlib import Path, PurePosixPath
 from typing import IO, Annotated, Literal
+from urllib.parse import quote
 from uuid import UUID
 
 from fastapi import (
@@ -30,6 +31,7 @@ from openhands.agent_server.server_details_router import update_last_execution_t
 from openhands.sdk.git.exceptions import GitCommandError, GitRepositoryError
 from openhands.sdk.git.utils import (
     GIT_EMPTY_TREE_HASH,
+    get_git_repository_metadata,
     get_valid_ref,
     run_git_command,
     validate_git_repository,
@@ -323,6 +325,11 @@ def _head_is_detached(root: Path) -> bool:
     return branch.strip() == "HEAD"
 
 
+def _header_safe(value: str) -> str:
+    """Percent-encode a header value."""
+    return quote(value, safe="")
+
+
 def _create_git_delta(
     root: Path, base_ref: str | None, output_path: Path, excludes: list[str]
 ) -> str:
@@ -972,13 +979,24 @@ async def archive_directory(
             detail=f"Failed to archive directory: {str(e)}",
         )
 
-    headers: dict[str, str] | None = None
+    # Repo identity (remote / branch / HEAD) applies to both formats so a
+    # tar.gz snapshot is self-describing too; base_commit/base_ref are
+    # git-delta-only (they describe the patch's replay base).
+    headers: dict[str, str] = {}
+    if (repo_root / ".git").exists():
+        repo_metadata = await asyncio.to_thread(get_git_repository_metadata, repo_root)
+        for key, header in (
+            ("repo_remote", "X-Archive-Repo-Remote"),
+            ("branch", "X-Archive-Branch"),
+            ("head_commit", "X-Archive-Head-Commit"),
+        ):
+            if value := repo_metadata.get(key):
+                headers[header] = _header_safe(value)
+        headers["X-Archive-Repo-Root"] = _header_safe(str(repo_root))
     if base_commit:
         # Make a git-delta self-describing so consumers can replay the patch.
-        headers = {
-            "X-Archive-Base-Commit": base_commit,
-            "X-Archive-Base-Ref": base_ref or "auto",
-        }
+        headers["X-Archive-Base-Commit"] = base_commit
+        headers["X-Archive-Base-Ref"] = base_ref or "auto"
 
     return FileResponse(
         path=output_path,

openhands_agent_server-1.36.0/openhands/agent_server/git_router.py

@@ -0,0 +1,181 @@
+"""Git router for OpenHands SDK."""
+
+import asyncio
+import functools
+import logging
+from pathlib import Path
+
+from fastapi import APIRouter, HTTPException, Path as PathParam, Query
+
+from openhands.agent_server.server_details_router import update_last_execution_time
+from openhands.sdk.git.exceptions import GitError, GitRepositoryError
+from openhands.sdk.git.git_changes import get_git_changes
+from openhands.sdk.git.git_commits import (
+    get_commit_changes,
+    get_commit_file_diff,
+    get_git_commits,
+)
+from openhands.sdk.git.git_diff import get_git_diff
+from openhands.sdk.git.models import GitChange, GitCommitsPage, GitDiff
+
+
+git_router = APIRouter(prefix="/git", tags=["Git"])
+logger = logging.getLogger(__name__)
+
+
+_REF_QUERY_DESCRIPTION = (
+    "Optional git ref to diff against (e.g. 'HEAD' for git status-style "
+    "changes, or a commit hash). When omitted, the upstream/default branch "
+    "is auto-detected."
+)
+
+_COMMIT_QUERY_DESCRIPTION = (
+    "Optional commit SHA. When set, the diff is the change that commit "
+    "introduced (vs its first parent), read entirely from git objects so "
+    "deleted files still render. Mutually exclusive with 'ref'."
+)
+
+# Hex-only so a path/query value can never reach git argv as an option
+# (list-args protect against shell injection, not option injection).
+_SHA_PATTERN = r"^[0-9a-fA-F]{4,64}$"
+
+
+async def _get_git_changes(path: str, ref: str | None) -> list[GitChange]:
+    """Internal helper to get git changes for a given path."""
+    update_last_execution_time()
+    loop = asyncio.get_running_loop()
+    try:
+        return await loop.run_in_executor(
+            None, functools.partial(get_git_changes, Path(path), ref=ref)
+        )
+    except GitRepositoryError:
+        # A non-repo workspace has no git changes to report; respond with an
+        # empty list so the Changes tab can render normally instead of 500ing.
+        logger.debug("Path %s is not a git repository; returning no changes", path)
+        return []
+
+
+async def _get_git_diff(path: str, ref: str | None) -> GitDiff:
+    """Internal helper to get git diff for a given path."""
+    update_last_execution_time()
+    loop = asyncio.get_running_loop()
+    try:
+        return await loop.run_in_executor(
+            None, functools.partial(get_git_diff, Path(path), ref=ref)
+        )
+    except GitRepositoryError:
+        # Only collapse the not-a-repo case to an empty diff; file-level
+        # GitPathError (missing/oversize/outside-repo) stays a 500 so
+        # callers can distinguish it from "no changes".
+        logger.debug("Path %s is not in a git repository; returning empty diff", path)
+        return GitDiff(modified=None, original=None)
+
+
+async def _get_git_commits(path: str, limit: int) -> GitCommitsPage:
+    """Internal helper to list commits for a given repo path."""
+    update_last_execution_time()
+    loop = asyncio.get_running_loop()
+    try:
+        return await loop.run_in_executor(
+            None, functools.partial(get_git_commits, Path(path), limit=limit)
+        )
+    except GitRepositoryError:
+        # A non-repo workspace has no commits to report; respond with an
+        # empty page so the commits section can render its empty state.
+        logger.debug("Path %s is not a git repository; returning no commits", path)
+        return GitCommitsPage(commits=[], has_more=False)
+
+
+async def _get_commit_changes(path: str, sha: str) -> list[GitChange]:
+    """Internal helper to get the files changed by one commit."""
+    update_last_execution_time()
+    loop = asyncio.get_running_loop()
+    try:
+        return await loop.run_in_executor(
+            None, functools.partial(get_commit_changes, Path(path), sha)
+        )
+    except GitRepositoryError:
+        logger.debug("Path %s is not a git repository; returning no changes", path)
+        return []
+
+
+async def _get_commit_file_diff(path: str, commit: str) -> GitDiff:
+    """Internal helper to get one file's diff as changed by one commit."""
+    update_last_execution_time()
+    loop = asyncio.get_running_loop()
+    try:
+        return await loop.run_in_executor(
+            None, functools.partial(get_commit_file_diff, Path(path), commit)
+        )
+    except GitRepositoryError:
+        logger.debug("Path %s is not in a git repository; returning empty diff", path)
+        return GitDiff(modified=None, original=None)
+
+
+@git_router.get("/changes")
+async def git_changes_query(
+    path: str = Query(..., description="The git repository path"),
+    ref: str | None = Query(None, description=_REF_QUERY_DESCRIPTION),
+) -> list[GitChange]:
+    """Get git changes using query parameter (preferred method)."""
+    try:
+        return await _get_git_changes(path, ref)
+    except GitError as e:
+        # GitRepositoryError is already handled in the helper (returns []).
+        # Any remaining GitError subclass (e.g. GitCommandError) surfaces as
+        # 400 so the client can show an actionable error instead of an
+        # opaque 500.
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@git_router.get("/diff")
+async def git_diff_query(
+    path: str = Query(..., description="The file path to get diff for"),
+    ref: str | None = Query(None, description=_REF_QUERY_DESCRIPTION),
+    commit: str | None = Query(
+        None, pattern=_SHA_PATTERN, description=_COMMIT_QUERY_DESCRIPTION
+    ),
+) -> GitDiff:
+    """Get git diff using query parameter (preferred method)."""
+    if ref is not None and commit is not None:
+        raise HTTPException(
+            status_code=400, detail="'ref' and 'commit' are mutually exclusive"
+        )
+    try:
+        if commit is not None:
+            return await _get_commit_file_diff(path, commit)
+        return await _get_git_diff(path, ref)
+    except GitError as e:
+        # GitRepositoryError is already handled in the helpers (returns an
+        # empty diff). Any remaining GitError subclass (e.g. GitCommandError,
+        # GitPathError) surfaces as 400 so the client can show an actionable
+        # error instead of an opaque 500.
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@git_router.get("/commits")
+async def git_commits_query(
+    path: str = Query(..., description="The git repository path"),
+    limit: int = Query(50, ge=1, le=200, description="Maximum commits to return"),
+) -> GitCommitsPage:
+    """List the repository's most recent commits, newest first."""
+    try:
+        return await _get_git_commits(path, limit)
+    except GitError as e:
+        # GitRepositoryError is already handled in the helper (returns an
+        # empty page). Any remaining GitError subclass surfaces as 400.
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@git_router.get("/commits/{sha}/changes")
+async def git_commit_changes_query(
+    sha: str = PathParam(..., pattern=_SHA_PATTERN, description="Commit SHA"),
+    path: str = Query(..., description="The git repository path"),
+) -> list[GitChange]:
+    """Get the files changed by a single commit (vs its first parent)."""
+    try:
+        return await _get_commit_changes(path, sha)
+    except GitError as e:
+        # GitRepositoryError is already handled in the helper (returns []).
+        # An unknown/unresolvable sha raises GitCommandError -> 400.
+        raise HTTPException(status_code=400, detail=str(e))

{openhands_agent_server-1.34.0 → openhands_agent_server-1.36.0}/openhands/agent_server/llm_router.py

@@ -138,9 +138,10 @@ async def list_models(
         models = sorted(set(all_models))
     else:
         filtered_models = []
+        verified_provider_models = set(VERIFIED_MODELS.get(provider, ()))
         for model in all_models:
-            model_provider, model_id, separator = _extract_model_and_provider(model)
-            if model_provider == provider:
+            model_provider, _, _ = _extract_model_and_provider(model)
+            if model_provider == provider or model in verified_provider_models:
                 filtered_models.append(model)
         models = sorted(set(filtered_models))
 

{openhands_agent_server-1.34.0 → openhands_agent_server-1.36.0}/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.34.0 → openhands_agent_server-1.36.0}/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.34.0 → openhands_agent_server-1.36.0}/openhands_agent_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openhands-agent-server
-Version: 1.34.0
+Version: 1.36.0
 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.34.0 → openhands_agent_server-1.36.0}/pyproject.toml

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

openhands_agent_server-1.34.0/openhands/agent_server/git_router.py

@@ -1,88 +0,0 @@
-"""Git router for OpenHands SDK."""
-
-import asyncio
-import functools
-import logging
-from pathlib import Path
-
-from fastapi import APIRouter, HTTPException, Query
-
-from openhands.agent_server.server_details_router import update_last_execution_time
-from openhands.sdk.git.exceptions import GitError, GitRepositoryError
-from openhands.sdk.git.git_changes import get_git_changes
-from openhands.sdk.git.git_diff import get_git_diff
-from openhands.sdk.git.models import GitChange, GitDiff
-
-
-git_router = APIRouter(prefix="/git", tags=["Git"])
-logger = logging.getLogger(__name__)
-
-
-_REF_QUERY_DESCRIPTION = (
-    "Optional git ref to diff against (e.g. 'HEAD' for git status-style "
-    "changes, or a commit hash). When omitted, the upstream/default branch "
-    "is auto-detected."
-)
-
-
-async def _get_git_changes(path: str, ref: str | None) -> list[GitChange]:
-    """Internal helper to get git changes for a given path."""
-    update_last_execution_time()
-    loop = asyncio.get_running_loop()
-    try:
-        return await loop.run_in_executor(
-            None, functools.partial(get_git_changes, Path(path), ref=ref)
-        )
-    except GitRepositoryError:
-        # A non-repo workspace has no git changes to report; respond with an
-        # empty list so the Changes tab can render normally instead of 500ing.
-        logger.debug("Path %s is not a git repository; returning no changes", path)
-        return []
-
-
-async def _get_git_diff(path: str, ref: str | None) -> GitDiff:
-    """Internal helper to get git diff for a given path."""
-    update_last_execution_time()
-    loop = asyncio.get_running_loop()
-    try:
-        return await loop.run_in_executor(
-            None, functools.partial(get_git_diff, Path(path), ref=ref)
-        )
-    except GitRepositoryError:
-        # Only collapse the not-a-repo case to an empty diff; file-level
-        # GitPathError (missing/oversize/outside-repo) stays a 500 so
-        # callers can distinguish it from "no changes".
-        logger.debug("Path %s is not in a git repository; returning empty diff", path)
-        return GitDiff(modified=None, original=None)
-
-
-@git_router.get("/changes")
-async def git_changes_query(
-    path: str = Query(..., description="The git repository path"),
-    ref: str | None = Query(None, description=_REF_QUERY_DESCRIPTION),
-) -> list[GitChange]:
-    """Get git changes using query parameter (preferred method)."""
-    try:
-        return await _get_git_changes(path, ref)
-    except GitError as e:
-        # GitRepositoryError is already handled in the helper (returns []).
-        # Any remaining GitError subclass (e.g. GitCommandError) surfaces as
-        # 400 so the client can show an actionable error instead of an
-        # opaque 500.
-        raise HTTPException(status_code=400, detail=str(e))
-
-
-@git_router.get("/diff")
-async def git_diff_query(
-    path: str = Query(..., description="The file path to get diff for"),
-    ref: str | None = Query(None, description=_REF_QUERY_DESCRIPTION),
-) -> GitDiff:
-    """Get git diff using query parameter (preferred method)."""
-    try:
-        return await _get_git_diff(path, ref)
-    except GitError as e:
-        # GitRepositoryError is already handled in the helper (returns an
-        # empty diff). Any remaining GitError subclass (e.g. GitCommandError,
-        # GitPathError) surfaces as 400 so the client can show an actionable
-        # error instead of an opaque 500.
-        raise HTTPException(status_code=400, detail=str(e))