@azerate/claudette-mcp 1.7.6 → 1.7.8

package/README.md

@@ -2,6 +2,8 @@
 
 MCP server for Claudette IDE - providing Claude with comprehensive workspace management tools.
 
+> **v1.7.6** - Added merge safety checks to prevent code loss during PR merges.
+
 ## Installation
 
 ```bash

package/dist/api.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Get the Claudette API base URL.
+ * Reads from .server-port file on each call to handle:
+ * - Server starting after MCP
+ * - Server restarting on different port
+ */
+export declare function getApiUrl(): string;

package/dist/api.js

@@ -0,0 +1,36 @@
+// Shared API URL utility for Claudette MCP server
+// Dynamically reads port from .server-port file on each call
+import { readFileSync, existsSync } from "fs";
+import { join, dirname } from "path";
+import { fileURLToPath } from "url";
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const DEFAULT_PORT = 52001;
+/**
+ * Get the Claudette API base URL.
+ * Reads from .server-port file on each call to handle:
+ * - Server starting after MCP
+ * - Server restarting on different port
+ */
+export function getApiUrl() {
+    // Try to find .server-port file in multiple locations
+    const portFilePaths = [
+        join(__dirname, '..', '..', '.server-port'), // From dist/
+        join(__dirname, '..', '.server-port'), // From src/
+        join(process.cwd(), '.server-port'), // From cwd
+    ];
+    for (const portFile of portFilePaths) {
+        if (existsSync(portFile)) {
+            try {
+                const port = parseInt(readFileSync(portFile, 'utf-8').trim(), 10);
+                if (!isNaN(port) && port > 0 && port < 65536) {
+                    return `http://localhost:${port}`;
+                }
+            }
+            catch {
+                // Ignore read errors, try next path
+            }
+        }
+    }
+    return `http://localhost:${DEFAULT_PORT}`;
+}

package/dist/index.js

@@ -10,12 +10,15 @@ import { getCheckpoints, createCheckpoint, restoreCheckpoint, deleteCheckpoint }
 import { getGitChanges, checkMergeSafety } from './git.js';
 import { getTypeScriptErrors } from './errors.js';
 import { getPendingAction } from './actions.js';
