Skip to content

Commit 82ec907

Browse files
authored
Merge branch 'modelcontextprotocol:main' into add-time-server
2 parents 0730292 + 6d83c78 commit 82ec907

File tree

29 files changed

+1853
-105
lines changed

29 files changed

+1853
-105
lines changed

README.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ Each MCP server is implemented with either the [Typescript MCP SDK](https://gith
88

99
- **[Filesystem](src/filesystem)** - Secure file operations with configurable access controls
1010
- **[GitHub](src/github)** - Repository management, file operations, and GitHub API integration
11+
- **[GitLab](src/gitlab)** - GitLab API, enabling project management
12+
- **[Git](src/git)** - Tools to read, search, and manipulate Git repositories
1113
- **[Google Drive](src/gdrive)** - File access and search capabilities for Google Drive
1214
- **[PostgreSQL](src/postgres)** - Read-only database access with schema inspection
15+
- **[Sqlite](src/sqlite)** - Database interaction and business intelligence capabilities
1316
- **[Slack](src/slack)** - Channel management and messaging capabilities
17+
- **[Sentry](src/sentry)** - Retrieving and analyzing issues from Sentry.io
1418
- **[Memory](src/memory)** - Knowledge graph-based persistent memory system
1519
- **[Puppeteer](src/puppeteer)** - Browser automation and web scraping
1620
- **[Brave Search](src/brave-search)** - Web and local search using Brave's Search API
@@ -39,6 +43,8 @@ pip install mcp-server-git
3943
python -m mcp_server_git
4044
```
4145

46+
Follow [these](https://docs.astral.sh/uv/getting-started/installation/) instructions to install `uv` / `uvx` and [these](https://pip.pypa.io/en/stable/installation/) to install `pip`.
47+
4248
### Using an MCP Client
4349
However, running a server on its own isn't very useful, and should instead be configured into an MCP client. For example, here's the Claude Desktop configuration to use the above server:
4450

@@ -99,7 +105,7 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
99105

100106
## 💬 Community
101107

102-
- [GitHub Discussions](https://github.com/modelcontextprotocol/servers/discussions)
108+
- [GitHub Discussions](https://github.com/orgs/modelcontextprotocol/discussions)
103109

104110
## ⭐ Support
105111

package-lock.json

+58-30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/brave-search/README.md

+10-5
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,16 @@ Add this to your `claude_desktop_config.json`:
3838

3939
```json
4040
{
41-
"brave-search": {
42-
"command": "npx",
43-
"args": ["-y", "@modelcontextprotocol/server-brave-search"],
44-
"env": {
45-
"BRAVE_API_KEY": "YOUR_API_KEY_HERE"
41+
"mcpServers": {
42+
"brave-search": {
43+
"command": "npx",
44+
"args": [
45+
"-y",
46+
"@modelcontextprotocol/server-brave-search"
47+
],
48+
"env": {
49+
"BRAVE_API_KEY": "YOUR_API_KEY_HERE"
50+
}
4651
}
4752
}
4853
}

src/brave-search/index.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
ListToolsRequestSchema,
88
Tool,
99
} from "@modelcontextprotocol/sdk/types.js";
10-
import fetch from "node-fetch";
1110

1211
const WEB_SEARCH_TOOL: Tool = {
1312
name: "brave_web_search",
@@ -104,7 +103,7 @@ function checkRateLimit() {
104103
requestCount.lastReset = now;
105104
}
106105
if (requestCount.second >= RATE_LIMIT.perSecond ||
107-
requestCount.month >= RATE_LIMIT.perMonth) {
106+
requestCount.month >= RATE_LIMIT.perMonth) {
108107
throw new Error('Rate limit exceeded');
109108
}
110109
requestCount.second++;

src/brave-search/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@modelcontextprotocol/server-brave-search",
3-
"version": "0.5.1",
3+
"version": "0.5.2",
44
"description": "MCP server for Brave Search API integration",
55
"license": "MIT",
66
"author": "Anthropic, PBC (https://anthropic.com)",
@@ -19,8 +19,7 @@
1919
"watch": "tsc --watch"
2020
},
2121
"dependencies": {
22-
"@modelcontextprotocol/sdk": "0.5.0",
23-
"node-fetch": "^3.3.2"
22+
"@modelcontextprotocol/sdk": "0.5.0"
2423
},
2524
"devDependencies": {
2625
"@types/node": "^20.10.0",

src/everything/README.md

+9-3
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,14 @@ Add to your `claude_desktop_config.json`:
7878

7979
```json
8080
{
81-
"everything": {
82-
"command": "npx",
83-
"args": ["-y", "@modelcontextprotocol/server-everything"]
81+
"mcpServers": {
82+
"everything": {
83+
"command": "npx",
84+
"args": [
85+
"-y",
86+
"@modelcontextprotocol/server-everything"
87+
]
88+
}
8489
}
8590
}
91+
```

src/fetch/src/mcp_server_fetch/server.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def get_robots_txt_url(url: str) -> str:
4747
async def check_may_autonomously_fetch_url(url: str, user_agent: str):
4848
"""
4949
Check if the URL can be fetched by the user agent according to the robots.txt file.
50-
Raises an McpError if not.
50+
Raises a McpError if not.
5151
"""
5252
from httpx import AsyncClient, HTTPError
5353

src/filesystem/README.md

+10-3
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,16 @@ Node.js server implementing Model Context Protocol (MCP) for filesystem operatio
8282
Add this to your `claude_desktop_config.json`:
8383
```json
8484
{
85-
"filesystem": {
86-
"command": "npx",
87-
"args": ["-y", "@modelcontextprotocol/server-filesystem", "/Users/username/Desktop", "/path/to/other/allowed/dir"]
85+
"mcpServers": {
86+
"filesystem": {
87+
"command": "npx",
88+
"args": [
89+
"-y",
90+
"@modelcontextprotocol/server-filesystem",
91+
"/Users/username/Desktop",
92+
"/path/to/other/allowed/dir"
93+
]
94+
}
8895
}
8996
}
9097
```

src/gdrive/README.md

+8-3
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,14 @@ To integrate this server with the desktop app, add the following to your app's s
5151

5252
```json
5353
{
54-
"gdrive": {
55-
"command": "npx",
56-
"args": ["-y", "@modelcontextprotocol/server-gdrive"]
54+
"mcpServers": {
55+
"gdrive": {
56+
"command": "npx",
57+
"args": [
58+
"-y",
59+
"@modelcontextprotocol/server-gdrive"
60+
]
61+
}
5762
}
5863
}
5964
```

src/git/src/mcp_server_git/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import click
2-
from functools import partial
32
from pathlib import Path
43
import logging
54
import sys

src/git/src/mcp_server_git/server.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import logging
2-
import json
32
from pathlib import Path
43
from typing import Sequence
54
from mcp.server import Server
@@ -14,8 +13,7 @@
1413
)
1514
from enum import Enum
1615
import git
17-
from pydantic import BaseModel, Field
18-
from typing import List, Optional
16+
from pydantic import BaseModel
1917

2018
class GitStatus(BaseModel):
2119
repo_path: str
@@ -32,7 +30,7 @@ class GitCommit(BaseModel):
3230

3331
class GitAdd(BaseModel):
3432
repo_path: str
35-
files: List[str]
33+
files: list[str]
3634

3735
class GitReset(BaseModel):
3836
repo_path: str

src/github/README.md

+10-5
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,16 @@ To use this with Claude Desktop, add the following to your `claude_desktop_confi
117117

118118
```json
119119
{
120-
"github": {
121-
"command": "npx",
122-
"args": ["-y", "@modelcontextprotocol/server-github"],
123-
"env": {
124-
"GITHUB_PERSONAL_ACCESS_TOKEN": "<YOUR_TOKEN>"
120+
"mcpServers": {
121+
"github": {
122+
"command": "npx",
123+
"args": [
124+
"-y",
125+
"@modelcontextprotocol/server-github"
126+
],
127+
"env": {
128+
"GITHUB_PERSONAL_ACCESS_TOKEN": "<YOUR_TOKEN>"
129+
}
125130
}
126131
}
127132
}

0 commit comments

Comments
 (0)