openhands-agent-server 1.9.0__py3-none-any.whl → 1.10.0__py3-none-any.whl

openhands/agent_server/bash_service.py

@@ -16,6 +16,7 @@ from openhands.agent_server.models import (
 )
 from openhands.agent_server.pub_sub import PubSub, Subscriber
 from openhands.sdk.logger import get_logger
+from openhands.sdk.utils import sanitized_env
 
 
 logger = get_logger(__name__)
@@ -194,6 +195,7 @@ class BashEventService:
                 stdout=asyncio.subprocess.PIPE,
                 stderr=asyncio.subprocess.PIPE,
                 shell=True,
+                env=sanitized_env(),
             )
 
             # Track output order and buffers

openhands/agent_server/conversation_service.py

@@ -235,7 +235,16 @@ class ConversationService:
                     f"{list(request.tool_module_qualnames.keys())}"
                 )
 
-        stored = StoredConversation(id=conversation_id, **request.model_dump())
+        # Plugin loading is now handled lazily by LocalConversation.
+        # Just pass the plugin specs through to StoredConversation.
+        # LocalConversation will:
+        # 1. Fetch and load plugins on first run()/send_message()
+        # 2. Resolve refs to commit SHAs for deterministic resume
+        # 3. Merge plugin skills/MCP/hooks into the agent
+        stored = StoredConversation(
+            id=conversation_id,
+            **request.model_dump(),
+        )
         event_service = await self._start_event_service(stored)
         initial_message = request.initial_message
         if initial_message:

openhands/agent_server/desktop_service.py

@@ -9,6 +9,7 @@ from pathlib import Path
 
 from openhands.agent_server.config import get_default_config
 from openhands.sdk.logger import get_logger
+from openhands.sdk.utils import sanitized_env
 
 
 logger = get_logger(__name__)
@@ -28,7 +29,7 @@ class DesktopService:
             return True
 
         # --- Env defaults (match bash behavior) ---
-        env = os.environ.copy()
+        env = sanitized_env()
         display = env.get("DISPLAY", ":1")
         user = env.get("USER") or env.get("USERNAME") or "openhands"
         home = Path(env.get("HOME") or f"/home/{user}")
@@ -68,6 +69,7 @@ class DesktopService:
                     capture_output=True,
                     text=True,
                     timeout=3,
+                    env=env,
                 ).returncode
                 == 0
             )
@@ -105,6 +107,7 @@ class DesktopService:
                     capture_output=True,
                     text=True,
                     timeout=3,
+                    env=env,
                 ).returncode
                 == 0
             )
@@ -180,7 +183,11 @@ class DesktopService:
         # Check if VNC server is running
         try:
             result = subprocess.run(
-                ["pgrep", "-f", "Xvnc"], capture_output=True, text=True, timeout=3
+                ["pgrep", "-f", "Xvnc"],
+                capture_output=True,
+                text=True,
+                timeout=3,
+                env=sanitized_env(),
             )
             return result.returncode == 0
         except Exception:

openhands/agent_server/env_parser.py

@@ -278,8 +278,10 @@ class DiscriminatedUnionEnvParser(EnvParser):
 
     def from_env(self, key: str) -> JsonType:
         kind = os.environ.get(f"{key}_KIND", MISSING)
+        kind_missing = False
         if kind is MISSING:
-            # If there is exactly one kind, use it directly
+            kind_missing = True
+            # If there are other fields and there is exactly one kind, use it directly
             if len(self.parsers) == 1:
                 kind = next(iter(self.parsers.keys()))
             else:
@@ -294,6 +296,15 @@ class DiscriminatedUnionEnvParser(EnvParser):
         # Intentionally raise KeyError for invalid KIND - typos should fail early
         parser = self.parsers[kind]
         parser_result = parser.from_env(key)
+
+        # A kind was defined without other fields
+        if parser_result is MISSING:
+            # If the kind was not defined, the entry is MISSING
+            if kind_missing:
+                return MISSING
+            # Only a kind was defined
+            parser_result = {}
+
         # Type narrowing: discriminated union parsers always return dicts
         parser_result = cast(dict, parser_result)
         parser_result["kind"] = kind

openhands/agent_server/event_service.py

@@ -46,6 +46,7 @@ class EventService:
     _pub_sub: PubSub[Event] = field(default_factory=lambda: PubSub[Event](), init=False)
     _run_task: asyncio.Task | None = field(default=None, init=False)
     _run_lock: asyncio.Lock = field(default_factory=asyncio.Lock, init=False)
+    _callback_wrapper: AsyncCallbackWrapper | None = field(default=None, init=False)
 
     @property
     def conversation_dir(self):
