Merge branch 'main' into add-strict-mode-pyright

Author: Kludex

README.md

@@ -241,7 +241,8 @@ async def fetch_weather(city: str) -> str:
 Prompts are reusable templates that help LLMs interact with your server effectively:
 
 ```python
-from mcp.server.fastmcp import FastMCP, types
+from mcp.server.fastmcp import FastMCP
+from mcp.server.fastmcp.prompts import base
 
 mcp = FastMCP("My App")
 
@@ -252,11 +253,11 @@ def review_code(code: str) -> str:
 
 
 @mcp.prompt()
-def debug_error(error: str) -> list[types.Message]:
+def debug_error(error: str) -> list[base.Message]:
     return [
-        types.UserMessage("I'm seeing this error:"),
-        types.UserMessage(error),
-        types.AssistantMessage("I'll help debug that. What have you tried so far?"),
+        base.UserMessage("I'm seeing this error:"),
+        base.UserMessage(error),
+        base.AssistantMessage("I'll help debug that. What have you tried so far?"),
     ]
 ```
 

src/mcp/client/stdio.py

@@ -1,6 +1,7 @@
 import os
 import sys
 from contextlib import asynccontextmanager
+from pathlib import Path
 from typing import Literal
 
 import anyio
@@ -66,6 +67,9 @@ class StdioServerParameters(BaseModel):
     If not specified, the result of get_default_environment() will be used.
     """
 
+    cwd: str | Path | None = None
+    """The working directory to use when spawning the process."""
+
     encoding: str = "utf-8"
     """
     The text encoding used when sending/receiving messages to the server
@@ -101,6 +105,7 @@ async def stdio_client(server: StdioServerParameters):
         [server.command, *server.args],
         env=server.env if server.env is not None else get_default_environment(),
         stderr=sys.stderr,
+        cwd=server.cwd,
     )
 
     async def stdout_reader():