openhands-tools 1.27.0__tar.gz → 1.28.0__tar.gz

{openhands_tools-1.27.0 → openhands_tools-1.28.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openhands-tools
-Version: 1.27.0
+Version: 1.28.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

{openhands_tools-1.27.0 → openhands_tools-1.28.0}/openhands/tools/terminal/definition.py

@@ -34,6 +34,55 @@ from openhands.tools.terminal.descriptions import (
 from openhands.tools.terminal.metadata import CmdOutputMetadata
 
 
+_LITERAL_ARG_HINT_TEMPLATE = (
+    "[Tool-argument error] The `command` argument looks like a Python/JSON "
+    "{literal_kind}, not a shell command. It starts with: {head!r}\n\n"
+    "The `terminal` tool runs exactly ONE shell command at a time. To pass "
+    "structured data or multi-line code:\n"
+    "  - Write a script first with `file_editor` "
+    '(command="create", path="/tmp/run.py", ...), then invoke it: '
+    "`python /tmp/run.py`.\n"
+    "  - Or use a heredoc inline, e.g.:\n"
+    "        python - <<'EOF'\n"
+    "        DATABASES = {{'default': {{...}}}}\n"
+    "        # your code here\n"
+    "        EOF\n\n"
+    "Do not put a Python list/dict literal into the `command` field; the shell "
+    "cannot interpret it."
+)
+
+
+def looks_like_python_literal_argument(command: str) -> str | None:
+    """Detect when a tool call has packed structured data into `command`.
+
+    Returns a short reason string (``"list literal"``, ``"nested list literal"``
+    or ``"dict literal"``) if ``command`` appears to be a Python/JSON literal
+    rather than a shell command, otherwise ``None``.
+
+    Carefully distinguishes legitimate bash uses of ``[`` and ``[[`` (which
+    are always followed by whitespace) from Python-style literals. See the
+    accompanying tests for the full matrix.
+    """
+    stripped = command.lstrip()
+    if len(stripped) < 2:
+        return None
+    a, b = stripped[0], stripped[1]
+    # Top-level list literals: [{...}], ["..."], ['...']
+    if a == "[" and b in ("{", '"', "'"):
+        return "list literal"
+    # Nested list literals: [[...]] — but bash `[[ -f x ]]` is followed by a
+    # whitespace char, so we only flag `[[` followed by non-whitespace.
+    if a == "[" and b == "[":
+        if len(stripped) >= 3 and stripped[2] not in (" ", "\t"):
+            return "nested list literal"
+        return None
+    # Top-level dict literals: {"key": ...} or {'key': ...}.
+    # Bash group commands `{ ls; }` always have a space after `{`.
+    if a == "{" and b in ('"', "'"):
+        return "dict literal"
+    return None
+
+
 class TerminalAction(Action):
     """Schema for terminal command execution."""
 

{openhands_tools-1.27.0 → openhands_tools-1.28.0}/openhands/tools/terminal/impl.py

@@ -15,8 +15,10 @@ if TYPE_CHECKING:
     from openhands.sdk.conversation import LocalConversation
 from openhands.tools.terminal.constants import CMD_OUTPUT_PS1_END
 from openhands.tools.terminal.definition import (
+    _LITERAL_ARG_HINT_TEMPLATE,
     TerminalAction,
     TerminalObservation,
+    looks_like_python_literal_argument,
 )
 from openhands.tools.terminal.terminal.factory import (
     _is_tmux_available,
@@ -538,6 +540,33 @@ class TerminalExecutor(ToolExecutor[TerminalAction, TerminalObservation]):
         if action.reset and action.is_input:
             raise ValueError("Cannot use reset=True with is_input=True")
 
+        # Short-circuit obvious tool-call malformation: Python/JSON literals
+        # passed where the model should have sent a shell command. The shell
+        # would otherwise echo a confusing `command not found` and the model
+        # rarely self-corrects without a structured hint. Skip the check when
+        # `is_input=True` because that path forwards raw bytes (e.g. keystrokes
+        # like `C-c`) to a running process and is not a fresh shell command.
+        if not action.is_input:
+            literal_kind = looks_like_python_literal_argument(action.command)
+            if literal_kind is not None:
+                head = action.command.lstrip()[:60]
+                logger.warning(
+                    "Rejected terminal call: command argument looks like a "
+                    "Python/JSON %s (head=%r). Returning structured hint to "
+                    "the model instead of executing.",
+                    literal_kind,
+                    head,
+                )
+                return TerminalObservation.from_text(
+                    _LITERAL_ARG_HINT_TEMPLATE.format(
+                        literal_kind=literal_kind,
+                        head=head,
+                    ),
+                    is_error=True,
+                    command=action.command,
+                    exit_code=None,
+                )
+
         if self._pool is not None:
             return self._execute_pooled(action, conversation)
         else:

{openhands_tools-1.27.0 → openhands_tools-1.28.0}/openhands_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openhands-tools
-Version: 1.27.0
+Version: 1.28.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

{openhands_tools-1.27.0 → openhands_tools-1.28.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "openhands-tools"
-version = "1.27.0"
+version = "1.28.0"
 description = "OpenHands Tools - Runtime tools for AI agents"
 
 requires-python = ">=3.12"