mcp-server-git 0.3.0__tar.gz → 0.4.1__tar.gz

{mcp_server_git-0.3.0 → mcp_server_git-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mcp-server-git
-Version: 0.3.0
+Version: 0.4.1
 Summary: A Model Context Protocol server providing tools to read, search, and manipulate Git repositories programmatically via LLMs
 Author: Anthropic, PBC.
 Maintainer-email: David Soria Parra <davidsp@anthropic.com>
@@ -20,6 +20,8 @@ Description-Content-Type: text/markdown
 
 # mcp-server-git: A git MCP server
 
+## Overview
+
 A Model Context Protocol server for Git repository interaction and automation. This server provides tools to read, search, and manipulate Git repositories via Large Language Models.
 
 Please note that mcp-server-git is currently in early development. The functionality and available tools are subject to change and expansion as we continue to develop and improve the server.
@@ -28,17 +30,13 @@ Please note that mcp-server-git is currently in early development. The functiona
 
 The current list of tools includes:
 
-- `git_read_file`: Read contents of a file at a specific Git reference
-- `git_list_files`: List all files in a repository or subdirectory
-- `git_file_history`: Get commit history for a specific file
-- `git_commit`: Create Git commits with messages and specified files
-- `git_search_code`: Search repository content with pattern matching
-- `git_get_diff`: View diffs between Git references
-- `git_get_repo_structure`: View repository file structure
-- `git_list_repos`: List available Git repositories
-- `git_log`: Retrieve commit log for the repository
-- `git_list_branches`: List all branches in the repository
-- `git_list_tags`: List all tags in the repository
+- `git_status`: Shows the working tree status
+- `git_diff_unstaged`: Shows changes in the working directory that are not yet staged
+- `git_diff_staged`: Shows changes that are staged for commit
+- `git_commit`: Records changes to the repository
+- `git_add`: Adds file contents to the staging area
+- `git_reset`: Unstages all staged changes
+- `git_log`: Shows the commit logs
 
 This list is expected to grow as we add more functionality to the server. We welcome contributions from the community to expand and enhance the available tools.
 
@@ -64,10 +62,14 @@ python -m mcp_server_git
 ```
 
 ## Configuration
+
 ### Configure for Claude.app
 
 Add to your Claude settings:
 
+<details>
+<summary>Using uvx</summary>
+
 ```json
 "mcpServers": {
   "git": {
@@ -76,8 +78,10 @@ Add to your Claude settings:
   }
 }
 ```
+</details>
 
-Alternatively, if using pip installation:
+<details>
+<summary>Using pip installation</summary>
 
 ```json
 "mcpServers": {
@@ -87,11 +91,15 @@ Alternatively, if using pip installation:
   }
 }
 ```
+</details>
 
 ### Configure for Zed
 
 Add to your Zed settings.json:
 
+<details>
+<summary>Using uvx</summary>
+
 ```json
 "context_servers": [
   "mcp-server-git": {
@@ -100,18 +108,35 @@ Add to your Zed settings.json:
   }
 ],
 ```
+</details>
 
-Alternatively, if using pip installation:
+<details>
+<summary>Using pip installation</summary>
 
 ```json
 "context_servers": {
   "mcp-server-git": {
     "command": "python",
-    "args": ["-m", "mcp-server-git"]
+    "args": ["-m", "mcp_server_git"]
   }
 },
 ```
+</details>
+
+## Debugging
+
+You can use the MCP inspector to debug the server. For uvx installations:
+
+```
+npx @modelcontextprotocol/inspector uvx mcp-server-git
+```
 
+Or if you've installed the package in a specific directory or are developing on it:
+
+```
+cd path/to/servers/src/git
+npx @modelcontextprotocol/inspector uv run mcp-server-git
+```
 
 ## Contributing
 
@@ -121,3 +146,7 @@ For examples of other MCP servers and implementation patterns, see:
 https://github.com/modelcontextprotocol/servers
 
 Pull requests are welcome! Feel free to contribute new ideas, bug fixes, or enhancements to make mcp-server-git even more powerful and useful.
+
+## License
+
+mcp-server-git is licensed under the MIT License. This means you are free to use, modify, and distribute the software, subject to the terms and conditions of the MIT License. For more details, please see the LICENSE file in the project repository.

{mcp_server_git-0.3.0 → mcp_server_git-0.4.1}/README.md

@@ -1,5 +1,7 @@
 # mcp-server-git: A git MCP server
 
+## Overview
+
 A Model Context Protocol server for Git repository interaction and automation. This server provides tools to read, search, and manipulate Git repositories via Large Language Models.
 
 Please note that mcp-server-git is currently in early development. The functionality and available tools are subject to change and expansion as we continue to develop and improve the server.
@@ -8,17 +10,13 @@ Please note that mcp-server-git is currently in early development. The functiona
 
 The current list of tools includes:
 
-- `git_read_file`: Read contents of a file at a specific Git reference
-- `git_list_files`: List all files in a repository or subdirectory
-- `git_file_history`: Get commit history for a specific file
-- `git_commit`: Create Git commits with messages and specified files
-- `git_search_code`: Search repository content with pattern matching
-- `git_get_diff`: View diffs between Git references
-- `git_get_repo_structure`: View repository file structure
-- `git_list_repos`: List available Git repositories
-- `git_log`: Retrieve commit log for the repository
-- `git_list_branches`: List all branches in the repository
-- `git_list_tags`: List all tags in the repository
+- `git_status`: Shows the working tree status
+- `git_diff_unstaged`: Shows changes in the working directory that are not yet staged
+- `git_diff_staged`: Shows changes that are staged for commit
+- `git_commit`: Records changes to the repository
+- `git_add`: Adds file contents to the staging area
+- `git_reset`: Unstages all staged changes
+- `git_log`: Shows the commit logs
 
 This list is expected to grow as we add more functionality to the server. We welcome contributions from the community to expand and enhance the available tools.
 
@@ -44,10 +42,14 @@ python -m mcp_server_git
 ```
 
 ## Configuration
