test: use default agent preset for integration tests

tests/integration/base.py

@@ -25,6 +25,7 @@
     MessageEvent,
 )
 from openhands.sdk.tool import Tool
+from openhands.tools.preset.default import get_default_tools
 from tests.integration.early_stopper import EarlyStopperBase, EarlyStopResult
 
 
@@ -204,10 +205,25 @@ def instruction_message(self) -> Message:
         return Message(role="user", content=[TextContent(text=self.instruction)])
 
     @property
-    @abstractmethod
+    def enable_browser(self) -> bool:
+        """Whether to enable browser tools. Override in subclasses that need browsing.
+
+        Returns:
+            False by default. Override to True for tests that require browser access.
+        """
+        return False
+
+    @property
     def tools(self) -> list[Tool]:
-        """List of tools available to the agent."""
-        pass
+        """List of tools available to the agent.
+
+        By default, uses the default preset tools from openhands.tools.preset.default.
+        This ensures integration tests validate the same agent configuration shipped
+        to production (GUI/CLI).
+
+        Override this property in subclasses that need custom tool configurations.
+        """
+        return get_default_tools(enable_browser=self.enable_browser)
 
     @property
     def condenser(self) -> CondenserBase | None:

tests/integration/tests/b05_do_not_create_redundant_files.py

@@ -7,9 +7,6 @@
 from textwrap import dedent
 
 from openhands.sdk import get_logger
-from openhands.sdk.tool import Tool, register_tool
-from openhands.tools.file_editor import FileEditorTool
-from openhands.tools.terminal import TerminalTool
 from tests.integration.base import BaseIntegrationTest, SkipTest, TestResult
 from tests.integration.behavior_utils import (
     get_conversation_summary,
@@ -32,12 +29,6 @@ class NoRedundantFilesTest(BaseIntegrationTest):
 
     INSTRUCTION: str = INSTRUCTION
 
-    @property
-    def tools(self) -> list[Tool]:
-        register_tool("TerminalTool", TerminalTool)
-        register_tool("FileEditorTool", FileEditorTool)
-        return [Tool(name="TerminalTool"), Tool(name="FileEditorTool")]
-
     def setup(self) -> None:  # noqa: D401
         """Set up a realistic codebase by cloning the lerobot repo."""
         try:

tests/integration/tests/t01_fix_simple_typo.py

@@ -3,9 +3,6 @@
 import os
 
 from openhands.sdk import get_logger
-from openhands.sdk.tool import Tool, register_tool
-from openhands.tools.file_editor import FileEditorTool
-from openhands.tools.terminal import TerminalTool
 from tests.integration.base import BaseIntegrationTest, TestResult
 
 
@@ -34,16 +31,6 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.document_path: str = os.path.join(self.workspace, "document.txt")
 
-    @property
-    def tools(self) -> list[Tool]:
-        """List of tools available to the agent."""
-        register_tool("TerminalTool", TerminalTool)
-        register_tool("FileEditorTool", FileEditorTool)
-        return [
-            Tool(name="TerminalTool"),
-            Tool(name="FileEditorTool"),
-        ]
-
     def setup(self) -> None:
         """Create a text file with typos for the agent to fix."""
         # Create the test file with typos

tests/integration/tests/t02_add_bash_hello.py

@@ -3,9 +3,6 @@
 import os
 
 from openhands.sdk import get_logger
-from openhands.sdk.tool import Tool, register_tool
-from openhands.tools.file_editor import FileEditorTool
-from openhands.tools.terminal import TerminalTool
 from tests.integration.base import BaseIntegrationTest, TestResult
 
 
@@ -24,16 +21,6 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.script_path: str = os.path.join(self.workspace, "shell", "hello.sh")
 
-    @property
-    def tools(self) -> list[Tool]:
-        """List of tools available to the agent."""
-        register_tool("TerminalTool", TerminalTool)
-        register_tool("FileEditorTool", FileEditorTool)
-        return [
-            Tool(name="TerminalTool"),
-            Tool(name="FileEditorTool"),
-        ]
-
     def setup(self) -> None:
         """Setup is not needed - agent will create directories as needed."""
 

tests/integration/tests/t03_jupyter_write_file.py

@@ -3,9 +3,6 @@
 import os
 
 from openhands.sdk import get_logger
-from openhands.sdk.tool import Tool, register_tool
-from openhands.tools.file_editor import FileEditorTool
-from openhands.tools.terminal import TerminalTool
 from tests.integration.base import BaseIntegrationTest, TestResult
 
 
@@ -27,16 +24,6 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.file_path: str = os.path.join(self.workspace, "test.txt")
 
-    @property
-    def tools(self) -> list[Tool]:
-        """List of tools available to the agent."""
-        register_tool("TerminalTool", TerminalTool)
-        register_tool("FileEditorTool", FileEditorTool)
-        return [
-            Tool(name="TerminalTool"),
-            Tool(name="FileEditorTool"),
-        ]
-
     def setup(self) -> None:
         """Setup is not needed - agent will create directories as needed."""
 

tests/integration/tests/t04_git_staging.py

@@ -4,9 +4,6 @@
 import subprocess
 
 from openhands.sdk import get_logger
-from openhands.sdk.tool import Tool, register_tool
-from openhands.tools.file_editor import FileEditorTool
-from openhands.tools.terminal import TerminalTool
 from tests.integration.base import BaseIntegrationTest, TestResult
 
 
@@ -23,16 +20,6 @@ class GitStagingTest(BaseIntegrationTest):
 
     INSTRUCTION: str = INSTRUCTION
 
-    @property
-    def tools(self) -> list[Tool]:
-        """List of tools available to the agent."""
-        register_tool("TerminalTool", TerminalTool)
-        register_tool("FileEditorTool", FileEditorTool)
-        return [
-            Tool(name="TerminalTool"),
-            Tool(name="FileEditorTool"),
-        ]
-
     def setup(self) -> None:
         """Set up git repository with staged changes."""
         # Initialize git repository

tests/integration/tests/t05_simple_browsing.py

@@ -7,9 +7,6 @@
 
 from openhands.sdk import get_logger
 from openhands.sdk.conversation import get_agent_final_response
-from openhands.sdk.tool import Tool, register_tool
-from openhands.tools.file_editor import FileEditorTool
-from openhands.tools.terminal import TerminalTool
 from tests.integration.base import BaseIntegrationTest, TestResult
 
 
@@ -101,14 +98,9 @@ def __init__(self, *args, **kwargs):
         self.server_process: subprocess.Popen[bytes] | None = None
 
     @property
-    def tools(self) -> list[Tool]:
-        """List of tools available to the agent."""
-        register_tool("TerminalTool", TerminalTool)
-        register_tool("FileEditorTool", FileEditorTool)
-        return [
-            Tool(name="TerminalTool"),
-            Tool(name="FileEditorTool"),
-        ]
+    def enable_browser(self) -> bool:
+        """Enable browser tools for this browsing test."""
+        return True
 
     def setup(self) -> None:
         """Set up a local web server with the HTML file."""

tests/integration/tests/t06_github_pr_browsing.py

@@ -2,9 +2,6 @@
 
 from openhands.sdk import get_logger
 from openhands.sdk.conversation import get_agent_final_response
-from openhands.sdk.tool import Tool, register_tool
-from openhands.tools.file_editor import FileEditorTool
-from openhands.tools.terminal import TerminalTool
 from tests.integration.base import BaseIntegrationTest, TestResult
 
 
@@ -23,14 +20,9 @@ class GitHubPRBrowsingTest(BaseIntegrationTest):
     INSTRUCTION: str = INSTRUCTION
 
     @property
-    def tools(self) -> list[Tool]:
-        """List of tools available to the agent."""
-        register_tool("TerminalTool", TerminalTool)
-        register_tool("FileEditorTool", FileEditorTool)
-        return [
-            Tool(name="TerminalTool"),
-            Tool(name="FileEditorTool"),
-        ]
+    def enable_browser(self) -> bool:
+        """Enable browser tools for this browsing test."""
+        return True
 
     def setup(self) -> None:
         """No special setup needed for GitHub PR browsing."""

tests/integration/tests/t07_interactive_commands.py

@@ -4,9 +4,6 @@
 import os
 
 from openhands.sdk import get_logger
-from openhands.sdk.tool import Tool, register_tool
-from openhands.tools.file_editor import FileEditorTool
-from openhands.tools.terminal import TerminalTool
 from tests.integration.base import BaseIntegrationTest, TestResult
 
 
@@ -40,16 +37,6 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.script_path: str = os.path.join(self.workspace, "python_script.py")
 
-    @property
-    def tools(self) -> list[Tool]:
-        """List of tools available to the agent."""
-        register_tool("TerminalTool", TerminalTool)
-        register_tool("FileEditorTool", FileEditorTool)
-        return [
-            Tool(name="TerminalTool"),
-            Tool(name="FileEditorTool"),
-        ]
-
     def setup(self) -> None:
         """Set up the interactive Python script."""
 

tests/integration/tests/t08_image_file_viewing.py

@@ -5,9 +5,6 @@
 
 from openhands.sdk import get_logger
 from openhands.sdk.conversation.response_utils import get_agent_final_response
-from openhands.sdk.tool import Tool, register_tool
-from openhands.tools.file_editor import FileEditorTool
-from openhands.tools.terminal import TerminalTool
 from tests.integration.base import BaseIntegrationTest, SkipTest, TestResult
 
 
@@ -38,16 +35,6 @@ def __init__(self, *args, **kwargs):
                 "Please use a model that supports image input."
             )
 
