Merge branch 'main' into feat/remove-prompt-resource-template

Author: rgoldstein1989

.github/workflows/claude-code-review.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   claude:
     if: |
-      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude') && !startsWith(github.event.comment.body, '@claude review')) ||
       (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
       (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
       (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))

.github/workflows/claude.yml

@@ -26,7 +26,7 @@ classifiers = [
 ]
 dependencies = [
     "anyio>=4.9",
-    "httpx>=0.27.1",
+    "httpx>=0.27.1,<1.0.0",
     "httpx-sse>=0.4",
     "pydantic>=2.12.0",
     "starlette>=0.48.0; python_version >= '3.14'",

pyproject.toml

@@ -105,6 +105,9 @@ class Settings(BaseSettings, Generic[LifespanResultT]):
     # prompt settings
     warn_on_duplicate_prompts: bool
 
+    dependencies: list[str]
+    """List of dependencies to install in the server environment. Used by the `mcp install` and `mcp dev` CLI."""
+
     lifespan: Callable[[MCPServer[LifespanResultT]], AbstractAsyncContextManager[LifespanResultT]] | None
     """An async context manager that will be called when the server is started."""
 
@@ -142,6 +145,7 @@ def __init__(
         warn_on_duplicate_resources: bool = True,
         warn_on_duplicate_tools: bool = True,
         warn_on_duplicate_prompts: bool = True,
+        dependencies: list[str] | None = None,
         lifespan: Callable[[MCPServer[LifespanResultT]], AbstractAsyncContextManager[LifespanResultT]] | None = None,
         auth: AuthSettings | None = None,
     ):
@@ -151,9 +155,11 @@ def __init__(
             warn_on_duplicate_resources=warn_on_duplicate_resources,
             warn_on_duplicate_tools=warn_on_duplicate_tools,
             warn_on_duplicate_prompts=warn_on_duplicate_prompts,
+            dependencies=dependencies or [],
             lifespan=lifespan,
             auth=auth,
         )
+        self.dependencies = self.settings.dependencies
 
         self._tool_manager = ToolManager(tools=tools, warn_on_duplicate_tools=self.settings.warn_on_duplicate_tools)
         self._resource_manager = ResourceManager(warn_on_duplicate_resources=self.settings.warn_on_duplicate_resources)

src/mcp/server/mcpserver/server.py

@@ -65,6 +65,15 @@ async def test_create_server(self):
         assert len(mcp.icons) == 1
         assert mcp.icons[0].src == "https://example.com/icon.png"
 
+    def test_dependencies(self):
+        """Dependencies list is read by `mcp install` / `mcp dev` CLI commands."""
+        mcp = MCPServer("test", dependencies=["pandas", "numpy"])
+        assert mcp.dependencies == ["pandas", "numpy"]
+        assert mcp.settings.dependencies == ["pandas", "numpy"]
+
+        mcp_no_deps = MCPServer("test")
+        assert mcp_no_deps.dependencies == []
+
     async def test_sse_app_returns_starlette_app(self):
         """Test that sse_app returns a Starlette application with correct routes."""
         mcp = MCPServer("test")