openhands-agent-server 1.44.0__tar.gz → 1.44.1__tar.gz

{openhands_agent_server-1.44.0 → openhands_agent_server-1.44.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openhands-agent-server
-Version: 1.44.0
+Version: 1.44.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.44.0 → openhands_agent_server-1.44.1}/openhands/agent_server/agent_profiles_router.py

@@ -514,13 +514,17 @@ async def materialize_agent_profile(
     mcp_config = settings.agent_settings.mcp_config
 
     # Discover skills off the event loop so the dry-run can report which skills
-    # (catalog minus ``disabled_skills``) resolve. Only OpenHands profiles carry
-    # user/public skills; ACP profiles do not. A discovery failure must not 500
+    # (catalog minus ``disabled_skills``) resolve. Mirrors the launch rule in
+    # ``conversation_service._resolve_agent_from_profile`` so the preview matches
+    # a real launch: an ACP profile is only given a catalog where the CLI cannot
+    # read the user's own configuration (#4019). A discovery failure must not 500
     # the preview: pass ``available_skills=None`` and surface the failure as its
     # own diagnostic below.
     discovery_error: str | None = None
     available_skills = None
-    if profile.agent_kind == "openhands":
+    if profile.agent_kind == "openhands" or (
+        config.acp_skill_sourcing == "openhands_managed"
+    ):
         try:
             available_skills = await asyncio.to_thread(discover_profile_skills)
         except Exception as exc:

{openhands_agent_server-1.44.0 → openhands_agent_server-1.44.1}/openhands/agent_server/config.py

@@ -27,6 +27,7 @@ CONFIG_PATH_ENV = "OPENHANDS_AGENT_SERVER_CONFIG_PATH"
 DEFAULT_CONFIG_PATH = Path("workspace/openhands_agent_server_config.json")
 # 20 minutes, matching the idle timeout used by OpenHands Cloud.
 DEFAULT_CONVERSATION_IDLE_TTL_SECONDS: Final[float] = 20 * 60.0
+ACPSkillSourcing = Literal["native", "openhands_managed"]
 _logger = logging.getLogger(__name__)
 
 
@@ -349,6 +350,20 @@ class Config(BaseModel):
             "The URL where this agent server instance is available externally"
         ),
     )
