Fix stdio_client kill process after timeout

Author: cristipufu

src/mcp/client/stdio/__init__.py

@@ -15,7 +15,6 @@
 from .win32 import (
     create_windows_process,
     get_windows_executable_command,
-    terminate_windows_process,
 )
 
 # Environment variables to inherit by default
@@ -173,10 +172,13 @@ async def stdin_writer():
             yield read_stream, write_stream
         finally:
             # Clean up process to prevent any dangling orphaned processes
-            if sys.platform == "win32":
-                await terminate_windows_process(process)
-            else:
+            try:
                 process.terminate()
+                with anyio.fail_after(2.0):
+                    await process.wait()
+            except TimeoutError:
+                # Force kill if it doesn't terminate
+                process.kill()
 
 
 def _get_executable_command(command: str) -> str:

src/mcp/client/stdio/win32.py

@@ -9,7 +9,6 @@
 from typing import TextIO
 
 import anyio
-from anyio.abc import Process
 
 
 def get_windows_executable_command(command: str) -> str:
@@ -85,25 +84,4 @@ async def create_windows_process(
         process = await anyio.open_process(
             [command, *args], env=env, stderr=errlog, cwd=cwd
         )
-        return process
-
-
-async def terminate_windows_process(process: Process):
-    """
-    Terminate a Windows process.
-
-    Note: On Windows, terminating a process with process.terminate() doesn't
-    always guarantee immediate process termination.
-    So we give it 2s to exit, or we call process.kill()
-    which sends a SIGKILL equivalent signal.
-
-    Args:
-        process: The process to terminate
-    """
-    try:
-        process.terminate()
-        with anyio.fail_after(2.0):
-            await process.wait()
-    except TimeoutError:
-        # Force kill if it doesn't terminate
-        process.kill()
+        return process