+
 ### Configure for Claude.app
 
 Add to your Claude settings:
 
+<details>
+<summary>Using uvx</summary>
+
 ```json
 "mcpServers": {
   "git": {
@@ -56,8 +58,10 @@ Add to your Claude settings:
   }
 }
 ```
+</details>
 
-Alternatively, if using pip installation:
+<details>
+<summary>Using pip installation</summary>
 
 ```json
 "mcpServers": {
@@ -67,11 +71,15 @@ Alternatively, if using pip installation:
   }
 }
 ```
+</details>
 
 ### Configure for Zed
 
 Add to your Zed settings.json:
 
+<details>
+<summary>Using uvx</summary>
+
 ```json
 "context_servers": [
   "mcp-server-git": {
@@ -80,18 +88,35 @@ Add to your Zed settings.json:
   }
 ],
 ```
+</details>
 
-Alternatively, if using pip installation:
+<details>
+<summary>Using pip installation</summary>
 
 ```json
 "context_servers": {
   "mcp-server-git": {
     "command": "python",
-    "args": ["-m", "mcp-server-git"]
+    "args": ["-m", "mcp_server_git"]
   }
 },
 ```
+</details>
+
+## Debugging
+
+You can use the MCP inspector to debug the server. For uvx installations:
+
+```
+npx @modelcontextprotocol/inspector uvx mcp-server-git
+```
 
+Or if you've installed the package in a specific directory or are developing on it:
+
+```
+cd path/to/servers/src/git
+npx @modelcontextprotocol/inspector uv run mcp-server-git
+```
 
 ## Contributing
 
@@ -101,3 +126,7 @@ For examples of other MCP servers and implementation patterns, see:
 https://github.com/modelcontextprotocol/servers
 
 Pull requests are welcome! Feel free to contribute new ideas, bug fixes, or enhancements to make mcp-server-git even more powerful and useful.
+
+## License
+
+mcp-server-git is licensed under the MIT License. This means you are free to use, modify, and distribute the software, subject to the terms and conditions of the MIT License. For more details, please see the LICENSE file in the project repository.

