Implement automatic tool registration on import

examples/01_standalone_sdk/02_custom_tools.py

@@ -34,7 +34,6 @@
 
 logger = get_logger(__name__)
 
-
 # --- Action / Observation ---
 
 
@@ -149,11 +148,10 @@ def _make_bash_and_grep_tools(conv_state) -> list[ToolDefinition]:
     return [bash_tool, grep_tool]
 
 
-register_tool("FileEditorTool", FileEditorTool)
 register_tool("BashAndGrepToolSet", _make_bash_and_grep_tools)
 
 tools = [
-    Tool(name="FileEditorTool"),
+    Tool(name=FileEditorTool.tool_name),
     Tool(name="BashAndGrepToolSet"),
 ]
 

examples/01_standalone_sdk/03_activate_skill.py

@@ -15,7 +15,7 @@
     KeywordTrigger,
     Skill,
 )
-from openhands.sdk.tool import Tool, register_tool
+from openhands.sdk.tool import Tool
 from openhands.tools.execute_bash import BashTool
 from openhands.tools.file_editor import FileEditorTool
 
@@ -34,15 +34,13 @@
     api_key=SecretStr(api_key),
 )
 
-# Tools
+# Tools (automatically registered on import)
 cwd = os.getcwd()
-register_tool("BashTool", BashTool)
-register_tool("FileEditorTool", FileEditorTool)
 tools = [
     Tool(
-        name="BashTool",
+        name=BashTool.tool_name,
     ),
-    Tool(name="FileEditorTool"),
+    Tool(name=FileEditorTool.tool_name),
 ]
 
 agent_context = AgentContext(
@@ -73,11 +71,9 @@
     user_message_suffix="The first character of your response should be 'I'",
 )
 
-
 # Agent
 agent = Agent(llm=llm, tools=tools, agent_context=agent_context)
 
-
 llm_messages = []  # collect raw LLM messages
 
 

examples/01_standalone_sdk/05_use_llm_registry.py

@@ -13,7 +13,7 @@
     TextContent,
     get_logger,
 )
-from openhands.sdk.tool import Tool, register_tool
+from openhands.sdk.tool import Tool
 from openhands.tools.execute_bash import BashTool
 
 
@@ -42,8 +42,7 @@
 
 # Tools
 cwd = os.getcwd()
-register_tool("BashTool", BashTool)
-tools = [Tool(name="BashTool")]
+tools = [Tool(name=BashTool.tool_name)]
 
 # Agent
 agent = Agent(llm=llm, tools=tools)

examples/01_standalone_sdk/06_interactive_terminal_w_reasoning.py

@@ -10,7 +10,7 @@
     LLMConvertibleEvent,
     get_logger,
 )
-from openhands.sdk.tool import Tool, register_tool
+from openhands.sdk.tool import Tool
 from openhands.tools.execute_bash import BashTool
 
 
@@ -30,10 +30,9 @@
 
 # Tools
 cwd = os.getcwd()
-register_tool("BashTool", BashTool)
 tools = [
     Tool(
-        name="BashTool",
+        name=BashTool.tool_name,
         params={"no_change_timeout_seconds": 3},
     )
 ]

examples/01_standalone_sdk/07_mcp_integration.py

@@ -11,7 +11,7 @@
     get_logger,
 )
 from openhands.sdk.security.llm_analyzer import LLMSecurityAnalyzer
-from openhands.sdk.tool import Tool, register_tool
+from openhands.sdk.tool import Tool
 from openhands.tools.execute_bash import BashTool
 from openhands.tools.file_editor import FileEditorTool
 
@@ -31,11 +31,9 @@
 )
 
 cwd = os.getcwd()
-register_tool("BashTool", BashTool)
-register_tool("FileEditorTool", FileEditorTool)
 tools = [
-    Tool(name="BashTool"),
-    Tool(name="FileEditorTool"),
+    Tool(name=BashTool.tool_name),
+    Tool(name=FileEditorTool.tool_name),
 ]
 
 # Add MCP Tools

examples/01_standalone_sdk/08_mcp_with_oauth.py

@@ -10,7 +10,7 @@
     LLMConvertibleEvent,
     get_logger,
 )
-from openhands.sdk.tool import Tool, register_tool
+from openhands.sdk.tool import Tool
 from openhands.tools.execute_bash import BashTool
 from openhands.tools.file_editor import FileEditorTool
 
@@ -30,13 +30,11 @@
 )
 
 cwd = os.getcwd()
