@azerate/claudette-mcp 1.7.4 → 1.7.5

package/dist/index.js

@@ -1563,6 +1563,48 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: workspace_path is required" }] };
             }
             try {
+                // SAFETY CHECK 1: Check for uncommitted changes
+                try {
+                    const status = execSync('git status --porcelain', {
+                        cwd: workspacePath,
+                        encoding: 'utf-8',
+                    }).trim();
+                    if (status) {
+                        return { content: [{ type: "text", text: `❌ BLOCKED: You have uncommitted changes!\n\nUncommitted files:\n${status}\n\nCommit and push these changes before merging to avoid losing code.` }] };
+                    }
+                }
+                catch {
+                    // Ignore git status errors
+                }
+                // SAFETY CHECK 2: Check if local branch is ahead of remote (unpushed commits)
+                try {
+                    const ahead = execSync('git rev-list @{u}..HEAD --count', {
+                        cwd: workspacePath,
+                        encoding: 'utf-8',
+                    }).trim();
+                    const aheadCount = parseInt(ahead, 10);
+                    if (aheadCount > 0) {
+                        return { content: [{ type: "text", text: `❌ BLOCKED: You have ${aheadCount} unpushed commit(s)!\n\nPush your changes before merging to avoid losing code.\nUse approve_push first, then try approve_code_review again.` }] };
+                    }
+                }
+                catch {
+                    // No upstream or error - continue (might be ok)
+                }
+                // SAFETY CHECK 3: Fetch and verify remote is up to date
+                try {
+                    execSync('git fetch', { cwd: workspacePath, stdio: 'pipe', timeout: 10000 });
+                    const behind = execSync('git rev-list HEAD..@{u} --count', {
+                        cwd: workspacePath,
+                        encoding: 'utf-8',
+                    }).trim();
+                    const behindCount = parseInt(behind, 10);
+                    if (behindCount > 0) {
+                        return { content: [{ type: "text", text: `❌ BLOCKED: Remote has ${behindCount} commit(s) you don't have locally!\n\nPull the latest changes before merging.` }] };
+                    }
+                }
+                catch {
+                    // Ignore fetch errors
+                }
                 // First, check if there's an open PR for this branch
                 let prNumber;
                 let prTitle;

package/package.json

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