Merge branch 'fix/stderr-timeout' into develop

Author: tumf

pyproject.toml

@@ -44,6 +44,7 @@ asyncio_default_fixture_loop_scope = "function"
 filterwarnings = [
     "ignore::RuntimeWarning:selectors:",
     "ignore::pytest.PytestUnhandledCoroutineWarning:",
+    "ignore::pytest.PytestUnraisableExceptionWarning:",
 ]
 
 [tool.ruff]

src/mcp_shell_server/server.py

@@ -78,21 +78,26 @@ async def run_tool(self, arguments: dict) -> Sequence[TextContent]:
         if not directory:
             raise ValueError("Directory is required")
 
+        content: list[TextContent] = []
         try:
-            result = await self.executor.execute(command, directory, stdin, timeout)
-        except asyncio.TimeoutError as e:
-            raise ValueError(f"Command timed out after {timeout} seconds") from e
+            # Handle execution with timeout
+            result = await asyncio.wait_for(
+                self.executor.execute(
+                    command, directory, stdin, None
+                ),  # Pass None for timeout
+                timeout=timeout,
+            )
 
-        # Convert executor result to TextContent sequence
-        content: list[TextContent] = []
+            if result.get("error"):
+                raise ValueError(result["error"])
 
-        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"]))
 
-        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
 

src/mcp_shell_server/shell_executor.py

@@ -501,9 +501,24 @@ async def execute(
             try:
                 # Send input if provided
                 stdin_bytes = stdin.encode() if stdin else None
-                stdout, stderr = await asyncio.wait_for(
-                    process.communicate(input=stdin_bytes), timeout=timeout
-                )
+
+                async def communicate_with_timeout():
+                    try:
+                        return await process.communicate(input=stdin_bytes)
+                    except Exception as e:
+                        try:
+                            process.kill()
+                            await process.wait()
+                        except Exception:
+                            pass
+                        raise e
+
+                if timeout:
+                    stdout, stderr = await asyncio.wait_for(
+                        communicate_with_timeout(), timeout=timeout
+                    )
+                else:
+                    stdout, stderr = await communicate_with_timeout()
 
                 # Close file handle if using file redirection
                 if isinstance(stdout_handle, IO):

tests/test_shell_executor.py

@@ -142,6 +142,7 @@ async def test_execute_with_file_as_directory(executor, temp_test_dir, monkeypat
     assert result["status"] == 1
 
 
+@pytest.mark.asyncio
 async def test_execute_with_nested_directory(executor, temp_test_dir, monkeypatch):
     """Test command execution in a nested directory"""
     monkeypatch.setenv("ALLOW_COMMANDS", "pwd,mkdir,ls")