-register_tool("BashTool", BashTool)
-register_tool("FileEditorTool", FileEditorTool)
 tools = [
     Tool(
-        name="BashTool",
+        name=BashTool.tool_name,
     ),
-    Tool(name="FileEditorTool"),
+    Tool(name=FileEditorTool.tool_name),
 ]
 
 mcp_config = {

examples/01_standalone_sdk/09_pause_example.py

@@ -9,7 +9,7 @@
     Agent,
     Conversation,
 )
-from openhands.sdk.tool import Tool, register_tool
+from openhands.sdk.tool import Tool
 from openhands.tools.execute_bash import BashTool
 from openhands.tools.file_editor import FileEditorTool
 
@@ -27,20 +27,17 @@
 )
 
 # Tools
-register_tool("BashTool", BashTool)
-register_tool("FileEditorTool", FileEditorTool)
 tools = [
     Tool(
-        name="BashTool",
+        name=BashTool.tool_name,
     ),
-    Tool(name="FileEditorTool"),
+    Tool(name=FileEditorTool.tool_name),
 ]
 
 # Agent
 agent = Agent(llm=llm, tools=tools)
 conversation = Conversation(agent, workspace=os.getcwd())
 
-
 print("=" * 60)
 print("Pause and Continue Example")
 print("=" * 60)
@@ -75,7 +72,6 @@
 print(f"Agent status after pause: {conversation.state.agent_status}")
 print()
 
-
 # Phase 3: Send a new message while paused
 print("Phase 3: Sending a new message while agent is paused...")
 conversation.send_message(

examples/01_standalone_sdk/10_persistence.py

@@ -11,7 +11,7 @@
     LLMConvertibleEvent,
     get_logger,
 )
-from openhands.sdk.tool import Tool, register_tool
+from openhands.sdk.tool import Tool
 from openhands.tools.execute_bash import BashTool
 from openhands.tools.file_editor import FileEditorTool
 
@@ -32,11 +32,9 @@
 
 # Tools
 cwd = os.getcwd()
-register_tool("BashTool", BashTool)
-register_tool("FileEditorTool", FileEditorTool)
 tools = [
-    Tool(name="BashTool"),
-    Tool(name="FileEditorTool"),
+    Tool(name=BashTool.tool_name),
+    Tool(name=FileEditorTool.tool_name),
 ]
 
 # Add MCP Tools

examples/01_standalone_sdk/11_async.py

@@ -18,7 +18,7 @@
     get_logger,
 )
 from openhands.sdk.conversation.types import ConversationCallbackType
-from openhands.sdk.tool import Tool, register_tool
+from openhands.sdk.tool import Tool
 from openhands.sdk.utils.async_utils import AsyncCallbackWrapper
 from openhands.tools.execute_bash import BashTool
 from openhands.tools.file_editor import FileEditorTool
@@ -41,15 +41,12 @@
 
 # Tools
 cwd = os.getcwd()
-register_tool("BashTool", BashTool)
-register_tool("FileEditorTool", FileEditorTool)
-register_tool("TaskTrackerTool", TaskTrackerTool)
 tools = [
     Tool(
-        name="BashTool",
+        name=BashTool.tool_name,
     ),
-    Tool(name="FileEditorTool"),
-    Tool(name="TaskTrackerTool"),
+    Tool(name=FileEditorTool.tool_name),
+    Tool(name=TaskTrackerTool.tool_name),
 ]
 
 # Agent

examples/01_standalone_sdk/12_custom_secrets.py

@@ -8,7 +8,7 @@
     Conversation,
 )
 from openhands.sdk.conversation.secret_source import SecretSource
-from openhands.sdk.tool import Tool, register_tool
+from openhands.sdk.tool import Tool
 from openhands.tools.execute_bash import BashTool
 from openhands.tools.file_editor import FileEditorTool
 
@@ -26,11 +26,9 @@
 )
 
 # Tools
-register_tool("BashTool", BashTool)
-register_tool("FileEditorTool", FileEditorTool)
 tools = [
-    Tool(name="BashTool"),
-    Tool(name="FileEditorTool"),
+    Tool(name=BashTool.tool_name),
+    Tool(name=FileEditorTool.tool_name),
 ]
 
 # Agent

examples/01_standalone_sdk/13_get_llm_metrics.py

@@ -10,7 +10,7 @@
     LLMConvertibleEvent,
     get_logger,
 )
-from openhands.sdk.tool import Tool, register_tool
+from openhands.sdk.tool import Tool
 from openhands.tools.execute_bash import BashTool
 from openhands.tools.file_editor import FileEditorTool
 
