Move process termination to win32.py as well

Author: saqadri

src/mcp/client/stdio/__init__.py

@@ -12,7 +12,11 @@
 
 import mcp.types as types
 
-from .win32 import create_windows_process, get_windows_executable_command
+from .win32 import (
+    create_windows_process,
+    get_windows_executable_command,
+    terminate_windows_process,
+)
 
 # Environment variables to inherit by default
 DEFAULT_INHERITED_ENV_VARS = (
@@ -169,21 +173,10 @@ async def stdin_writer():
             yield read_stream, write_stream
         finally:
             # Clean up process to prevent any dangling orphaned processes
-            try:
+            if sys.platform == "win32":
+                terminate_windows_process(process)
+            else:
                 process.terminate()
-                if sys.platform == "win32":
-                    # 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.
-                    try:
-                        with anyio.fail_after(2.0):
-                            await process.wait()
-                    except TimeoutError:
-                        # Force kill if it doesn't terminate
-                        process.kill()
-            except Exception:
-                pass
 
 
 def _get_executable_command(command: str) -> str:

src/mcp/client/stdio/win32.py

@@ -9,6 +9,7 @@
 from typing import TextIO
 
 import anyio
+from anyio.abc import Process
 
 
 def get_windows_executable_command(command: str) -> str:
@@ -85,3 +86,24 @@ async def create_windows_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()