Replace bash and edit tools with hud-python implementations

Dockerfile.hud

@@ -82,7 +82,8 @@ RUN --mount=type=bind,source=.,target=/ctx \
         cp -r /ctx/${PROJECT_SUBMODULE}/. /home/ubuntu/${FOLDER_NAME}/ && \
         rm -f /home/ubuntu/${FOLDER_NAME}/.git && \
         cp -r /ctx/.git/modules/${PROJECT_SUBMODULE}/. /home/ubuntu/${FOLDER_NAME}/.git/ && \
-        cd /home/ubuntu/${FOLDER_NAME} && git config --unset core.worktree || true; \
+        cd /home/ubuntu/${FOLDER_NAME} && \
+        sed -i '/worktree = /d' .git/config; \
     fi && \
     chown -R ubuntu:ubuntu /home/ubuntu/${FOLDER_NAME}
 

env.py

@@ -10,11 +10,11 @@
 import logging
 import os
 import subprocess
-from pathlib import Path
 
 from hud import Environment
-
-from tools import BashTool, EditTool, ToolError
+from hud.tools.coding import BashTool, EditTool
+from hud.tools.types import ToolError
+from mcp.types import TextContent
 
 logger = logging.getLogger(__name__)
 
@@ -47,8 +47,8 @@ async def shutdown() -> None:
     """Clean up the coding environment."""
     global _bash_tool, _edit_tool
 
-    if _bash_tool and _bash_tool._session:
-        _bash_tool._session.stop()
+    if _bash_tool and _bash_tool.session:
+        _bash_tool.session.stop()
 
     _bash_tool = None
     _edit_tool = None
@@ -60,6 +60,15 @@ async def shutdown() -> None:
 # ============================================================================
 
 