@@ -30,11 +30,9 @@
 )
 
 cwd = os.getcwd()
-register_tool("BashTool", BashTool)
-register_tool("FileEditorTool", FileEditorTool)
 tools = [
-    Tool(name="BashTool"),
-    Tool(name="FileEditorTool"),
+    Tool(name=BashTool.tool_name),
+    Tool(name=FileEditorTool.tool_name),
 ]
 
 # Add MCP Tools

examples/01_standalone_sdk/14_context_condenser.py

@@ -18,7 +18,7 @@
     get_logger,
 )
 from openhands.sdk.context.condenser import LLMSummarizingCondenser
-from openhands.sdk.tool import Tool, register_tool
+from openhands.sdk.tool import Tool
 from openhands.tools.execute_bash import BashTool
 from openhands.tools.file_editor import FileEditorTool
 from openhands.tools.task_tracker import TaskTrackerTool
@@ -40,15 +40,12 @@
 
 # Tools
 cwd = os.getcwd()
-register_tool("BashTool", BashTool)
-register_tool("FileEditorTool", FileEditorTool)
-register_tool("TaskTrackerTool", TaskTrackerTool)
 tools = [
     Tool(
-        name="BashTool",
+        name=BashTool.tool_name,
     ),
-    Tool(name="FileEditorTool"),
-    Tool(name="TaskTrackerTool"),
+    Tool(name=FileEditorTool.tool_name),
+    Tool(name=TaskTrackerTool.tool_name),
 ]
 
 # Create a condenser to manage the context. The condenser will automatically truncate
@@ -105,7 +102,6 @@ def conversation_callback(event: Event):
 )
 conversation.run()
 
-
 print("=" * 100)
 print("Conversation finished. Got the following LLM messages:")
 for i, message in enumerate(llm_messages):
@@ -129,7 +125,6 @@ def conversation_callback(event: Event):
 conversation.send_message("Finally, clean up by deleting both files.")
 conversation.run()
 
-
 print("=" * 100)
 print("Conversation finished with LLM Summarizing Condenser.")
 print(f"Total LLM messages collected: {len(llm_messages)}")

examples/01_standalone_sdk/15_browser_use.py

@@ -10,7 +10,7 @@
     LLMConvertibleEvent,
     get_logger,
 )
-from openhands.sdk.tool import Tool, register_tool
+from openhands.sdk.tool import Tool
 from openhands.tools.browser_use import BrowserToolSet
 from openhands.tools.execute_bash import BashTool
 from openhands.tools.file_editor import FileEditorTool
@@ -32,15 +32,12 @@
 
 # Tools
 cwd = os.getcwd()
-register_tool("BashTool", BashTool)
-register_tool("FileEditorTool", FileEditorTool)
-register_tool("BrowserToolSet", BrowserToolSet)
 tools = [
     Tool(
-        name="BashTool",
+        name=BashTool.tool_name,
     ),
-    Tool(name="FileEditorTool"),
-    Tool(name="BrowserToolSet"),
+    Tool(name=FileEditorTool.tool_name),
+    Tool(name=BrowserToolSet.tool_name),
 ]
 
 # If you need fine-grained browser control, you can manually register individual browser
@@ -68,7 +65,6 @@ def conversation_callback(event: Event):
 )
 conversation.run()
 
-
 print("=" * 100)
 print("Conversation finished. Got the following LLM messages:")
 for i, message in enumerate(llm_messages):

examples/01_standalone_sdk/16_llm_security_analyzer.py

@@ -14,7 +14,7 @@
 from openhands.sdk.conversation.state import AgentExecutionStatus, ConversationState
 from openhands.sdk.security.confirmation_policy import ConfirmRisky
 from openhands.sdk.security.llm_analyzer import LLMSecurityAnalyzer
-from openhands.sdk.tool import Tool, register_tool
+from openhands.sdk.tool import Tool
 from openhands.tools.execute_bash import BashTool
 from openhands.tools.file_editor import FileEditorTool
 
@@ -101,13 +101,11 @@ def run_until_finished_with_security(
 )
 
 # Tools
-register_tool("BashTool", BashTool)
-register_tool("FileEditorTool", FileEditorTool)
 tools = [
     Tool(
-        name="BashTool",
+        name=BashTool.tool_name,
     ),
-    Tool(name="FileEditorTool"),
+    Tool(name=FileEditorTool.tool_name),
 ]
 
 # Agent with security analyzer