+    acp_skill_sourcing: ACPSkillSourcing = Field(
+        default="native",
+        description=(
+            "Who supplies an ACP agent's skills. 'native' (the default, for a "
+            "host-local agent-server): nobody but the ACP CLI — it reads the "
+            "user's own home configuration and the repository, so OpenHands "
+            "injects none of its managed skills. 'openhands_managed' (for "
+            "container runtimes, where that host configuration is absent): also "
+            "inject the user/org/public/marketplace skills the server "
+            "discovers. Project/repository skills are never injected either way "
+            "— the CLI reads AGENTS.md itself (#4019). Set explicitly per "
+            "deployment; the agent-server image sets 'openhands_managed'."
+        ),
+    )
     registered_marketplaces: list[MarketplaceRegistration] = Field(
         default_factory=list,
         description=(

{openhands_agent_server-1.44.0 → openhands_agent_server-1.44.1}/openhands/agent_server/conversation_service.py

@@ -15,7 +15,7 @@ from weakref import WeakValueDictionary
 import httpx
 from pydantic import BaseModel
 
-from openhands.agent_server.config import Config, WebhookSpec
+from openhands.agent_server.config import ACPSkillSourcing, Config, WebhookSpec
 from openhands.agent_server.conversation_lease import (
     DEFAULT_LEASE_TTL_SECONDS,
     ConversationLeaseHeldError,
@@ -290,11 +290,53 @@ def _same_workspace(a: LocalWorkspace, b: LocalWorkspace) -> bool:
     return Path(a.working_dir).resolve() == Path(b.working_dir).resolve()
 
 
+def _apply_acp_skill_sourcing(
+    agent: "AgentBase", sourcing: ACPSkillSourcing
+) -> "AgentBase":
+    """Strip OpenHands-managed skills from an ACP agent under ``native`` sourcing.
+
+    A host-local ACP CLI reads the user's own skills from its home directory, so
+    a second, OpenHands-managed set injected into its prompt is at best noise —
+    and the catalog listing tells it to call ``invoke_skill``, a tool no ACP
+    agent has. Container runtimes set ``openhands_managed`` because that home
+    configuration is absent there. Project skills are excluded either way, by
+    ``ACPAgent`` itself (#4019).
+
+    A caller that sends ``agent`` / ``agent_settings`` puts its own skills on the
+    context, so the strip happens here rather than at profile resolution.
+    """
+    if sourcing != "native" or not isinstance(agent, ACPAgent):
+        return agent
+    context = agent.agent_context
+    if context is None:
+        return agent
+    if not (
+        context.skills
+        or context.load_user_skills
+        or context.load_public_skills
+        or context.registered_marketplaces
+    ):
+        return agent
+    return agent.model_copy(
+        update={
+            "agent_context": context.model_copy(
+                update={
+                    "skills": [],
+                    "load_user_skills": False,
+                    "load_public_skills": False,
+                    "registered_marketplaces": [],
+                }
+            )
+        }
+    )
+
+
 def _resolve_agent_from_profile(
     profile_id: "UUID",
     cipher: "Cipher | None",
     mcp_config: "dict[str, MCPServer]",
     load_memory: bool = False,
+    acp_skill_sourcing: ACPSkillSourcing = "native",
 ) -> "tuple[AgentBase, LaunchedAgentProfile]":
     """Load and resolve an agent profile by id, returning the built agent + provenance.
 
@@ -310,6 +352,9 @@ def _resolve_agent_from_profile(
             has no ``agent_context`` field, so the preference cannot ride the
             profile — it is stamped onto the resolved agent below, else a
             profile-launched conversation would silently ignore the setting.
+        acp_skill_sourcing: This deployment's ACP skill policy
+            (``Config.acp_skill_sourcing``).  Decides whether an ACP profile is
+            resolved with the server's managed skill catalog or with none.
 
     Raises:
         ProfileNotFound: No stored profile has ``profile_id``.
@@ -340,11 +385,15 @@ def _resolve_agent_from_profile(
         ) from exc
 
     # OpenHands profiles get the discovered catalog minus their ``disabled_skills``
-    # deny-list; ACP profiles carry no user/public skills so discovery is skipped.
-    # A genuine discovery failure fails the launch loudly rather than silently
-    # producing a zero-skill agent.
+    # deny-list. An ACP profile gets it only where the CLI cannot reach the user's
+    # own configuration (``openhands_managed``); under ``native`` it sources its
+    # own skills and OpenHands injects none (#4019). A genuine discovery failure
+    # fails the launch loudly rather than silently producing a zero-skill agent.
     available_skills = None
-    if profile.agent_kind == "openhands":
+    wants_skills = profile.agent_kind == "openhands" or (
+        acp_skill_sourcing == "openhands_managed"
+    )
+    if wants_skills:
         try:
             available_skills = discover_profile_skills()
         except Exception as exc:
@@ -641,6 +690,7 @@ class ConversationService:
     conversation_worktree_root: Path = field(
         default=Path("/tmp/conversation-worktrees")
     )
+    acp_skill_sourcing: ACPSkillSourcing = "native"
     _event_services: dict[UUID, EventService] | None = field(default=None, init=False)
     _conversation_records: dict[UUID, _ConversationRecord] = field(
         default_factory=dict, init=False
@@ -1533,9 +1583,18 @@ class ConversationService:
                 self.cipher,
                 mcp_config,
                 load_memory=bool(stored_context and stored_context.load_memory),
+                acp_skill_sourcing=self.acp_skill_sourcing,
             )
             request = request.model_copy(update={"agent": resolved_agent})
 
+        request = request.model_copy(
+            update={
+                "agent": _apply_acp_skill_sourcing(
+                    request.agent, self.acp_skill_sourcing
+                )
+            }
+        )
+
         additions = request.agent_launch_additions
         suffix = (
             additions.system_message_suffix_append.strip()
@@ -2238,6 +2297,7 @@ class ConversationService:
             lease_ttl_seconds=config.lease_ttl_seconds,
             conversation_idle_ttl_seconds=config.conversation_idle_ttl_seconds,
             conversation_worktree_root=config.conversation_worktree_root,
+            acp_skill_sourcing=config.acp_skill_sourcing,
         )
 
     async def _start_event_service(

{openhands_agent_server-1.44.0 → openhands_agent_server-1.44.1}/openhands/agent_server/docker/Dockerfile

@@ -13,6 +13,12 @@ ARG PORT=8000
 # to bundle google-cloud-aiplatform so the resulting binary supports
 # `vertex_ai/*` partner models (MiniMax, Qwen, Kimi MaaS endpoints).
 ARG ENABLE_VERTEX=0
+# Comma-separated ACP provider keys (see ACP_PROVIDERS in
+# openhands-sdk/openhands/sdk/settings/acp_providers.py) to bake into the
+# acp-providers stage below. The default reproduces the full provider set
+# shipped today; an unknown key fails the build rather than silently
+# installing nothing.
+ARG INSTALL_ACP_PROVIDERS=claude-code,codex,gemini-cli
 
 ####################################################################################
 # Builder (source mode)
@@ -92,6 +98,7 @@ RUN test -x /agent-server/dist/openhands-agent-server
 # the per-target-image fallback).
 ####################################################################################
 FROM python:3.13-bookworm AS acp-providers
+ARG INSTALL_ACP_PROVIDERS
 # A fresh top-level path, not nested under a directory (e.g. /opt) that base
 # images commonly already populate (SWE-bench images ship /opt/miniconda3):
 # COPY --from=<stage> only produces a byte-identical layer across different
@@ -100,12 +107,30 @@ FROM python:3.13-bookworm AS acp-providers
 # stage above.
 ENV ACP_NODE_DIR=/acp-node
 RUN set -eux; \
+    ACP_WRAPPER_DIR=/opt/acp-wrappers; \
+    mkdir -p "$ACP_NODE_DIR" "$ACP_WRAPPER_DIR"; \
+    PACKAGES=""; \
+    WRAPPER_BINS=""; \
+    for provider in $(echo "$INSTALL_ACP_PROVIDERS" | tr ',' ' '); do \
+      case "$provider" in \
+        claude-code) PACKAGES="$PACKAGES @agentclientprotocol/claude-agent-acp@0.63.0"; \
+          WRAPPER_BINS="$WRAPPER_BINS claude-agent-acp";; \
+        codex) PACKAGES="$PACKAGES @agentclientprotocol/codex-acp@1.1.7"; \
+          WRAPPER_BINS="$WRAPPER_BINS codex-acp";; \
+        gemini-cli) PACKAGES="$PACKAGES @google/gemini-cli@0.46.0"; \
+          WRAPPER_BINS="$WRAPPER_BINS gemini";; \
+        *) echo "Unknown ACP provider '$provider' in INSTALL_ACP_PROVIDERS" \
+             "(expected one of: claude-code, codex, gemini-cli)" >&2; exit 1;; \
+      esac; \
+    done; \
+    if [ -z "$PACKAGES" ]; then \
+      echo "INSTALL_ACP_PROVIDERS is empty; no ACP providers will be installed"; \
+      exit 0; \
+    fi; \
     apt-get -o Acquire::Retries=5 update; \
     apt-get -o Acquire::Retries=5 install -y --no-install-recommends \
         ca-certificates curl xz-utils; \
     rm -rf /var/lib/apt/lists/*; \
-    ACP_WRAPPER_DIR=/opt/acp-wrappers; \
-    mkdir -p "$ACP_NODE_DIR" "$ACP_WRAPPER_DIR"; \
     ARCH=$(uname -m); \
     case "$ARCH" in \
       x86_64|amd64) NARCH=x64; NODE_SHA256=69b09dba5c8dcb05c4e4273a4340db1005abeafe3927efda2bc5b249e80437ec;; \
@@ -119,11 +144,8 @@ RUN set -eux; \
     tar -xJ --strip-components=1 -C "$ACP_NODE_DIR" -f "$NODE_TARBALL"; \
     rm -f "$NODE_TARBALL"; \
     "$ACP_NODE_DIR/bin/node" --version; \
-    PATH="$ACP_NODE_DIR/bin:$PATH" "$ACP_NODE_DIR/bin/npm" install -g \
-        @agentclientprotocol/claude-agent-acp@0.63.0 \
-        @agentclientprotocol/codex-acp@1.1.7 \
-        @google/gemini-cli@0.46.0; \
-    for bin in claude-agent-acp codex-acp gemini; do \
+    PATH="$ACP_NODE_DIR/bin:$PATH" "$ACP_NODE_DIR/bin/npm" install -g $PACKAGES; \
+    for bin in $WRAPPER_BINS; do \
       printf '#!/bin/sh\nPATH="%s/bin:$PATH" exec "%s/bin/%s" "$@"\n' \
         "$ACP_NODE_DIR" "$ACP_NODE_DIR" "$bin" \
         > "$ACP_WRAPPER_DIR/$bin"; \
@@ -244,6 +266,9 @@ ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 ENV OH_ENABLE_VNC=false
 ENV LOG_JSON=true
+# The ACP CLIs run without the user's host home here, so OpenHands supplies the
+# managed skill catalog they cannot read for themselves (#4019).
+ENV OH_ACP_SKILL_SOURCING=openhands_managed
 EXPOSE ${PORT}
 
 ####################################################################################
@@ -356,6 +381,9 @@ USER ${USERNAME}
 WORKDIR /
 ENV OH_ENABLE_VNC=false
 ENV LOG_JSON=true
+# The ACP CLIs run without the user's host home here, so OpenHands supplies the
+# managed skill catalog they cannot read for themselves (#4019).
+ENV OH_ACP_SKILL_SOURCING=openhands_managed
 EXPOSE ${PORT} ${NOVNC_PORT}
 
 

{openhands_agent_server-1.44.0 → openhands_agent_server-1.44.1}/openhands/agent_server/docker/build.py

@@ -31,6 +31,7 @@ from pathlib import Path
 from pydantic import BaseModel, Field, field_validator
 
 from openhands.sdk.logger import IN_CI, get_logger, rolling_log_view
+from openhands.sdk.settings.acp_providers import ACP_PROVIDERS
 from openhands.sdk.workspace import PlatformType, TargetType
 
 
@@ -433,6 +434,27 @@ class BuildOptions(BaseModel):
             "(e.g., at each release)."
         ),
     )
+    install_acp_providers: str = Field(
+        default="claude-code,codex,gemini-cli",
+        description=(
+            "Comma-separated ACP provider keys (see ACP_PROVIDERS in "
+            "openhands-sdk/openhands/sdk/settings/acp_providers.py) to bake "
+            "into the image. Empty string installs none."
+        ),
+    )
+
+    @field_validator("install_acp_providers")
+    @classmethod
+    def _valid_install_acp_providers(cls, v: str) -> str:
+        unknown = [
+            p for p in (t.strip() for t in v.split(",")) if p and p not in ACP_PROVIDERS
+        ]
+        if unknown:
+            raise ValueError(
+                f"Unknown ACP provider(s) in install_acp_providers: "
+                f"{', '.join(unknown)}. Valid keys: {', '.join(ACP_PROVIDERS)}"
+            )
+        return v
 
     @property
     def short_sha(self) -> str:
@@ -834,6 +856,8 @@ def build_with_telemetry(opts: BuildOptions) -> BuildResult:
         f"OPENHANDS_BUILD_GIT_SHA={opts.git_sha}",
         "--build-arg",
         f"OPENHANDS_BUILD_GIT_REF={opts.git_ref}",
+        "--build-arg",
+        f"INSTALL_ACP_PROVIDERS={opts.install_acp_providers}",
     ]
     if push:
         args += ["--platform", ",".join(opts.platforms), "--push"]
@@ -1051,6 +1075,16 @@ def main(argv: list[str]) -> int:
             "as v1 and v1.2) in output. Should only be used for release builds."
         ),
     )
+    parser.add_argument(
+        "--install-acp-providers",
+        # os.environ.get, not _env(): an explicit empty string here means
+        # "install none" and must survive, but _env() treats blank as unset.
+        default=os.environ.get("INSTALL_ACP_PROVIDERS", "claude-code,codex,gemini-cli"),
+        help=(
+            "Comma-separated ACP provider keys to bake into the image "
+            "(default from $INSTALL_ACP_PROVIDERS; empty string installs none)."
+        ),
+    )
 
     args = parser.parse_args(argv)
 
@@ -1080,6 +1114,7 @@ def main(argv: list[str]) -> int:
             prebuilt_sdist=args.prebuilt_sdist,
             arch=args.arch or None,
             include_versioned_tag=args.versioned_tag,
+            install_acp_providers=args.install_acp_providers,
         )
 
         # If running in GitHub Actions, write outputs directly to GITHUB_OUTPUT
@@ -1128,6 +1163,7 @@ def main(argv: list[str]) -> int:
         prebuilt_sdist=args.prebuilt_sdist,
         arch=args.arch or None,
         include_versioned_tag=args.versioned_tag,
+        install_acp_providers=args.install_acp_providers,
     )
     tags = build(opts)
 

{openhands_agent_server-1.44.0 → openhands_agent_server-1.44.1}/openhands/agent_server/pub_sub.py

@@ -1,9 +1,10 @@
 import asyncio
 from abc import ABC, abstractmethod
 from dataclasses import dataclass, field
-from typing import TypeVar
+from typing import ClassVar, TypeVar
 from uuid import UUID, uuid4
 
+from openhands.sdk.event import StreamingDeltaEvent
 from openhands.sdk.logger import get_logger
 
 
@@ -13,6 +14,9 @@ T = TypeVar("T")
 
 
 class Subscriber[T](ABC):
+    # Deltas arrive at token rate; consumers opt in rather than inherit them.
+    receives_streaming_deltas: ClassVar[bool] = False
+
     @abstractmethod
     async def __call__(self, event: T):
         """Invoke this subscriber"""
@@ -87,6 +91,8 @@ class PubSub[T]:
             event: The event to pass to all callbacks
         """
         subscribers = list(self._subscribers.items())
+        if isinstance(event, StreamingDeltaEvent):
+            subscribers = [s for s in subscribers if s[1].receives_streaming_deltas]
         if not subscribers:
             return
 

{openhands_agent_server-1.44.0 → openhands_agent_server-1.44.1}/openhands/agent_server/sockets.py

@@ -539,6 +539,9 @@ def _is_websocket_connected(websocket: WebSocket) -> bool:
 class _WebSocketSubscriber(Subscriber):
     """WebSocket subscriber for conversation events."""
 
+    # The live socket is what token streaming is for.
+    receives_streaming_deltas = True
+
     websocket: WebSocket
 
     async def __call__(self, event: Event):

{openhands_agent_server-1.44.0 → openhands_agent_server-1.44.1}/openhands_agent_server.egg-info/PKG-INFO

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

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