-    @property
-    def tools(self) -> list[Tool]:
-        """List of tools available to the agent."""
-        register_tool("TerminalTool", TerminalTool)
-        register_tool("FileEditorTool", FileEditorTool)
-        return [
-            Tool(name="TerminalTool"),
-            Tool(name="FileEditorTool"),
-        ]
-
     def setup(self) -> None:
         """Download the OpenHands logo for the agent to analyze."""
         try:

tests/integration/utils/behavior_helpers.py

@@ -8,9 +8,8 @@
 from typing import Any
 
 from openhands.sdk import get_logger
-from openhands.sdk.tool import Tool, register_tool
-from openhands.tools.file_editor import FileEditorTool
-from openhands.tools.terminal import TerminalTool
+from openhands.sdk.tool import Tool
+from openhands.tools.preset.default import get_default_tools
 from tests.integration.base import BaseIntegrationTest, SkipTest
 from tests.integration.early_stopper import EarlyStopperBase
 
@@ -83,11 +82,14 @@ def clone_pinned_software_agent_repo(workspace: str) -> Path:
     return repo_dir
 
 
-def default_behavior_tools() -> list[Tool]:
-    """Register and return the default tools for behavior tests."""
-    register_tool("TerminalTool", TerminalTool)
-    register_tool("FileEditorTool", FileEditorTool)
-    return [Tool(name="TerminalTool"), Tool(name="FileEditorTool")]
+def default_behavior_tools(enable_browser: bool = False) -> list[Tool]:
+    """Return the default tools for behavior tests using the default preset.
+
+    Args:
+        enable_browser: Whether to include browser tools. Defaults to False
+            for behavior tests since they typically don't need browsing.
+    """
+    return get_default_tools(enable_browser=enable_browser)
 
 
 ENVIRONMENT_TIPS_BODY = """\