- feat: add merge_pr method and corresponding async tool for GitHub PR merging (#105)

- chore: update dependencies and version numbers in project files

Author: saidsef

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mcp-github-pr-issue-analyser"
-version = "2.7.0"
+version = "2.8.0"
 description = "MCP GitHub Issues Create/Update and PR Analyse"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -10,7 +10,7 @@ authors = [
 dependencies = [
     "mcp[cli]==1.13.1",
     "requests==2.32.5",
-    "uv==0.8.15",
+    "uv==0.8.17",
 ]
 
 [project.scripts]

requirements.txt

@@ -1,4 +1,4 @@
 -i https://pypi.org/simple
 mcp[cli]==1.13.1
 requests==2.32.5
-uv==0.8.15
+uv==0.8.17

src/mcp_github/github_integration.py

@@ -367,6 +367,43 @@ def create_issue(self, repo_owner: str, repo_name: str, title: str, body: str, l
             traceback.print_exc()
             return None
 
+    def merge_pr(self, repo_owner: str, repo_name: str, pr_number: int, commit_title: Optional[str] = None, commit_message: Optional[str] = None, merge_method: Literal['merge', 'squash', 'rebase'] = 'squash') -> Dict[str, Any]:
+        """
+        Merges a pull request in the specified GitHub repository.
+        Args:
+            repo_owner (str): The owner of the repository.
+            repo_name (str): The name of the repository.
+            pr_number (int): The pull request number to merge.
+            commit_title (str, optional): The title for the merge commit. Defaults to None.
+            commit_message (str, optional): The message for the merge commit. Defaults to None.
+            merge_method (Literal['merge', 'squash', 'rebase'], optional): The merge method to use ('merge', 'squash', or 'rebase'). Defaults to 'squash'.
+        Returns:
+            Dict[str, Any]: The JSON response from the GitHub API containing merge information if successful.
+        Error Handling:
+            Logs errors and prints the traceback if the merge fails, returning None.
+        """
+        logging.info(f"Merging PR {repo_owner}/{repo_name}#{pr_number}")
+
+        # Construct the merge URL
+        merge_url = f"https://api.github.com/repos/{repo_owner}/{repo_name}/pulls/{pr_number}/merge"
+
+        try:
+            response = requests.put(merge_url, headers=self._get_headers(), json={
+                'commit_title': commit_title,
+                'commit_message': commit_message,
+                'merge_method': merge_method
+            })
+            response.raise_for_status()
+            merge_data = response.json()
+
+            logging.info(f"PR merged successfully")
+            return merge_data
+
+        except Exception as e:
+            logging.error({"status": "error", "message": str(e)})
+            traceback.print_exc()
+            return {"status": "error", "message": str(e)}
+
     def update_issue(self, repo_owner: str, repo_name: str, issue_number: int, title: str, body: str, labels: list[str] = [], state: Literal['open', 'closed'] = 'open') -> Dict[str, Any]:
         """
         Updates an existing GitHub issue with the specified parameters.

src/mcp_github/issues_pr_analyser.py

@@ -267,6 +267,32 @@ async def create_github_issue(repo_owner: str, repo_name: str, title: str, body:
                 traceback.print_exc(file=sys.stderr)
                 return {"status": "error", "message": error_msg}
 
+        @self.mcp.tool()
+        async def github_merge_pr(repo_owner: str, repo_name: str, pr_number: int, commit_title: str, commit_message: str, merge_method: Literal['merge', 'squash', 'rebase'] = 'squash') -> dict[str, Any]:
+            """
+            Merges a pull request on GitHub using the specified merge method.
+            Args:
+                repo_owner (str): The owner of the GitHub repository.
+                repo_name (str): The name of the GitHub repository.
+                pr_number (int): The pull request number to merge.
+                commit_title (str): The title for the merge commit.
+                commit_message (str): The message for the merge commit.
+                merge_method (Literal['merge', 'squash', 'rebase']): The method to use for merging the pull request. Defaults to 'squash'.
+            Returns:
+                dict[str, Any]: A dictionary containing the status and message of the merge operation.
+                    Returns a success message if the pull request is merged successfully, or an error message if an exception occurs.
+            """
+            logging.info(f"Merging PR #{pr_number} using {merge_method} method")
+            try:
+                self.gi.merge_pr(repo_owner, repo_name, pr_number, commit_title, commit_message, merge_method)
+                logging.info({"status": "success", "message": f"Successfully merged PR #{pr_number}"})
+                return {"status": "success", "message": f"Successfully merged PR #{pr_number}"}
+            except Exception as e:
+                error_msg = f"Error merging PR: {str(e)}"
+                logging.error(error_msg)
+                traceback.print_exc(file=sys.stderr)
+                return {"status": "error", "message": error_msg}
+
         @self.mcp.tool()
         async def update_github_issue(repo_owner: str, repo_name: str, issue_number: int, title: str, body: str, labels: list[str], state: str) -> dict[str, Any]:
             """