Merge branch 'development' into feature/llm-compliance

Author: MementoRC

mcp-server-git-simple

@@ -6,17 +6,16 @@ This script provides a simplified MCP server without complex initialization
 that might interfere with MCP handshake.
 """
 
+import asyncio
 import sys
+import click
 from pathlib import Path
 
-# Add the source directory to the path BEFORE any other imports to avoid E402
+# Add the source directory to the path BEFORE project imports
 src_dir = Path(__file__).parent / "src"
 sys.path.insert(0, str(src_dir))
 
-# Now, import everything else
-import asyncio
-import click
-from mcp_server_git.server_simple import main_simple
+from mcp_server_git.server_simple import main_simple  # noqa: E402
 
 
 @click.command()

pyrightconfig.json

@@ -0,0 +1,21 @@
+{
+  "include": ["src"],
+  "exclude": ["**/__pycache__", "tests"],
+  "reportMissingImports": "error",
+  "reportMissingTypeStubs": "warning",
+  "reportUndefinedVariable": "error",
+  "reportGeneralTypeIssues": "warning",
+  "reportAttributeAccessIssue": "warning",
+  "reportCallIssue": "error",
+  "reportArgumentType": "warning",
+  "reportAssignmentType": "warning",
+  "reportReturnType": "warning",
+  "reportPossiblyUnboundVariable": "warning",
+  "pythonVersion": "3.10",
+  "typeCheckingMode": "basic",
+  "useLibraryCodeForTypes": false,
+  "reportUnusedImport": "warning",
+  "reportUnusedClass": "information",
+  "reportUnusedFunction": "information",
+  "reportUnusedVariable": "warning"
+}

src/mcp_server_git/core/handlers.py

@@ -7,6 +7,7 @@
 from typing import Dict, List, Any, Optional
 
 import git
+from git import Repo
 from mcp.types import TextContent
 
 from .tools import GitToolRouter, ToolRegistry
@@ -271,10 +272,10 @@ def _create_git_handler(
         def handler(**kwargs):
             if requires_repo:
                 repo_path = Path(kwargs["repo_path"])
-                repo = git.Repo(repo_path)
+                repo: Repo = git.Repo(repo_path)
 
                 # Build arguments
-                args = [repo]
+                args: List[Any] = [repo]
                 if extra_args:
                     for arg in extra_args:
                         if arg in kwargs:
@@ -368,9 +369,9 @@ def _create_security_handler(self, func, extra_args: Optional[List[str]] = None)
 
         def handler(**kwargs):
             repo_path = Path(kwargs["repo_path"])
-            repo = git.Repo(repo_path)
+            repo: Repo = git.Repo(repo_path)
 
-            args = [repo]
+            args: List[Any] = [repo]
             if extra_args:
                 for arg in extra_args:
                     if arg == "strict_mode":

src/mcp_server_git/git/models.py

@@ -11,15 +11,21 @@ class GitStatus(BaseModel):
 
 class GitDiffUnstaged(BaseModel):
     repo_path: str
+    stat_only: Optional[bool] = False
+    max_lines: Optional[int] = None
 
 
 class GitDiffStaged(BaseModel):
     repo_path: str
+    stat_only: Optional[bool] = False
+    max_lines: Optional[int] = None
 
 
 class GitDiff(BaseModel):
     repo_path: str
     target: str
+    stat_only: Optional[bool] = False
+    max_lines: Optional[int] = None
 
 
 class GitCommit(BaseModel):
@@ -36,6 +42,9 @@ class GitAdd(BaseModel):
 
 class GitReset(BaseModel):
     repo_path: str
+    mode: Optional[str] = None  # --soft, --mixed, --hard
+    target: Optional[str] = None  # commit hash, branch, tag
+    files: Optional[list[str]] = None  # specific files to reset
 
 
 class GitLog(BaseModel):
@@ -60,6 +69,8 @@ class GitCheckout(BaseModel):
 class GitShow(BaseModel):
     repo_path: str
     revision: str
+    stat_only: Optional[bool] = False
+    max_lines: Optional[int] = None
 
 
 class GitInit(BaseModel):
@@ -84,6 +95,8 @@ class GitDiffBranches(BaseModel):
     repo_path: str
     base_branch: str
     compare_branch: str
+    stat_only: Optional[bool] = False
+    max_lines: Optional[int] = None
 
 
 class GitRebase(BaseModel):