@azerate/claudette-mcp 1.7.2 → 1.7.3

package/dist/index.js

@@ -2,6 +2,7 @@
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { CallToolRequestSchema, ListToolsRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
+import { execSync } from "child_process";
 // Import from extracted modules
 import { getScripts, getScriptOutput, startScript, stopScript } from './scripts.js';
 import { getWorkspaceConfig, saveWorkspaceConfig, clearMemory, deleteMemoryNotes, replaceMemory } from './workspace.js';
@@ -541,7 +542,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
             },
             {
                 name: "approve_code_review",
-                description: "Mark the code review step as complete after the PR has been reviewed and approved.",
+                description: "Complete the code review step AND merge the PR. This will merge the PR on GitHub and mark the workflow as complete.",
                 inputSchema: {
                     type: "object",
                     properties: {
@@ -553,6 +554,11 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                             type: "string",
                             description: "Name of the reviewer (optional)",
                         },
+                        merge_method: {
+                            type: "string",
+                            enum: ["squash", "merge", "rebase"],
+                            description: "How to merge the PR: squash (default), merge, or rebase",
+                        },
                     },
                     required: ["workspace_path"],
                 },
@@ -1552,22 +1558,56 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         case "approve_code_review": {
             const workspacePath = args?.workspace_path;
             const reviewer = args?.reviewer;
+            const mergeMethod = args?.merge_method || 'squash';
             if (!workspacePath) {
                 return { content: [{ type: "text", text: "Error: workspace_path is required" }] };
             }
             try {
+                // First, check if there's an open PR for this branch
+                let prNumber;
+                let prTitle;
+                try {
+                    const prInfo = execSync('gh pr view --json number,title', {
+                        cwd: workspacePath,
+                        encoding: 'utf-8',
+                    });
+                    const parsed = JSON.parse(prInfo);
+                    prNumber = parsed.number?.toString();
+                    prTitle = parsed.title;
+                }
+                catch {
+                    // No PR found
+                }
+                if (!prNumber) {
+                    return { content: [{ type: "text", text: "❌ No open PR found for this branch. Cannot merge." }] };
+                }
+                // Merge the PR using gh CLI
+                const mergeFlag = mergeMethod === 'squash' ? '--squash' : mergeMethod === 'rebase' ? '--rebase' : '--merge';
+                try {
+                    execSync(`gh pr merge ${prNumber} ${mergeFlag} --delete-branch`, {
+                        cwd: workspacePath,
+                        encoding: 'utf-8',
+                        stdio: 'pipe',
+                    });
+                }
+                catch (mergeErr) {
+                    return { content: [{ type: "text", text: `❌ Failed to merge PR #${prNumber}: ${mergeErr.message}` }] };
+                }
+                // Mark workflow as complete
                 const response = await fetch(`${CLAUDETTE_API}/api/workflow/code-review`, {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
                     body: JSON.stringify({ path: workspacePath, reviewer }),
                 });
                 const result = await response.json();
-                if (result.status === 'passed') {
-                    return { content: [{ type: "text", text: `✅ Code review approved!\n\n${result.reviewer ? `Reviewer: ${result.reviewer}\n` : ''}Workflow complete.` }] };
-                }
-                else {
-                    return { content: [{ type: "text", text: `❌ Failed: ${result.error}` }] };
-                }
+                let output = `✅ PR #${prNumber} merged successfully!\n\n`;
+                output += `Title: ${prTitle}\n`;
+                output += `Method: ${mergeMethod}\n`;
+                output += `Branch deleted: Yes\n`;
+                if (reviewer)
+                    output += `Reviewer: ${reviewer}\n`;
+                output += `\nWorkflow complete.`;
+                return { content: [{ type: "text", text: output }] };
             }
             catch (err) {
                 return { content: [{ type: "text", text: `Error: ${err.message}` }] };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azerate/claudette-mcp",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "description": "MCP server for Claudette IDE - TypeScript errors, git changes, checkpoints, memory, and script management",
   "type": "module",
   "main": "dist/index.js",