Merge branch 'develop'

Author: tumf

.github/workflows/publish.yml

@@ -46,7 +46,7 @@ jobs:
         run: |
           # Strip 'v' prefix from tag and update version.py
           VERSION=${GITHUB_REF#refs/tags/v}
-          echo "__version__ = \"${VERSION}\"" > mcp_shell_server/version.py
+          echo "__version__ = \"${VERSION}\"" > src/mcp_shell_server/version.py
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5

.gitignore

@@ -75,4 +75,6 @@ share/python-wheels/
 *.egg-info/
 .installed.cfg
 *.egg
-MANIFEST
+MANIFEST
+
+prompt.md

Makefile

@@ -1,8 +1,8 @@
 .PHONY: test format lint typecheck check
+.DEFAULT_GOAL := all
 
 test:
-	pip install -e .
-	pytest
+	uv run pytest
 
 format:
 	black .
@@ -18,7 +18,10 @@ lint:
 typecheck:
 	mypy src/mcp_shell_server tests
 
+coverage:
+	pytest --cov=src/mcp_shell_server tests
+
 # Run all checks required before pushing
-check:  lint typecheck test
+check:  lint typecheck
 fix: check format
-all: check
+all: format check coverage

README.md

@@ -75,15 +75,17 @@ pip install mcp-shell-server
 
 ```bash
 ALLOW_COMMANDS="ls,cat,echo" uvx mcp-shell-server
+# Or using the alias
+ALLOWED_COMMANDS="ls,cat,echo" uvx mcp-shell-server
 ```
 
-The `ALLOW_COMMANDS` environment variable specifies which commands are allowed to be executed. Commands can be separated by commas with optional spaces around them.
+The `ALLOW_COMMANDS` (or its alias `ALLOWED_COMMANDS` ) environment variable specifies which commands are allowed to be executed. Commands can be separated by commas with optional spaces around them.
 
-Valid formats for ALLOW_COMMANDS:
+Valid formats for ALLOW_COMMANDS or ALLOWED_COMMANDS:
 
 ```bash
 ALLOW_COMMANDS="ls,cat,echo"          # Basic format
-ALLOW_COMMANDS="ls ,echo, cat"        # With spaces
+ALLOWED_COMMANDS="ls ,echo, cat"      # With spaces (using alias)
 ALLOW_COMMANDS="ls,  cat  , echo"     # Multiple spaces
 ```
 

pyproject.toml

@@ -6,7 +6,7 @@ authors = [
 ]
 dependencies = [
     "asyncio>=3.4.3",
-    "mcp>=1.1.0",
+    "mcp @ git+https://github.com/tumf/mcp-python-sdk.git@fix/handle-cancelled-notifications",
 ]
 requires-python = ">=3.11"
 readme = "README.md"
@@ -22,6 +22,7 @@ test = [
     "pytest-asyncio>=0.23.0", 
     "pytest-env>=1.1.0",
     "pytest-cov>=6.0.0",
+    "pytest-mock>=3.12.0",
 ]
 dev = [
     "ruff>=0.0.262",
@@ -40,6 +41,11 @@ asyncio_mode = "strict"
 testpaths = "tests"
 # Set default event loop scope for async tests 
 asyncio_default_fixture_loop_scope = "function"
+filterwarnings = [
+    "ignore::RuntimeWarning:selectors:",
+    "ignore::pytest.PytestUnhandledCoroutineWarning:",
+    "ignore::pytest.PytestUnraisableExceptionWarning:",
+]
 
 [tool.ruff]
 lint.select = [
@@ -69,3 +75,29 @@ path = "src/mcp_shell_server/version.py"
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/mcp_shell_server"]
+
+[tool.hatch.metadata]
+allow-direct-references = true
+
+
+[tool.coverage.report]
+exclude_lines = [
+    "pragma: no cover",
+    "def __repr__",
+    "raise NotImplementedError",
+    "if __name__ == .__main__.:",
+    "pass",
+    "raise ImportError",
+    "__version__",
+    "except IOError:",
+    "except IOError as e:",
+    "def _cleanup_handles",
+    "def __aexit__",
+    "if path in [\">\", \">>\", \"<\"]:",
+    "def _close_handles",
+]
+
+omit = [
+    "src/mcp_shell_server/__init__.py",
+    "src/mcp_shell_server/version.py",
+]

src/mcp_shell_server/__init__.py

@@ -1,15 +1,17 @@
 """MCP Shell Server Package."""
 
-import asyncio
-
 from . import server
 
+__version__ = "0.1.0"
+__all__ = ["main", "server"]
+
 
 def main():
     """Main entry point for the package."""
+    import asyncio
+
     asyncio.run(server.main())
 
 
-# Optionally expose other important items at package level
-__all__ = ["main", "server"]
-__version__ = "0.1.0"
+if __name__ == "__main__":
+    main()

src/mcp_shell_server/server.py

@@ -1,3 +1,4 @@
+import asyncio
 import logging
 import traceback
 from collections.abc import Sequence
@@ -56,33 +57,50 @@ def get_tool_description(self) -> Tool:
                         "minimum": 0,
                     },
                 },
-                "required": ["command"],
+                "required": ["command", "directory"],
             },
         )
 
     async def run_tool(self, arguments: dict) -> Sequence[TextContent]:
         """Execute the shell command with the given arguments"""
         command = arguments.get("command", [])
         stdin = arguments.get("stdin")
-        directory = arguments.get("directory")
+        directory = arguments.get("directory", "/tmp")  # default to /tmp for safety
         timeout = arguments.get("timeout")
 
         if not command:
             raise ValueError("No command provided")
 
-        result = await self.executor.execute(command, stdin, directory, timeout)
+        if not isinstance(command, list):
+            raise ValueError("'command' must be an array")
 
-        # Raise error if command execution failed
-        if result.get("error"):
-            raise RuntimeError(result["error"])
+        # Make sure directory exists
+        if not directory:
+            raise ValueError("Directory is required")
 
-        # Convert executor result to TextContent sequence
         content: list[TextContent] = []
-
-        if result.get("stdout"):
-            content.append(TextContent(type="text", text=result["stdout"]))
-        if result.get("stderr"):
-            content.append(TextContent(type="text", text=result["stderr"]))
+        try:
+            # Handle execution with timeout
+            try:
+                result = await asyncio.wait_for(
+                    self.executor.execute(
+                        command, directory, stdin, None
+                    ),  # Pass None for timeout
+                    timeout=timeout,
+                )
+            except asyncio.TimeoutError as e:
+                raise ValueError("Command execution timed out") from e
+
+            if result.get("error"):
+                raise ValueError(result["error"])
+
+            if result.get("stdout"):
+                content.append(TextContent(type="text", text=result["stdout"]))
+            if result.get("stderr"):
+                content.append(TextContent(type="text", text=result["stderr"]))
+
+        except asyncio.TimeoutError as e:
+            raise ValueError(f"Command timed out after {timeout} seconds") from e
 
         return content
 
@@ -111,7 +129,6 @@ async def call_tool(name: str, arguments: Any) -> Sequence[TextContent]:
 
     except Exception as e:
         logger.error(traceback.format_exc())
-        logger.error(f"Error during call_tool: {str(e)}")
         raise RuntimeError(f"Error executing command: {str(e)}") from e