@@ -430,19 +431,29 @@ class EventService:
             self.stored.agent.model_dump(context={"expose_secrets": True}),
         )
 
+        # Create LocalConversation with plugins and hook_config.
+        # Plugins are loaded lazily on first run()/send_message() call.
+        # Hook execution semantics: OpenHands runs hooks sequentially with early-exit
+        # on block (PreToolUse), unlike Claude Code's parallel execution model.
+
+        # Create and store callback wrapper to allow flushing pending events
+        self._callback_wrapper = AsyncCallbackWrapper(
+            self._pub_sub, loop=asyncio.get_running_loop()
+        )
+
         conversation = LocalConversation(
             agent=agent,
             workspace=workspace,
+            plugins=self.stored.plugins,
             persistence_dir=str(self.conversations_dir),
             conversation_id=self.stored.id,
-            callbacks=[
-                AsyncCallbackWrapper(self._pub_sub, loop=asyncio.get_running_loop())
-            ],
+            callbacks=[self._callback_wrapper],
             max_iteration_per_run=self.stored.max_iterations,
             stuck_detection=self.stored.stuck_detection,
             visualizer=None,
             secrets=self.stored.secrets,
             cipher=self.cipher,
+            hook_config=self.stored.hook_config,
         )
 
         # Set confirmation mode if enabled
@@ -517,6 +528,16 @@ class EventService:
                 except Exception:
                     logger.exception("Error during conversation run")
                 finally:
+                    # Wait for all pending events to be published via
+                    # AsyncCallbackWrapper before publishing the final state update.
+                    # This prevents a race condition where the conversation status
+                    # becomes FINISHED before agent events (MessageEvent, ActionEvent,
+                    # etc.) are published to WebSocket subscribers.
+                    if self._callback_wrapper:
+                        await loop.run_in_executor(
+                            None, self._callback_wrapper.wait_for_pending, 30.0
+                        )
+
                     # Clear task reference and publish state update
                     self._run_task = None
                     await self._publish_state_update()

openhands/agent_server/models.py

@@ -12,7 +12,9 @@ from openhands.sdk.conversation.state import (
     ConversationExecutionStatus,
     ConversationState,
 )
+from openhands.sdk.hooks import HookConfig
 from openhands.sdk.llm.utils.metrics import MetricsSnapshot
+from openhands.sdk.plugin import PluginSource
 from openhands.sdk.secret import SecretSource
 from openhands.sdk.security.analyzer import SecurityAnalyzerBase
 from openhands.sdk.security.confirmation_policy import (
@@ -106,10 +108,31 @@ class StartConversationRequest(BaseModel):
             "to register the tools for this conversation."
         ),
     )
+    plugins: list[PluginSource] | None = Field(
+        default=None,
+        description=(
+            "List of plugins to load for this conversation. Plugins are loaded "
+            "and their skills/MCP config are merged into the agent. "
+            "Hooks are extracted and stored for runtime execution."
+        ),
+    )
+    hook_config: HookConfig | None = Field(
+        default=None,
+        description=(
+            "Optional hook configuration for this conversation. Hooks are shell "
+            "scripts that run at key lifecycle events (PreToolUse, PostToolUse, "
+            "UserPromptSubmit, Stop, etc.). If both hook_config and plugins are "
+            "provided, they are merged with explicit hooks running before plugin "
+            "hooks."
+        ),
+    )
 
 
 class StoredConversation(StartConversationRequest):
