feat: add optional merge parameter to code_feature tool

- Add merge_pr_with_github_api() function to merge PRs via API
- Add optional 'merge' parameter to code_feature tool
- Only merges if user explicitly requests it (merge=true)
- Uses squash merge for cleaner git history
- Returns different message if merged vs just PR created

Usage:
- "Code a feature" → Creates PR only
- "Code a feature and merge it" → Creates PR and merges automatically

Tested locally: PR #5 created and merged successfully

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: kodjima33

claude_coder.py

@@ -342,7 +342,7 @@ def create_pr_with_github_api(
     body: str,
     github_token: str,
     base_branch: str = 'main'
-) -> Optional[str]:
+) -> Optional[Dict[str, Any]]:
     """
     Create a pull request using GitHub API.
 
@@ -356,7 +356,7 @@ def create_pr_with_github_api(
         base_branch: Base branch to merge into (default: 'main')
 
     Returns:
-        PR URL if successful, None otherwise
+        Dict with pr_url and pr_number if successful, None otherwise
     """
     url = f'https://api.github.com/repos/{owner}/{repo}/pulls'
     headers = {
@@ -376,13 +376,64 @@ def create_pr_with_github_api(
         response = requests.post(url, headers=headers, json=data)
 
         if response.status_code == 201:
-            pr_url = response.json().get('html_url')
+            pr_data = response.json()
+            pr_url = pr_data.get('html_url')
+            pr_number = pr_data.get('number')
             logger.info(f"PR created successfully: {pr_url}")
-            return pr_url
+            return {
+                'pr_url': pr_url,
+                'pr_number': pr_number
+            }
         else:
             error_msg = f"Failed to create PR: {response.status_code} - {response.text}"
             logger.error(error_msg)
             return None
     except Exception as e:
         logger.error(f"Exception creating PR: {e}", exc_info=True)
         return None
+
+
+def merge_pr_with_github_api(
+    owner: str,
+    repo: str,
+    pr_number: int,
+    github_token: str,
+    merge_method: str = 'merge'
+) -> bool:
+    """
+    Merge a pull request using GitHub API.
+
+    Args:
+        owner: Repository owner
+        repo: Repository name
+        pr_number: PR number to merge
+        github_token: GitHub access token
+        merge_method: Merge method ('merge', 'squash', or 'rebase')
+
+    Returns:
+        True if merged successfully, False otherwise
+    """
+    url = f'https://api.github.com/repos/{owner}/{repo}/pulls/{pr_number}/merge'
+    headers = {
+        'Authorization': f'token {github_token}',
+        'Accept': 'application/vnd.github.v3+json'
+    }
+    data = {
+        'merge_method': merge_method
+    }
+
+    logger.info(f"Merging PR #{pr_number} using {merge_method} method")
+
+    try:
+        response = requests.put(url, headers=headers, json=data)
+
+        if response.status_code == 200:
+            logger.info(f"PR #{pr_number} merged successfully")
+            return True
+        else:
+            error_msg = f"Failed to merge PR: {response.status_code} - {response.text}"
+            logger.error(error_msg)
+            return False
+    except Exception as e:
+        logger.error(f"Exception merging PR: {e}", exc_info=True)
+        return False

main.py

@@ -104,7 +104,7 @@ async def get_omi_tools_manifest():
             },
             {
                 "name": "code_feature",
-                "description": "Implement a feature in a GitHub repository using AI. Use this when the user asks to 'code', 'implement', 'add feature', 'build', or 'create code' in a repository. This tool uses Claude AI to generate code, create a branch, and open a pull request.",
+                "description": "Implement a feature in a GitHub repository using AI. Use this when the user asks to 'code', 'implement', 'add feature', 'build', or 'create code' in a repository. This tool uses Claude AI to generate code, create a branch, and open a pull request. Set merge=true if the user explicitly asks to merge the changes (e.g., 'code and merge', 'implement and merge it').",
                 "endpoint": "/tools/code_feature",
                 "method": "POST",
                 "parameters": {
@@ -116,6 +116,10 @@ async def get_omi_tools_manifest():
                         "repo": {
                             "type": "string",
                             "description": "Repository to code in (format: 'owner/repo'). If not provided, uses the user's default repository."
+                        },
+                        "merge": {
+                            "type": "boolean",
+                            "description": "Whether to automatically merge the PR after creating it. Only set to true if the user explicitly asks to merge (e.g., 'merge it', 'merge the changes', 'apply it directly'). Default is false."
                         }
                     },
                     "required": ["feature"]
@@ -1136,6 +1140,7 @@ async def tool_code_feature(request: Request):
         uid = body.get("uid")
         feature = body.get("feature")
         repo = body.get("repo")  # Optional: owner/repo format
+        merge = body.get("merge", False)  # Optional: merge PR after creation
 
         if not uid or not feature:
             return ChatToolResponse(error="User ID and feature description are required")
@@ -1164,6 +1169,7 @@ async def tool_code_feature(request: Request):
         from claude_coder import (
             generate_code_with_claude,
             create_pr_with_github_api,
+            merge_pr_with_github_api,
             get_repo_context_via_api,
             get_default_branch,
             parse_code_changes,
@@ -1223,7 +1229,7 @@ async def tool_code_feature(request: Request):
 *Generated by Claude AI via Omi*
 """
 
-        pr_url = create_pr_with_github_api(
+        pr_result = create_pr_with_github_api(
             owner=owner,
             repo=repo_name,
             branch=branch_name,
@@ -1233,10 +1239,33 @@ async def tool_code_feature(request: Request):
             base_branch=default_branch
         )
 
-        if pr_url:
-            return ChatToolResponse(
-                result=f"✅ **Feature implemented!**\n\n**Pull Request:** {pr_url}\n\nReview the AI-generated code and merge when ready."
-            )
+        if pr_result:
+            pr_url = pr_result['pr_url']
+            pr_number = pr_result['pr_number']
+
+            # Merge if requested
+            if merge:
+                log(f"Merging PR #{pr_number}...")
+                merged = merge_pr_with_github_api(
+                    owner=owner,
+                    repo=repo_name,
+                    pr_number=pr_number,
+                    github_token=user["access_token"],
+                    merge_method='squash'  # Use squash merge for cleaner history
+                )
+
+                if merged:
+                    return ChatToolResponse(
+                        result=f"✅ **Feature implemented and merged!**\n\n**Pull Request:** {pr_url}\n\nThe changes have been merged into `{default_branch}`. ✅"
+                    )
+                else:
+                    return ChatToolResponse(
+                        result=f"✅ **Feature implemented!**\n\n**Pull Request:** {pr_url}\n\n⚠️ Could not auto-merge. Please merge manually on GitHub (there might be conflicts or protections)."
+                    )
+            else:
+                return ChatToolResponse(
+                    result=f"✅ **Feature implemented!**\n\n**Pull Request:** {pr_url}\n\nReview the AI-generated code and merge when ready."
+                )
         else:
             return ChatToolResponse(
                 error=f"Code pushed to branch `{branch_name}` but failed to create PR. You can manually create it on GitHub."