refactor(server.py): rename tool handler from "execute" to "shell_execute" for clarity and consistency

test(tests/test_server.py): update tests to reflect the renamed tool handler "shell_execute" for accurate validation

Author: tumf

mcp_shell_server/server.py

@@ -18,7 +18,7 @@
 class ExecuteToolHandler:
     """Handler for shell command execution"""
 
-    name = "execute"
+    name = "shell_execute"
     description = "Execute a shell command"
 
     def __init__(self):

tests/test_server.py

@@ -22,7 +22,7 @@ async def test_list_tools():
     assert len(tools) == 1
     tool = tools[0]
     assert isinstance(tool, Tool)
-    assert tool.name == "execute"
+    assert tool.name == "shell_execute"
     assert tool.description
     assert tool.inputSchema["type"] == "object"
     assert "command" in tool.inputSchema["properties"]
@@ -35,7 +35,7 @@ async def test_list_tools():
 async def test_call_tool_valid_command(monkeypatch):
     """Test execution of a valid command"""
     monkeypatch.setenv("ALLOW_COMMANDS", "echo")
-    result = await call_tool("execute", {"command": ["echo", "hello world"]})
+    result = await call_tool("shell_execute", {"command": ["echo", "hello world"]})
     assert len(result) == 1
     assert isinstance(result[0], TextContent)
     assert result[0].type == "text"
@@ -46,7 +46,9 @@ async def test_call_tool_valid_command(monkeypatch):
 async def test_call_tool_with_stdin(monkeypatch):
     """Test command execution with stdin"""
     monkeypatch.setenv("ALLOW_COMMANDS", "cat")
-    result = await call_tool("execute", {"command": ["cat"], "stdin": "test input"})
+    result = await call_tool(
+        "shell_execute", {"command": ["cat"], "stdin": "test input"}
+    )
     assert len(result) == 1
     assert isinstance(result[0], TextContent)
     assert result[0].type == "text"
@@ -58,7 +60,7 @@ async def test_call_tool_invalid_command(monkeypatch):
     """Test execution of an invalid command"""
     monkeypatch.setenv("ALLOW_COMMANDS", "echo")
     with pytest.raises(RuntimeError) as excinfo:
-        await call_tool("execute", {"command": ["invalid_command"]})
+        await call_tool("shell_execute", {"command": ["invalid_command"]})
     assert "Command not allowed: invalid_command" in str(excinfo.value)
 
 
@@ -74,15 +76,15 @@ async def test_call_tool_unknown_tool():
 async def test_call_tool_invalid_arguments():
     """Test calling a tool with invalid arguments"""
     with pytest.raises(RuntimeError) as excinfo:
-        await call_tool("execute", "not a dict")
+        await call_tool("shell_execute", "not a dict")
     assert "Arguments must be a dictionary" in str(excinfo.value)
 
 
 @pytest.mark.asyncio
 async def test_call_tool_empty_command():
     """Test execution with empty command"""
     with pytest.raises(RuntimeError) as excinfo:
-        await call_tool("execute", {"command": []})
+        await call_tool("shell_execute", {"command": []})
     assert "No command provided" in str(excinfo.value)
 
 
@@ -92,7 +94,7 @@ async def test_call_tool_with_directory(temp_test_dir, monkeypatch):
     """Test command execution in a specific directory"""
     monkeypatch.setenv("ALLOW_COMMANDS", "pwd")
     result = await call_tool(
-        "execute", {"command": ["pwd"], "directory": temp_test_dir}
+        "shell_execute", {"command": ["pwd"], "directory": temp_test_dir}
     )
     assert len(result) == 1
     assert isinstance(result[0], TextContent)
@@ -111,13 +113,17 @@ async def test_call_tool_with_file_operations(temp_test_dir, monkeypatch):
         f.write("test content")
 
     # Test ls command
-    result = await call_tool("execute", {"command": ["ls"], "directory": temp_test_dir})
+    result = await call_tool(
+        "shell_execute", {"command": ["ls"], "directory": temp_test_dir}
+    )
+    assert isinstance(result[0], TextContent)
     assert "test.txt" in result[0].text
 
     # Test cat command
     result = await call_tool(
-        "execute", {"command": ["cat", "test.txt"], "directory": temp_test_dir}
+        "shell_execute", {"command": ["cat", "test.txt"], "directory": temp_test_dir}
     )
+    assert isinstance(result[0], TextContent)
     assert result[0].text.strip() == "test content"
 
 
@@ -127,7 +133,7 @@ async def test_call_tool_with_nonexistent_directory(monkeypatch):
     monkeypatch.setenv("ALLOW_COMMANDS", "ls")
     with pytest.raises(RuntimeError) as excinfo:
         await call_tool(
-            "execute", {"command": ["ls"], "directory": "/nonexistent/directory"}
+            "shell_execute", {"command": ["ls"], "directory": "/nonexistent/directory"}
         )
     assert "Directory does not exist: /nonexistent/directory" in str(excinfo.value)
 
@@ -143,7 +149,7 @@ async def test_call_tool_with_file_as_directory(temp_test_dir, monkeypatch):
         f.write("test content")
 
     with pytest.raises(RuntimeError) as excinfo:
-        await call_tool("execute", {"command": ["ls"], "directory": test_file})
+        await call_tool("shell_execute", {"command": ["ls"], "directory": test_file})
     assert f"Not a directory: {test_file}" in str(excinfo.value)
 
 
@@ -157,5 +163,8 @@ async def test_call_tool_with_nested_directory(temp_test_dir, monkeypatch):
     os.mkdir(nested_dir)
     nested_real_path = os.path.realpath(nested_dir)
 
-    result = await call_tool("execute", {"command": ["pwd"], "directory": nested_dir})
+    result = await call_tool(
+        "shell_execute", {"command": ["pwd"], "directory": nested_dir}
+    )
+    assert isinstance(result[0], TextContent)
     assert result[0].text.strip() == nested_real_path