-    """Stored details about a conversation"""
+    """Stored details about a conversation.
+
+    Extends StartConversationRequest with server-assigned fields.
+    """
 
     id: OpenHandsUUID
     title: str | None = Field(

openhands/agent_server/skills_service.py

@@ -14,7 +14,6 @@ Precedence (later overrides earlier):
 sandbox < public < user < org < project
 """
 
-import os
 import shutil
 import subprocess
 import tempfile
@@ -37,6 +36,7 @@ from openhands.sdk.context.skills.utils import (
     update_skills_repository,
 )
 from openhands.sdk.logger import get_logger
+from openhands.sdk.utils import sanitized_env
 
 
 logger = get_logger(__name__)
@@ -120,6 +120,8 @@ def load_org_skills_from_url(
         # Clone the organization repository (shallow clone for efficiency)
         logger.info(f"Cloning organization skills repository for {org_name}")
         try:
+            env = sanitized_env()
+            env["GIT_TERMINAL_PROMPT"] = "0"
             subprocess.run(
                 [
                     "git",
@@ -132,7 +134,7 @@ def load_org_skills_from_url(
                 check=True,
                 capture_output=True,
                 timeout=120,
-                env={**os.environ, "GIT_TERMINAL_PROMPT": "0"},
+                env=env,
             )
         except subprocess.CalledProcessError:
             # Repository doesn't exist or access denied - this is expected.

openhands/agent_server/vscode_service.py

@@ -5,6 +5,7 @@ import os
 from pathlib import Path
 
 from openhands.sdk.logger import get_logger
+from openhands.sdk.utils import sanitized_env
 
 
 logger = get_logger(__name__)
@@ -160,6 +161,7 @@ class VSCodeService:
             cmd,
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.STDOUT,
+            env=sanitized_env(),
         )
 
         # Wait for server to start (look for startup message)

{openhands_agent_server-1.9.0.dist-info → openhands_agent_server-1.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openhands-agent-server
-Version: 1.9.0
+Version: 1.10.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.9.0.dist-info → openhands_agent_server-1.10.0.dist-info}/RECORD

@@ -2,40 +2,40 @@ openhands/agent_server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 openhands/agent_server/__main__.py,sha256=QCdBRWVV9gNtPwRwYieQisvKsmJljjJ8f293RhtHl_w,3642
 openhands/agent_server/api.py,sha256=LqU4BWXc4VQ29sIiABZykznSMJ_dUQEOHixxeLBTuGY,12009
 openhands/agent_server/bash_router.py,sha256=9GRsLeVZgqR1XeayJvBBycVqfg5O-Fye2ek75kGCuno,3353
-openhands/agent_server/bash_service.py,sha256=QgTSyQoxlk52BnZuo35xlX7u7-3xs5BvvaKU3AEva_w,14083
+openhands/agent_server/bash_service.py,sha256=dhoV5jEBitsb6UNSf1ht4hkf2E9i5fZ_26qx8VZkuj0,14166
 openhands/agent_server/config.py,sha256=EKxVV0QyD3KLLtFxNuUextxJplLW_zZ32nPFhli6ozA,6403
 openhands/agent_server/conversation_router.py,sha256=lz-dnfPXrVBiGZ9GhYqfteCWJ4pq7AcnWqxsKWwCfc0,11178
-openhands/agent_server/conversation_service.py,sha256=Oj8IBSY9ZYbduOOBatd3I0H_kSyH7xi22Y_MyhfL5Tk,27058
+openhands/agent_server/conversation_service.py,sha256=rucfKX1SnVZVPVr0fN4jTyr6AbACbKUmJojds2qbTmg,27454
 openhands/agent_server/dependencies.py,sha256=H3zyOc8uthpXseB3E7rWNccKIj7PlyfcgCYwFvmFq4c,2629
 openhands/agent_server/desktop_router.py,sha256=OaCmevO33eUo3jTwiXBmQ3uT3ONu4-tqgBfYpZWrHSA,1349
-openhands/agent_server/desktop_service.py,sha256=iCwQJXK4DvGuBXKOQ1oko60wXkf_pYHCubOzBsd2k60,7415
-openhands/agent_server/env_parser.py,sha256=GDTLy9-k-GBOvpVI8VlYuqN-kLRZw6ieR2TgWFsOIms,16400
+openhands/agent_server/desktop_service.py,sha256=GnLrQd2rqlRXBCNPbCXOZEfAXa42y9GNyFAQRjVE7y8,7603
+openhands/agent_server/env_parser.py,sha256=6b4-Iegq82crMbwjo1w4C_nu5B0Wm0xysrhGhfiyMF8,16770
 openhands/agent_server/event_router.py,sha256=XM46zcqPOXStISfihzsPXPfsW_23E50brmBHk04ncVI,6156
-openhands/agent_server/event_service.py,sha256=EFjIkWbTrROAv2zFzsIOhcRDTZIhf0uIGQStNDg8nFY,26838
+openhands/agent_server/event_service.py,sha256=aKBbm2PO3l28QDSgibJ8JBPxD-kcUaFkpU2loGpfz1c,28042
 openhands/agent_server/file_router.py,sha256=MqFmTcDFE42EEPwRncBtT-Vu8_U78OZfC6pm0tnlBZk,4161
 openhands/agent_server/git_router.py,sha256=z-jbkY4me1HuLOWTzJu_osI19ZGGri5ffYujVAWe31s,974
 openhands/agent_server/logging_config.py,sha256=b3N5LVGuwDd0bBsMxrVdCHa8N1Nsreawgi23hTkDrro,3985
 openhands/agent_server/middleware.py,sha256=WQN5T14E58cvG2ZG6qfaJL4Dk9DqUGqD5tyAva1Un_4,1407
-openhands/agent_server/models.py,sha256=R3WSDIQN1burIyV4Dz05YITR9WWcC_pXgZDk-7WG6hw,9723
+openhands/agent_server/models.py,sha256=QQtm9J9HNf0yqDmz171TNKo1CUPV8fbQ12zAhk2Ssnk,10668
 openhands/agent_server/openapi.py,sha256=RJWaOnM9NjzrH-fJi3PoIBv5d0sH5z8zZTdvYzSqoFU,482
 openhands/agent_server/pub_sub.py,sha256=yPB84Wub7A2uwUWsW_grbxomWmKaWyGuo6dVNUzg1FU,2755
 openhands/agent_server/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openhands/agent_server/server_details_router.py,sha256=LCa0NQ3SOw-IgJh3rDJL5GolFOpZcX_-XEbDLHF8dN4,950
 openhands/agent_server/skills_router.py,sha256=mYiIAOGJxnpMz_OsbtP2cBjHNvo3qYUXqGPHKQs_pEw,5601
-openhands/agent_server/skills_service.py,sha256=hmyo1FtUEwfPWk1NnMyGGhvIqPwO28Mjk3chUw_98XM,14125
+openhands/agent_server/skills_service.py,sha256=-KcI28xDwnMQ9KXRQVWR6CXo2OdZBXmKE_iVDZo0r-A,14201
 openhands/agent_server/sockets.py,sha256=UhZr_QoHsIX7x_tzvk9_AJa2S8KJmRr4syhIU4He8Rs,6617
 openhands/agent_server/tool_preload_service.py,sha256=2QuFyn7jC4Ifq2aUhs9j8876wSBdY0eeoLo4qEVi-yA,2341
 openhands/agent_server/tool_router.py,sha256=vM_9UKUzfChLK9B9Z3DL4VtKNdDw4w635knu9N36y0c,676
 openhands/agent_server/utils.py,sha256=ajivE_kGCJ9qUhF9H3Qu7DUKg7uDvDQk16JcO3XntEs,1926
 openhands/agent_server/vscode_router.py,sha256=tPmXzN6teuqMa1jvKS4Q3aWpk9p9wsp4LleKoDvkYGs,2133
-openhands/agent_server/vscode_service.py,sha256=xS_vwIU5W5KwXTbOTzHPkPRIB4xbjmYlAygmRfBOAF8,7606
+openhands/agent_server/vscode_service.py,sha256=te7PWP0eedV7JTlLrBnCujg1dPYMmYZRvbIkxKPavgw,7685
 openhands/agent_server/docker/Dockerfile,sha256=rdFlMdI_uITipzR7-pPEGFx2Ld-jYhOBfGKONRk4dbU,10724
 openhands/agent_server/docker/build.py,sha256=UgHoLkgHZtgWqloG2MQ2RCzc6zTIyttOFL_vUzmw_c0,28189
 openhands/agent_server/docker/wallpaper.svg,sha256=FR2g_b5mzz0x5EvRTKO93ASnWPagAyeS9RI3vRQBAsw,11532
 openhands/agent_server/vscode_extensions/openhands-settings/extension.js,sha256=xoCKZ6YXlzlTWnTC52HuzX0sn9s77Vma-47WgEibO88,858
 openhands/agent_server/vscode_extensions/openhands-settings/package.json,sha256=eCkuBBYEVArEjpp7c_m0H207OCLEygZhBLUEkeFNWOg,289
-openhands_agent_server-1.9.0.dist-info/METADATA,sha256=xU9j2XKQ9PD1vPh5e7APdXkY4JzfFRlWv-BBe9ZeIEE,748
-openhands_agent_server-1.9.0.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-openhands_agent_server-1.9.0.dist-info/entry_points.txt,sha256=uLQzPhqDqe85Dy9DvPiBE2CeqkwCryggr1Ty_mq65NA,70
-openhands_agent_server-1.9.0.dist-info/top_level.txt,sha256=jHgVu9I0Blam8BXFgedoGKfglPF8XvW1TsJFIjcgP4E,10
-openhands_agent_server-1.9.0.dist-info/RECORD,,
+openhands_agent_server-1.10.0.dist-info/METADATA,sha256=hCtt3IEZL-iGj6ybOZrjr5AJ-A_Rb61_yWDFXNXsf-c,749
+openhands_agent_server-1.10.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+openhands_agent_server-1.10.0.dist-info/entry_points.txt,sha256=uLQzPhqDqe85Dy9DvPiBE2CeqkwCryggr1Ty_mq65NA,70
+openhands_agent_server-1.10.0.dist-info/top_level.txt,sha256=jHgVu9I0Blam8BXFgedoGKfglPF8XvW1TsJFIjcgP4E,10
+openhands_agent_server-1.10.0.dist-info/RECORD,,

{openhands_agent_server-1.9.0.dist-info → openhands_agent_server-1.10.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.10.1)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any