+def _extract_text_from_blocks(blocks: list) -> str:
+    """Extract text content from a list of ContentBlocks."""
+    texts = []
+    for block in blocks:
+        if isinstance(block, TextContent):
+            texts.append(block.text)
+    return "\n".join(texts) if texts else ""
+
+
 @env.tool()
 async def bash(
     command: str | None = None,
@@ -74,17 +83,16 @@ async def bash(
     Returns:
         The command output or error message
     """
+    global _bash_tool
+
     if _bash_tool is None:
-        return "Error: Bash tool not initialized"
+        _bash_tool = BashTool()
 
     try:
-        result = await _bash_tool(command=command, restart=restart)
-        output = result.output or ""
-        if result.error:
-            output = f"{output}\n{result.error}".strip() if output else result.error
-        return output or result.system or ""
+        blocks = await _bash_tool(command=command, restart=restart)
+        return _extract_text_from_blocks(blocks)
     except ToolError as e:
-        return f"Error: {e.message}"
+        return f"Error: {e}"
 
 
 @env.tool()
@@ -111,11 +119,13 @@ async def editor(
     Returns:
         The command result or file content
     """
+    global _edit_tool
+
     if _edit_tool is None:
-        return "Error: Editor tool not initialized"
+        _edit_tool = EditTool()
 
     try:
-        result = await _edit_tool(
+        blocks = await _edit_tool(
             command=command,  # type: ignore
             path=path,
             file_text=file_text,
@@ -124,11 +134,9 @@ async def editor(
             new_str=new_str,
             insert_line=insert_line,
         )
-        if result.error:
-            return f"Error: {result.error}"
-        return result.output or ""
+        return _extract_text_from_blocks(blocks)
     except ToolError as e:
-        return f"Error: {e.message}"
+        return f"Error: {e}"
 
 
 # ============================================================================
@@ -138,7 +146,7 @@ async def editor(
 
 def setup_task(task_id: str, base: str, test: str, golden: str, validate_golden: bool = False) -> None:
     """Set up environment for a task: checkout baseline, generate patches.
-    
+
     Args:
         task_id: Unique identifier for the task (used for patch directory)
         base: Baseline branch name
@@ -147,14 +155,14 @@ def setup_task(task_id: str, base: str, test: str, golden: str, validate_golden:
     """
     project_dir = _get_project_dir()
     patches_dir = os.environ.get("PATCHES_DIR", "/home/root/patches")
-    
+
     # Set PROBLEM_ID env var for grading runner
     os.environ["PROBLEM_ID"] = task_id
-    
+
     # Generate patches at runtime
     task_patches_dir = os.path.join(patches_dir, task_id)
     os.makedirs(task_patches_dir, exist_ok=True)
-    
+
     # Generate test.patch (base → test)
     logger.info("Generating test.patch: %s → %s", base, test)
     result = subprocess.run(
@@ -165,7 +173,7 @@ def setup_task(task_id: str, base: str, test: str, golden: str, validate_golden:
     )
     with open(os.path.join(task_patches_dir, "test.patch"), "w") as f:
         f.write(result.stdout)
-    
+
     # Generate golden.patch (base → golden)
     logger.info("Generating golden.patch: %s → %s", base, golden)
     result = subprocess.run(
@@ -176,7 +184,7 @@ def setup_task(task_id: str, base: str, test: str, golden: str, validate_golden:
     )
     with open(os.path.join(task_patches_dir, "golden.patch"), "w") as f:
         f.write(result.stdout)
-    
+
     # Checkout baseline branch
     logger.info("Checking out baseline branch: %s", base)
     result = subprocess.run(
@@ -193,22 +201,20 @@ def setup_task(task_id: str, base: str, test: str, golden: str, validate_golden:
         subprocess.run(["chown", "-R", "ubuntu:ubuntu", project_dir], capture_output=True)
         # Keep .git protected
         subprocess.run(["chown", "-R", "root:root", os.path.join(project_dir, ".git")], capture_output=True)
-
-    os.chdir(project_dir)
-
 
+    os.chdir(project_dir)
 
 
 def make_prompt(description: str) -> str:
     """Generate a prompt from a task description.
-    
+
     Args:
         description: The task description
-        
+
     Returns:
         Formatted prompt string
     """
-    folder_name = os.environ.get('FOLDER_NAME', 'project')
+    folder_name = os.environ.get("FOLDER_NAME", "project")
     return f"""You will be working on a task for {folder_name}.
 The repository has already been cloned in /home/ubuntu/{folder_name}.
 

pyproject.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 description = "Coding environment with bash, editor, and VNC tools for solving programming tasks"
 readme = "README.md"
 requires-python = ">=3.11"
-dependencies = [ "hud-python[agents]>=0.5.17", "click>=8.0.0", "mcp[cli]>=1.10.1", "numpy>=1.26.0", "packaging>=21.0", "pillow", "pydantic>=2.11.4",]
+dependencies = [ "hud-python[agents] @ git+https://github.com/hud-evals/hud-python.git@hud-685", "click>=8.0.0", "mcp[cli]>=1.10.1", "numpy>=1.26.0", "packaging>=21.0", "pillow", "pydantic>=2.11.4",]
 
 [build-system]
 requires = [ "hatchling",]
@@ -16,6 +16,9 @@ dev = [ "pytest>=8.0.0", "ruff==0.11.2", "pre-commit>=3.5.0",]
 [project.scripts]
 hud_eval = "cli:main"
 
+[tool.hatch.metadata]
+allow-direct-references = true
+
 [tool.ruff]
 target-version = "py311"
 line-length = 120

tools/__init__.py

@@ -1,16 +1,12 @@
-"""Tools for coding environment - bash and editor."""
+"""Tools for coding environment - utilities."""
 from .base import CLIResult, ToolError, ToolFailure, ToolResult
-from .bash import BashTool
-from .editor import EditTool
 from .run import demote, maybe_truncate, run
 
 __all__ = [
     "CLIResult",
     "ToolError",
     "ToolFailure",
     "ToolResult",
-    "BashTool",
-    "EditTool",
     "demote",
     "maybe_truncate",
     "run",