-// Claudette server API base URL
-const CLAUDETTE_API = "http://localhost:52001";
+import { getApiUrl } from './api.js';
+// Helper function - called on each request for dynamic port detection
+function getApi() {
+    return getApiUrl();
+}
 // Helper to log refactor activity
 async function logRefactorActivity(workspacePath, type, action, message, details) {
     try {
-        await fetch(`${CLAUDETTE_API}/api/refactor/activity`, {
+        await fetch(`${getApi()}/api/refactor/activity`, {
             method: "POST",
             headers: { "Content-Type": "application/json" },
             body: JSON.stringify({ path: workspacePath, type, action, message, details }),
@@ -923,7 +926,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: workspace_path is required" }] };
             }
             try {
-                const response = await fetch(`${CLAUDETTE_API}/api/refactor/analyze`, {
+                const response = await fetch(`${getApi()}/api/refactor/analyze`, {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
                     body: JSON.stringify({ path: workspacePath }),
@@ -965,7 +968,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             }
             try {
                 await logRefactorActivity(workspacePath, 'info', 'read_plan', 'Reading refactor plan...');
-                const response = await fetch(`${CLAUDETTE_API}/api/refactor/plan?path=${encodeURIComponent(workspacePath)}`);
+                const response = await fetch(`${getApi()}/api/refactor/plan?path=${encodeURIComponent(workspacePath)}`);
                 if (response.status === 404) {
                     return { content: [{ type: "text", text: "No refactor plan found. Use create_refactor_plan first." }] };
                 }
@@ -1028,7 +1031,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: workspace_path is required" }] };
             }
             try {
-                const response = await fetch(`${CLAUDETTE_API}/api/refactor/plan?path=${encodeURIComponent(workspacePath)}`, {
+                const response = await fetch(`${getApi()}/api/refactor/plan?path=${encodeURIComponent(workspacePath)}`, {
                     method: "DELETE",
                 });
                 const data = await response.json();
@@ -1050,7 +1053,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             }
             try {
                 await logRefactorActivity(workspacePath, 'info', 'verify', 'Running tests...');
-                const response = await fetch(`${CLAUDETTE_API}/api/refactor/verify`, {
+                const response = await fetch(`${getApi()}/api/refactor/verify`, {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
                     body: JSON.stringify({ path: workspacePath }),
@@ -1101,7 +1104,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: workspace_path and step_id are required" }] };
             }
             try {
-                const response = await fetch(`${CLAUDETTE_API}/api/refactor/step/complete`, {
+                const response = await fetch(`${getApi()}/api/refactor/step/complete`, {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
                     body: JSON.stringify({ path: workspacePath, stepId }),
@@ -1125,7 +1128,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: workspace_path is required" }] };
             }
             try {
-                const response = await fetch(`${CLAUDETTE_API}/api/refactor/step/next?path=${encodeURIComponent(workspacePath)}`);
+                const response = await fetch(`${getApi()}/api/refactor/step/next?path=${encodeURIComponent(workspacePath)}`);
                 const data = await response.json();
                 if (!data.hasNext) {
                     await logRefactorActivity(workspacePath, 'success', 'all_complete', 'All refactoring steps completed!');
@@ -1183,7 +1186,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             }
             try {
                 // Start the tests
-                const response = await fetch(`${CLAUDETTE_API}/api/jest/run`, {
+                const response = await fetch(`${getApi()}/api/jest/run`, {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
                     body: JSON.stringify({ path: workspacePath, testFile }),
@@ -1198,7 +1201,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 while (attempts < maxAttempts) {
                     await new Promise(resolve => setTimeout(resolve, 1000));
                     attempts++;
-                    const statusRes = await fetch(`${CLAUDETTE_API}/api/jest/status?path=${encodeURIComponent(workspacePath)}`);
+                    const statusRes = await fetch(`${getApi()}/api/jest/status?path=${encodeURIComponent(workspacePath)}`);
                     const status = await statusRes.json();
                     if (!status.isRunning && status.lastResult) {
                         const result = status.lastResult;
@@ -1232,7 +1235,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: workspace_path is required" }] };
             }
             try {
-                const response = await fetch(`${CLAUDETTE_API}/api/jest/status?path=${encodeURIComponent(workspacePath)}`);
+                const response = await fetch(`${getApi()}/api/jest/status?path=${encodeURIComponent(workspacePath)}`);
                 const status = await response.json();
                 if (status.isRunning) {
                     return { content: [{ type: "text", text: "Tests are currently running..." }] };
@@ -1268,7 +1271,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             }
             try {
                 // Start the benchmarks
-                const response = await fetch(`${CLAUDETTE_API}/api/benchmarks/run`, {
+                const response = await fetch(`${getApi()}/api/benchmarks/run`, {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
                     body: JSON.stringify({ path: workspacePath, async: false }),
@@ -1308,7 +1311,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: workspace_path is required" }] };
             }
             try {
-                const response = await fetch(`${CLAUDETTE_API}/api/benchmarks/status?path=${encodeURIComponent(workspacePath)}`);
+                const response = await fetch(`${getApi()}/api/benchmarks/status?path=${encodeURIComponent(workspacePath)}`);
                 const status = await response.json();
                 if (status.isRunning) {
                     return { content: [{ type: "text", text: "Benchmarks are currently running..." }] };
@@ -1353,7 +1356,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: workspace_path is required" }] };
             }
             try {
-                const response = await fetch(`${CLAUDETTE_API}/api/workflow/status?path=${encodeURIComponent(workspacePath)}`);
+                const response = await fetch(`${getApi()}/api/workflow/status?path=${encodeURIComponent(workspacePath)}`);
                 const status = await response.json();
                 let output = `Workflow Status\n${"=".repeat(50)}\n\n`;
                 output += `Current Step: ${status.currentStep}\n`;
@@ -1442,7 +1445,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: workspace_path is required" }] };
             }
             try {
-                const response = await fetch(`${CLAUDETTE_API}/api/workflow/trigger`, {
+                const response = await fetch(`${getApi()}/api/workflow/trigger`, {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
                     body: JSON.stringify({ path: workspacePath }),
@@ -1470,7 +1473,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: workspace_path is required" }] };
             }
             try {
-                const response = await fetch(`${CLAUDETTE_API}/api/workflow/commit-message?path=${encodeURIComponent(workspacePath)}`);
+                const response = await fetch(`${getApi()}/api/workflow/commit-message?path=${encodeURIComponent(workspacePath)}`);
                 const data = await response.json();
                 return { content: [{ type: "text", text: `Suggested commit message:\n\n${data.message}` }] };
             }
@@ -1488,7 +1491,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: message is required" }] };
             }
             try {
-                const response = await fetch(`${CLAUDETTE_API}/api/workflow/commit`, {
+                const response = await fetch(`${getApi()}/api/workflow/commit`, {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
                     body: JSON.stringify({ path: workspacePath, message }),
@@ -1511,7 +1514,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: workspace_path is required" }] };
             }
             try {
-                const response = await fetch(`${CLAUDETTE_API}/api/workflow/push`, {
+                const response = await fetch(`${getApi()}/api/workflow/push`, {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
                     body: JSON.stringify({ path: workspacePath }),
@@ -1538,7 +1541,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: tests_written is required" }] };
             }
             try {
-                const response = await fetch(`${CLAUDETTE_API}/api/workflow/write-tests`, {
+                const response = await fetch(`${getApi()}/api/workflow/write-tests`, {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
                     body: JSON.stringify({ path: workspacePath, testsWritten }),
@@ -1591,6 +1594,16 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 let merged = false;
                 if (prNumber) {
                     const mergeFlag = mergeMethod === 'squash' ? '--squash' : mergeMethod === 'rebase' ? '--rebase' : '--merge';
+                    // Stash any uncommitted changes before merge (gh pr merge --delete-branch needs clean checkout)
+                    let stashed = false;
+                    try {
+                        const status = execSync('git status --porcelain', { cwd: workspacePath, encoding: 'utf-8' }).trim();
+                        if (status) {
+                            execSync('git stash push -m "claudette-auto-stash"', { cwd: workspacePath, stdio: 'pipe' });
+                            stashed = true;
+                        }
+                    }
+                    catch { /* ignore stash errors */ }
                     try {
                         execSync(`gh pr merge ${prNumber} ${mergeFlag} --delete-branch`, {
                             cwd: workspacePath,
@@ -1600,18 +1613,32 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                         merged = true;
                     }
                     catch (mergeErr) {
+                        // Restore stash if merge failed
+                        if (stashed) {
+                            try {
+                                execSync('git stash pop', { cwd: workspacePath, stdio: 'pipe' });
+                            }
+                            catch { /* ignore */ }
+                        }
                         return { content: [{ type: "text", text: `❌ Failed to merge PR #${prNumber}: ${mergeErr.message}` }] };
                     }
+                    // After successful merge, drop the stash (we're on main now, stash content is outdated)
+                    if (stashed) {
+                        try {
+                            execSync('git stash drop', { cwd: workspacePath, stdio: 'pipe' });
+                        }
+                        catch { /* ignore */ }
+                    }
                 }
                 // Mark workflow as complete
-                const response = await fetch(`${CLAUDETTE_API}/api/workflow/code-review`, {
+                const response = await fetch(`${getApi()}/api/workflow/code-review`, {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
                     body: JSON.stringify({ path: workspacePath, reviewer }),
                 });
                 await response.json();
                 // Reset workflow after successful merge
-                await fetch(`${CLAUDETTE_API}/api/workflow/reset`, {
+                await fetch(`${getApi()}/api/workflow/reset`, {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
                     body: JSON.stringify({ path: workspacePath }),
@@ -1646,7 +1673,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: title is required" }] };
             }
             try {
-                const response = await fetch(`${CLAUDETTE_API}/api/workflow/pr`, {
+                const response = await fetch(`${getApi()}/api/workflow/pr`, {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
                     body: JSON.stringify({ path: workspacePath, title, body }),
@@ -1670,7 +1697,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: workspace_path is required" }] };
             }
             try {
-                const response = await fetch(`${CLAUDETTE_API}/api/workflow/branch?path=${encodeURIComponent(workspacePath)}&fetch=${doFetch}`);
+                const response = await fetch(`${getApi()}/api/workflow/branch?path=${encodeURIComponent(workspacePath)}&fetch=${doFetch}`);
                 const info = await response.json();
                 let output = `Branch Info\n${'='.repeat(50)}\n\n`;
                 output += `Current Branch: ${info.current}\n`;
@@ -1721,7 +1748,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: branch_name is required" }] };
             }
             try {
-                const response = await fetch(`${CLAUDETTE_API}/api/workflow/branch`, {
+                const response = await fetch(`${getApi()}/api/workflow/branch`, {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
                     body: JSON.stringify({ path: workspacePath, name: branchName }),
@@ -1745,7 +1772,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: workspace_path is required" }] };
             }
             try {
-                const response = await fetch(`${CLAUDETTE_API}/api/workflow/sync`, {
+                const response = await fetch(`${getApi()}/api/workflow/sync`, {
                     method: "POST",
                     headers: { "Content-Type": "application/json" },
                     body: JSON.stringify({ path: workspacePath, method }),
@@ -1768,7 +1795,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: workspace_path is required" }] };
             }
             try {
-                const response = await fetch(`${CLAUDETTE_API}/api/workflow/pr-status?path=${encodeURIComponent(workspacePath)}`);
+                const response = await fetch(`${getApi()}/api/workflow/pr-status?path=${encodeURIComponent(workspacePath)}`);
                 const status = await response.json();
                 let output = `Branch PR Status\n${'='.repeat(50)}\n\n`;
                 if (!status.hasPR) {
@@ -1809,7 +1836,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return { content: [{ type: "text", text: "Error: workspace_path is required" }] };
             }
             try {
-                const response = await fetch(`${CLAUDETTE_API}/api/workflow/recommendation?path=${encodeURIComponent(workspacePath)}`);
+                const response = await fetch(`${getApi()}/api/workflow/recommendation?path=${encodeURIComponent(workspacePath)}`);
                 const rec = await response.json();
                 let output = `Workflow Recommendation\n${'='.repeat(50)}\n\n`;
                 // Action header with icon

package/dist/scripts.js

@@ -1,11 +1,10 @@
 // Script management functions for Claudette MCP server
 import { stripAnsi } from './utils.js';
-// Claudette server API base URL
-const CLAUDETTE_API = "http://localhost:52001";
+import { getApiUrl } from './api.js';
 // Get list of scripts from workspace
 export async function getScripts(workspacePath) {
     try {
-        const response = await fetch(`${CLAUDETTE_API}/api/scripts?path=${encodeURIComponent(workspacePath)}`);
+        const response = await fetch(`${getApiUrl()}/api/scripts?path=${encodeURIComponent(workspacePath)}`);
         if (!response.ok)
             return { scripts: [], hasPackageJson: false };
         return await response.json();
@@ -17,7 +16,7 @@ export async function getScripts(workspacePath) {
 // Get script output
 export async function getScriptOutput(workspacePath, scriptName) {
     try {
-        const response = await fetch(`${CLAUDETTE_API}/api/scripts/status?path=${encodeURIComponent(workspacePath)}&scriptName=${encodeURIComponent(scriptName)}`);
+        const response = await fetch(`${getApiUrl()}/api/scripts/status?path=${encodeURIComponent(workspacePath)}&scriptName=${encodeURIComponent(scriptName)}`);
         if (!response.ok)
             return null;
         const data = await response.json();
@@ -34,7 +33,7 @@ export async function getScriptOutput(workspacePath, scriptName) {
 // Start a script
 export async function startScript(workspacePath, scriptName) {
     try {
-        const response = await fetch(`${CLAUDETTE_API}/api/scripts/run`, {
+        const response = await fetch(`${getApiUrl()}/api/scripts/run`, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify({ path: workspacePath, scriptName, autoLaunchBrowser: true }),
@@ -48,7 +47,7 @@ export async function startScript(workspacePath, scriptName) {
 // Stop a script
 export async function stopScript(workspacePath, scriptName) {
     try {
-        const response = await fetch(`${CLAUDETTE_API}/api/scripts/stop`, {
+        const response = await fetch(`${getApiUrl()}/api/scripts/stop`, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify({ path: workspacePath, scriptName }),

package/package.json

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