openhands-tools 1.54.0__tar.gz → 1.55.0__tar.gz

{openhands_tools-1.54.0 → openhands_tools-1.55.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openhands-tools
-Version: 1.54.0
+Version: 1.55.0
 Summary: OpenHands Tools - Runtime tools for AI agents
 Project-URL: Source, https://github.com/OpenHands/software-agent-sdk
 Project-URL: Homepage, https://github.com/OpenHands/software-agent-sdk
@@ -12,6 +12,7 @@ Requires-Dist: tree-sitter>=0.24
 Requires-Dist: tree-sitter-bash>=0.23
 Requires-Dist: binaryornot>=0.6.0
 Requires-Dist: cachetools
+Requires-Dist: filelock>=3.20.1
 Requires-Dist: libtmux>=0.53.0
 Requires-Dist: pydantic>=2.13.5
 Requires-Dist: browser-use>=0.8.0

{openhands_tools-1.54.0 → openhands_tools-1.55.0}/openhands/tools/delegate/impl.py

@@ -13,6 +13,7 @@ from openhands.sdk.conversation.state import (
 )
 from openhands.sdk.logger import get_logger
 from openhands.sdk.subagent import get_agent_factory
+from openhands.sdk.subagent.scope import inherit_mcp_config
 from openhands.sdk.tool.tool import ToolExecutor
 from openhands.tools.delegate.definition import DelegateObservation
 
@@ -188,7 +189,9 @@ class DelegateExecutor(ToolExecutor):
                 worker_agent = factory.factory_func(sub_agent_llm)
 
                 # ensuring that the sub-agent LLM has stream deactivated
-                worker_agent = worker_agent.model_copy(
+                worker_agent = inherit_mcp_config(
+                    parent_conversation.agent, worker_agent
+                ).model_copy(
                     update={
                         "llm": worker_agent.llm.model_copy(update={"stream": False})
                     }
@@ -223,6 +226,8 @@ class DelegateExecutor(ToolExecutor):
                     "_parent_llm_call_context": (
                         parent_conversation.get_llm_call_context()
                     ),
+                    "mcp_tool_provider": parent_conversation._mcp_tool_provider,
+                    "_mcp_config_from_parent": True,
                 }
 
                 if factory.definition.max_iteration_per_run is not None:

{openhands_tools-1.54.0 → openhands_tools-1.55.0}/openhands/tools/task/definition.py

@@ -244,8 +244,9 @@ class TaskToolSet(ToolDefinition[TaskAction, TaskObservation]):
                 confirmation policy requires user approval.  Receives
                 `(task_id, pending_actions)` and must return `True` to
                 approve or `False` to reject.
-            sub_agent_scope: Which of this agent's capabilities the sub-agents
-                it offers and starts must stay within.
+            sub_agent_scope: Whether the sub-agents it offers and starts must
+                stay within this agent's tools. Sub-agents always inherit this
+                agent's MCP servers.
 
         Returns:
             List containing a single TaskTool.
@@ -264,8 +265,7 @@ class TaskToolSet(ToolDefinition[TaskAction, TaskObservation]):
             agent_types_info = get_factory_info(lambda d: d.name in registered)
         else:
             agent_types_info = (
-                "- None: every registered agent uses tools or MCP servers "
-                "this agent does not have."
+                "- None: every registered agent uses tools this agent does not have."
             )
 
         task_tool_examples = "\n".join(

{openhands_tools-1.54.0 → openhands_tools-1.55.0}/openhands/tools/task/manager.py

@@ -35,7 +35,11 @@ from openhands.sdk.logger import get_logger
 from openhands.sdk.observability.laminar import detached_delegate_context
 from openhands.sdk.security import ConfirmationPolicyBase
 from openhands.sdk.subagent.registry import AgentFactory, get_agent_factory
-from openhands.sdk.subagent.scope import SubAgentScope, scope_delegation_tools
+from openhands.sdk.subagent.scope import (
+    SubAgentScope,
+    inherit_mcp_config,
+    scope_delegation_tools,
+)
 
 
 if TYPE_CHECKING:
@@ -225,6 +229,8 @@ class TaskManager:
                     _parent_llm_call_context=(
                         self.parent_conversation.get_llm_call_context()
                     ),
+                    mcp_tool_provider=self.parent_conversation._mcp_tool_provider,
+                    _mcp_config_from_parent=True,
                     delete_on_close=True,
                     observability_metadata=self._delegate_observability_metadata(
                         task_id=resume, subagent_type=subagent_type, link=link
@@ -328,6 +334,8 @@ class TaskManager:
                 max_budget_per_run=max_budget_per_run,
                 hook_config=hook_config,
                 _parent_llm_call_context=parent.get_llm_call_context(),
+                mcp_tool_provider=parent._mcp_tool_provider,
+                _mcp_config_from_parent=True,
                 delete_on_close=True,
                 prompt_cache_key=str(parent.state.id),
                 observability_metadata=self._delegate_observability_metadata(
@@ -391,7 +399,7 @@ class TaskManager:
             )
 
         # ensuring that the sub-agent LLM has stream deactivated
-        sub_agent = sub_agent.model_copy(
+        sub_agent = inherit_mcp_config(parent.agent, sub_agent).model_copy(
             update={
                 "llm": sub_agent.llm.model_copy(update={"stream": False}),
                 "tools": scope_delegation_tools(sub_agent.tools, self._sub_agent_scope),

{openhands_tools-1.54.0 → openhands_tools-1.55.0}/openhands/tools/task_tracker/definition.py

@@ -1,9 +1,9 @@
 import json
 from collections.abc import Sequence
 from pathlib import Path
-from typing import TYPE_CHECKING, ClassVar, Literal
+from typing import TYPE_CHECKING, ClassVar, Literal, get_args
 
-from pydantic import BaseModel, Field, ValidationError
+from pydantic import BaseModel, Field, ValidationError, field_validator
 
 
 if TYPE_CHECKING:
@@ -28,6 +28,14 @@ logger = get_logger(__name__)
 # Type alias for task tracker status
 TaskTrackerStatusType = Literal["todo", "in_progress", "done"]
 
+# Models trained on other agents' todo tools send these names for our statuses.
+_STATUS_ALIASES: dict[str, TaskTrackerStatusType] = {
+    "pending": "todo",
+    "to_do": "todo",
+    "completed": "done",
+    "complete": "done",
+}
+
 
 class TaskItem(BaseModel):
     title: str = Field(..., description="A brief title for the task.")
@@ -38,6 +46,16 @@ class TaskItem(BaseModel):
         "One of 'todo', 'in_progress', or 'done'.",
     )
 
+    @field_validator("status", mode="before")
+    @classmethod
+    def _normalize_status(cls, value: object) -> object:
+        if not isinstance(value, str):
+            return value
+        normalized = value.strip().lower().replace("-", "_").replace(" ", "_")
+        if normalized in get_args(TaskTrackerStatusType):
+            return normalized
+        return _STATUS_ALIASES.get(normalized, value)
+
 
 class TaskTrackerAction(Action):
     """An action where the agent writes or updates a task list for task management."""
@@ -406,6 +424,7 @@ class TaskTrackerTool(ToolDefinition[TaskTrackerAction, TaskTrackerObservation])
     catalog_description: ClassVar[str] = (
         "Keep a running task list to organise multi-step work."
     )
+    conversation_local: ClassVar[bool] = True
 
     @classmethod
     def create(cls, conv_state: "ConversationState") -> Sequence["TaskTrackerTool"]:

{openhands_tools-1.54.0 → openhands_tools-1.55.0}/openhands/tools/terminal/constants.py

@@ -30,12 +30,26 @@ TIMEOUT_MESSAGE_TEMPLATE: Final[str] = (
 # How long to wait with no new output before considering it a no-change timeout
 NO_CHANGE_TIMEOUT_SECONDS: Final[int] = 30
 
-# How often to poll for new output in seconds
+# How often to poll for new output in seconds, once a command has run for a while
 POLL_INTERVAL: Final[float] = 0.5
+# Shortest poll interval, used right after a command is sent
+MIN_POLL_INTERVAL: Final[float] = 0.02
 HISTORY_LIMIT: Final[int] = 10_000
 
 TMUX_SOCKET_NAME: Final[str] = "openhands"
 
+# tmux user option recording the PID of the process that created a socket.
+# Startup cleanup reads it so it does not kill the live sessions of a sibling
+# agent-server that shares one externally supplied TMUX_TMPDIR.
+TMUX_SOCKET_OWNER_OPTION: Final[str] = "@openhands_socket_owner_pid"
+
+# Cross-process lock file, inside the tmux socket directory, that serializes
+# socket creation with the agent-server's startup cleanup. A socket only exists
+# between creation and the recording of its owner, so both operations take this
+# lock to keep cleanup from reclaiming a socket that a live process is still
+# setting up.
+TMUX_SOCKET_CREATION_LOCK: Final[str] = ".openhands-socket-creation.lock"
+
 # Tmux session dimensions (columns x rows). Keep the viewport wide enough for
 # common command output while leaving scrollback retention to HISTORY_LIMIT.
 # Output wider than TMUX_SESSION_WIDTH columns will wrap; this is an accepted

{openhands_tools-1.54.0 → openhands_tools-1.55.0}/openhands/tools/terminal/terminal/terminal_session.py

@@ -10,6 +10,7 @@ from openhands.sdk.utils import maybe_truncate
 from openhands.tools.terminal.constants import (
     CMD_OUTPUT_PS1_END,
     MAX_CMD_OUTPUT_SIZE,
+    MIN_POLL_INTERVAL,
     NO_CHANGE_TIMEOUT_SECONDS,
     POLL_INTERVAL,
     TIMEOUT_MESSAGE_TEMPLATE,
@@ -769,5 +770,6 @@ class TerminalSession(TerminalSessionBase):
                     )
                     return obs
 
-            # Sleep before next check
-            time.sleep(POLL_INTERVAL)
+            # Poll in proportion to the command's run time so a short command is
+            # noticed within milliseconds, not at the next POLL_INTERVAL tick.
+            time.sleep(min(POLL_INTERVAL, max(MIN_POLL_INTERVAL, elapsed_time / 4)))

{openhands_tools-1.54.0 → openhands_tools-1.55.0}/openhands/tools/terminal/terminal/tmux_pane_pool.py

@@ -22,13 +22,15 @@ from openhands.tools.terminal.constants import (
     HISTORY_LIMIT,
     TMUX_SESSION_HEIGHT,
     TMUX_SESSION_WIDTH,
-    TMUX_SOCKET_NAME,
 )
 from openhands.tools.terminal.env import (
     build_terminal_env,
     normalize_terminal_env,
 )
-from openhands.tools.terminal.terminal.tmux_terminal import TmuxTerminal
+from openhands.tools.terminal.terminal.tmux_terminal import (
+    TmuxTerminal,
+    _new_owned_session,
+)
 
 
 logger = get_logger(__name__)
@@ -118,15 +120,12 @@ class TmuxPanePool:
             return
 
         env = build_terminal_env(self.env)
-        # Stale handles must not reach another pool after tmux restarts.
-        self._server = libtmux.Server(
-            socket_name=f"{TMUX_SOCKET_NAME}-{uuid.uuid4().hex}", environment=env
-        )
         session_name = f"openhands-pool-{self.username}-{uuid.uuid4()}"
-        self._session = self._server.new_session(
+        # Stale handles must not reach another pool after tmux restarts.
+        self._server, self._session = _new_owned_session(
+            env,
             session_name=session_name,
             start_directory=self.work_dir,
-            kill_session=True,
             x=TMUX_SESSION_WIDTH,
             y=TMUX_SESSION_HEIGHT,
         )

{openhands_tools-1.54.0 → openhands_tools-1.55.0}/openhands/tools/terminal/terminal/tmux_terminal.py

@@ -1,11 +1,15 @@
 """Tmux-based terminal backend implementation."""
 
 import logging
+import os
 import time
 import uuid
-from collections.abc import Mapping
+from collections.abc import Iterator, Mapping
+from contextlib import contextmanager, suppress
+from pathlib import Path
 
 import libtmux
+from filelock import FileLock
 
 from openhands.sdk.logger import get_logger
 from openhands.sdk.utils.redact import redact_api_key_literals
@@ -13,7 +17,9 @@ from openhands.tools.terminal.constants import (
     HISTORY_LIMIT,
     TMUX_SESSION_HEIGHT,
     TMUX_SESSION_WIDTH,
+    TMUX_SOCKET_CREATION_LOCK,
     TMUX_SOCKET_NAME,
+    TMUX_SOCKET_OWNER_OPTION,
 )
 from openhands.tools.terminal.env import (
     build_terminal_env,
@@ -68,6 +74,71 @@ def _install_libtmux_redaction_filter() -> None:
             libtmux_logger.addFilter(_SecretRedactFilter())
 
 
+@contextmanager
+def _socket_creation_lock() -> Iterator[None]:
+    """Serialize socket creation with the agent-server's startup cleanup.
+
+    A tmux socket exists between ``new-session`` and the recording of its owner
+    option. Startup cleanup in a sibling agent-server treats an ownerless socket
+    as reclaimable, so without this lock it can kill a socket whose live owner
+    has not finished initializing. The lock file lives in the tmux socket
+    directory, which is the one path every process sharing ``TMUX_TMPDIR``
+    agrees on even while tmux has not created any socket yet.
+    """
+    socket_dir = Path(os.environ.get("TMUX_TMPDIR", "/tmp")) / f"tmux-{os.getuid()}"
+    # tmux refuses a socket directory that is group/world accessible, and
+    # FileLock would create it with the umask default, so create it 0700 first.
+    socket_dir.mkdir(parents=True, exist_ok=True)
+    with suppress(OSError):
+        socket_dir.chmod(0o700)
+    with FileLock(socket_dir / TMUX_SOCKET_CREATION_LOCK):
+        yield
+
+
+def mark_socket_owner(server: libtmux.Server) -> None:
+    """Record this process as the owner of *server*'s socket.
+
+    The agent-server's startup cleanup reads this to tell a live sibling's
+    socket apart from a stale one when a shared ``TMUX_TMPDIR`` is in use.
+    Best-effort: a failure here only loses the ownership hint, so it must
+    never break terminal setup.
+    """
+    with suppress(Exception):
+        server.set_option(
+            TMUX_SOCKET_OWNER_OPTION, str(os.getpid()), global_=True, scope=None
+        )
+
+
+def _new_owned_session(
+    env: Mapping[str, str],
+    *,
+    session_name: str,
+    start_directory: str,
+    x: int,
+    y: int,
+) -> tuple[libtmux.Server, libtmux.Session]:
+    """Create a tmux session on a fresh socket owned by this process.
+
+    The socket only starts to exist once the session is created, so the session
+    is created and its owner recorded while holding the cross-process creation
+    lock. Startup cleanup in another process takes the same lock, so it can
+    never observe the socket before its owner is published.
+    """
+    with _socket_creation_lock():
+        server = libtmux.Server(
+            socket_name=f"{TMUX_SOCKET_NAME}-{uuid.uuid4().hex}", environment=dict(env)
+        )
+        session = server.new_session(
+            session_name=session_name,
+            start_directory=start_directory,
+            kill_session=True,
+            x=x,
+            y=y,
+        )
+        mark_socket_owner(server)
+        return server, session
+
+
 # Map normalized special key names to tmux key names.
 _TMUX_SPECIALS: dict[str, str] = {
     "ENTER": "Enter",
@@ -122,10 +193,6 @@ class TmuxTerminal(TerminalInterface):
         # auto-launch `less` on a TTY don't capture the pane and wedge the session.
         env.setdefault("GIT_PAGER", "cat")
         env.setdefault("PAGER", "cat")
-        # Never reuse a socket: tmux numeric IDs restart at zero after server exit.
-        self.server = libtmux.Server(
-            socket_name=f"{TMUX_SOCKET_NAME}-{uuid.uuid4().hex}", environment=env
-        )
         _shell_command = "/bin/bash"
         if self.username in ["root", "openhands"]:
             # This starts a non-login (new) shell for the given user
@@ -134,11 +201,12 @@ class TmuxTerminal(TerminalInterface):
         window_command = _shell_command
 
         logger.debug(f"Initializing tmux terminal with command: {window_command}")
+        # Never reuse a socket: tmux numeric IDs restart at zero after server exit.
         session_name = f"openhands-{self.username}-{uuid.uuid4()}"
-        self.session = self.server.new_session(
+        self.server, self.session = _new_owned_session(
+            env,
             session_name=session_name,
             start_directory=self.work_dir,
-            kill_session=True,
             x=TMUX_SESSION_WIDTH,
             y=TMUX_SESSION_HEIGHT,
         )

{openhands_tools-1.54.0 → openhands_tools-1.55.0}/openhands_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openhands-tools
-Version: 1.54.0
+Version: 1.55.0
 Summary: OpenHands Tools - Runtime tools for AI agents
 Project-URL: Source, https://github.com/OpenHands/software-agent-sdk
 Project-URL: Homepage, https://github.com/OpenHands/software-agent-sdk
@@ -12,6 +12,7 @@ Requires-Dist: tree-sitter>=0.24
 Requires-Dist: tree-sitter-bash>=0.23
 Requires-Dist: binaryornot>=0.6.0
 Requires-Dist: cachetools
+Requires-Dist: filelock>=3.20.1
 Requires-Dist: libtmux>=0.53.0
 Requires-Dist: pydantic>=2.13.5
 Requires-Dist: browser-use>=0.8.0

{openhands_tools-1.54.0 → openhands_tools-1.55.0}/openhands_tools.egg-info/requires.txt

@@ -3,6 +3,7 @@ tree-sitter>=0.24
 tree-sitter-bash>=0.23
 binaryornot>=0.6.0
 cachetools
+filelock>=3.20.1
 libtmux>=0.53.0
 pydantic>=2.13.5
 browser-use>=0.8.0

{openhands_tools-1.54.0 → openhands_tools-1.55.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "openhands-tools"
-version = "1.54.0"
+version = "1.55.0"
 description = "OpenHands Tools - Runtime tools for AI agents"
 
 requires-python = ">=3.12"
@@ -10,6 +10,7 @@ dependencies = [
     "tree-sitter-bash>=0.23",
     "binaryornot>=0.6.0",
     "cachetools",
+    "filelock>=3.20.1",
     "libtmux>=0.53.0",
     "pydantic>=2.13.5",
     "browser-use>=0.8.0",