{mcp_server_git-0.3.0 → mcp_server_git-0.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
-name = "mcp-server-git"
-version = "0.3.0"
+name="mcp-server-git"
+version = "0.4.1"
 description = "A Model Context Protocol server providing tools to read, search, and manipulate Git repositories programmatically via LLMs"
 readme = "README.md"
 requires-python = ">=3.10"

mcp_server_git-0.4.1/src/mcp_server_git/__init__.py

@@ -0,0 +1,25 @@
+import click
+from functools import partial
+from pathlib import Path
+import logging
+import sys
+from .server import serve
+
+@click.command()
+@click.option("--repository", "-r", type=Path, help="Git repository path")
+@click.option("-v", "--verbose", count=True)
+def main(repository: Path | None, verbose: bool) -> None:
+    """MCP Git Server - Git functionality for MCP"""
+    import asyncio
+
+    logging_level = logging.WARN
+    if verbose == 1:
+        logging_level = logging.INFO
+    elif verbose >= 2:
+        logging_level = logging.DEBUG
+
+    logging.basicConfig(level=logging_level, stream=sys.stderr)
+    asyncio.run(serve(repository))
+
+if __name__ == "__main__":
+    main()

mcp_server_git-0.4.1/src/mcp_server_git/server.py

@@ -0,0 +1,228 @@
+import logging
+import json
+from pathlib import Path
+from typing import Sequence
+from mcp.server import Server
+from mcp.server.session import ServerSession
+from mcp.server.stdio import stdio_server
+from mcp.types import (
+    ClientCapabilities,
+    TextContent,
+    Tool,
+    ListRootsResult,
+    RootsCapability,
+)
+from enum import Enum
+import git
+from pydantic import BaseModel, Field
+from typing import List, Optional
+
+class GitStatus(BaseModel):
+    repo_path: str
+
+class GitDiffUnstaged(BaseModel):
+    repo_path: str
+
+class GitDiffStaged(BaseModel):
+    repo_path: str
+
+class GitCommit(BaseModel):
+    repo_path: str
+    message: str
+
+class GitAdd(BaseModel):
+    repo_path: str
+    files: List[str]
+
+class GitReset(BaseModel):
+    repo_path: str
+
+class GitLog(BaseModel):
+    repo_path: str
+    max_count: int = 10
+
+class GitTools(str, Enum):
+    STATUS = "git_status"
+    DIFF_UNSTAGED = "git_diff_unstaged"
+    DIFF_STAGED = "git_diff_staged"
+    COMMIT = "git_commit"
+    ADD = "git_add"
+    RESET = "git_reset"
+    LOG = "git_log"
+
+def git_status(repo: git.Repo) -> str:
+    return repo.git.status()
+
+def git_diff_unstaged(repo: git.Repo) -> str:
+    return repo.git.diff()
+
+def git_diff_staged(repo: git.Repo) -> str:
+    return repo.git.diff("--cached")
+
+def git_commit(repo: git.Repo, message: str) -> str:
+    commit = repo.index.commit(message)
+    return f"Changes committed successfully with hash {commit.hexsha}"
+
+def git_add(repo: git.Repo, files: list[str]) -> str:
+    repo.index.add(files)
+    return "Files staged successfully"
+
+def git_reset(repo: git.Repo) -> str:
+    repo.index.reset()
+    return "All staged changes reset"
+
+def git_log(repo: git.Repo, max_count: int = 10) -> list[str]:
+    commits = list(repo.iter_commits(max_count=max_count))
+    log = []
+    for commit in commits:
+        log.append(
+            f"Commit: {commit.hexsha}\n"
+            f"Author: {commit.author}\n"
+            f"Date: {commit.authored_datetime}\n"
+            f"Message: {commit.message}\n"
+        )
+    return log
+
+async def serve(repository: Path | None) -> None:
+    logger = logging.getLogger(__name__)
+
+    if repository is not None:
+        try:
+            git.Repo(repository)
+            logger.info(f"Using repository at {repository}")
+        except git.InvalidGitRepositoryError:
+            logger.error(f"{repository} is not a valid Git repository")
+            return
+
+    server = Server("mcp-git")
+
+    @server.list_tools()
+    async def list_tools() -> list[Tool]:
+        return [
+            Tool(
+                name=GitTools.STATUS,
+                description="Shows the working tree status",
+                inputSchema=GitStatus.schema(),
+            ),
+            Tool(
+                name=GitTools.DIFF_UNSTAGED,
+                description="Shows changes in the working directory that are not yet staged",
+                inputSchema=GitDiffUnstaged.schema(),
+            ),
+            Tool(
+                name=GitTools.DIFF_STAGED,
+                description="Shows changes that are staged for commit",
+                inputSchema=GitDiffStaged.schema(),
+            ),
+            Tool(
+                name=GitTools.COMMIT,
+                description="Records changes to the repository",
+                inputSchema=GitCommit.schema(),
+            ),
+            Tool(
+                name=GitTools.ADD,
+                description="Adds file contents to the staging area",
+                inputSchema=GitAdd.schema(),
+            ),
+            Tool(
+                name=GitTools.RESET,
+                description="Unstages all staged changes",
+                inputSchema=GitReset.schema(),
+            ),
+            Tool(
+                name=GitTools.LOG,
+                description="Shows the commit logs",
+                inputSchema=GitLog.schema(),
+            ),
+        ]
+
+    async def list_repos() -> Sequence[str]:
+        async def by_roots() -> Sequence[str]:
+            if not isinstance(server.request_context.session, ServerSession):
+                raise TypeError("server.request_context.session must be a ServerSession")
+
+            if not server.request_context.session.check_client_capability(
+                ClientCapabilities(roots=RootsCapability())
+            ):
+                return []
+
+            roots_result: ListRootsResult = await server.request_context.session.list_roots()
+            logger.debug(f"Roots result: {roots_result}")
+            repo_paths = []
+            for root in roots_result.roots:
+                path = root.uri.path
+                try:
+                    git.Repo(path)
+                    repo_paths.append(str(path))
+                except git.InvalidGitRepositoryError:
+                    pass
+            return repo_paths
+
+        def by_commandline() -> Sequence[str]:
+            return [str(repository)] if repository is not None else []
+
+        cmd_repos = by_commandline()
+        root_repos = await by_roots()
+        return [*root_repos, *cmd_repos]
+
+    @server.call_tool()
+    async def call_tool(name: str, arguments: dict) -> list[TextContent]:
+        repo_path = Path(arguments["repo_path"])
+        repo = git.Repo(repo_path)
+
+        match name:
+            case GitTools.STATUS:
+                status = git_status(repo)
+                return [TextContent(
+                    type="text",
+                    text=f"Repository status:\n{status}"
+                )]
+
+            case GitTools.DIFF_UNSTAGED:
+                diff = git_diff_unstaged(repo)
+                return [TextContent(
+                    type="text",
+                    text=f"Unstaged changes:\n{diff}"
+                )]
+
+            case GitTools.DIFF_STAGED:
+                diff = git_diff_staged(repo)
+                return [TextContent(
+                    type="text",
+                    text=f"Staged changes:\n{diff}"
+                )]
+
+            case GitTools.COMMIT:
+                result = git_commit(repo, arguments["message"])
+                return [TextContent(
+                    type="text",
+                    text=result
+                )]
+
+            case GitTools.ADD:
+                result = git_add(repo, arguments["files"])
+                return [TextContent(
+                    type="text",
+                    text=result
+                )]
+
+            case GitTools.RESET:
+                result = git_reset(repo)
+                return [TextContent(
+                    type="text",
+                    text=result
+                )]
+
+            case GitTools.LOG:
+                log = git_log(repo, arguments.get("max_count", 10))
+                return [TextContent(
+                    type="text",
+                    text="Commit history:\n" + "\n".join(log)
+                )]
+
+            case _:
+                raise ValueError(f"Unknown tool: {name}")
+
+    options = server.create_initialization_options()
+    async with stdio_server() as (read_stream, write_stream):
+        await server.run(read_stream, write_stream, options, raise_exceptions=True)