@azerate/claudette-mcp 1.7.2 → 1.7.4

package/README.md

@@ -1,214 +1,214 @@
-# Claudette MCP Server
-
-MCP server for Claudette IDE - providing Claude with comprehensive workspace management tools.
-
-## Installation
-
-```bash
-npx @azerate/claudette-mcp
-```
-
-Or install globally:
-```bash
-npm install -g @azerate/claudette-mcp
-```
-
-## Setup
-
-### Option 1: Add via Claude Code CLI
-```bash
-claude mcp add claudette -- npx @azerate/claudette-mcp
-```
-
-### Option 2: Add to .mcp.json (project-level)
-Create `.mcp.json` in your project root:
-```json
-{
-  "mcpServers": {
-    "claudette": {
-      "type": "stdio",
-      "command": "npx",
-      "args": ["@azerate/claudette-mcp"]
-    }
-  }
-}
-```
-
-### Option 3: Add to Claude Code settings
-Add to `~/.claude.json`:
-```json
-"mcpServers": {
-  "claudette": {
-    "type": "stdio",
-    "command": "npx",
-    "args": ["@azerate/claudette-mcp"]
-  }
-}
-```
-
-## Available Tools
-
-### Code Quality
-
-| Tool | Description |
-|------|-------------|
-| `get_errors` | Get TypeScript compilation errors for the workspace |
-| `run_tests` | Run Jest tests and return results |
-| `get_test_results` | Get the latest test results |
-| `run_benchmarks` | Run performance benchmarks (tinybench/vitest) |
-| `get_benchmark_results` | Get the latest benchmark results |
-
-### Git & Changes
-
-| Tool | Description |
-|------|-------------|
-| `get_changes` | Get pending git changes (modified, added, deleted files) |
-| `get_branch_info` | Get current branch, behind/ahead status, sync state |
-| `get_branch_pr_status` | Check if current branch has an open/merged/closed PR |
-| `create_branch` | Create a new feature branch from main/master |
-| `sync_branch` | Rebase or merge current branch with main |
-| `get_checkpoints` | List saved checkpoints (git stash snapshots) |
-| `create_checkpoint` | Create a checkpoint before risky changes |
-| `restore_checkpoint` | Restore workspace to a previous checkpoint |
-| `delete_checkpoint` | Delete a checkpoint permanently |
-
-### Workflow Automation
-
-| Tool | Description |
-|------|-------------|
-| `get_workflow_status` | Get current workflow pipeline status |
-| `get_workflow_recommendation` | **Smart recommendation** - analyzes branch, PR status, and changes to suggest the best next action |
-| `trigger_workflow` | Start the workflow (lint, types, tests, coverage, benchmarks) |
-| `generate_commit_message` | Generate a commit message from changes |
-| `approve_commit` | Stage and commit with the provided message |
-| `approve_push` | Push committed changes to remote |
-| `approve_write_tests` | Mark the write tests step as complete |
-| `create_pr` | Create a pull request using gh CLI |
-| `approve_code_review` | Mark the code review step as complete |
-
-### Project Memory
-
-| Tool | Description |
-|------|-------------|
-| `get_memory` | Get project memory notes |
-| `add_memory` | Add a note to project memory |
-| `clear_memory` | Clear all project memory notes |
-| `delete_memory` | Delete specific notes by index |
-| `replace_memory` | Replace all memory with new notes |
-
-### Scripts & Automation
-
-| Tool | Description |
-|------|-------------|
-| `list_scripts` | List npm scripts and their status |
-| `run_script` | Start an npm script |
-| `stop_script` | Stop a running script |
-| `get_console_output` | Get console output from a script |
-| `check_quick_actions` | Check for pending UI-triggered actions |
-
-### Refactoring
-
-| Tool | Description |
-|------|-------------|
-| `create_refactor_plan` | Analyze workspace and create refactoring plan |
-| `get_refactor_plan` | Get the current refactor plan |
-| `get_next_refactor_step` | Get the next uncompleted step |
-| `verify_refactor` | Run tests and compare to baseline |
-| `complete_refactor_step` | Mark a step as completed |
-| `complete_refactor` | Finish refactoring and delete plan |
-
-## Smart Workflow Recommendations
-
-Before starting a workflow, always call `get_workflow_recommendation` to get intelligent guidance:
-
-```
-get_workflow_recommendation(workspace_path="/path/to/project")
-```
-
-The tool analyzes your current state and recommends the best action:
-
-| Recommended Action | When | What to Do |
-|-------------------|------|------------|
-| `start_workflow` | Normal flow, no blockers | Proceed with `trigger_workflow` |
-| `create_feature_branch` | On main with `requireFeatureBranch` enabled | Use `create_branch` first |
-| `add_to_existing_pr` | On feature branch with open PR | Your commits will update the existing PR |
-| `switch_to_main` | PR was merged, branch is stale | Switch to main, pull, create new branch |
-| `create_new_branch` | PR was closed (not merged) | Create a fresh branch or reopen PR |
-| `sync_branch_first` | Branch is >5 commits behind main | Use `sync_branch` before committing |
-| `no_changes` | No uncommitted changes | Nothing to commit yet |
-
-Each recommendation includes:
-- **reason**: Why this action is recommended
-- **suggestion**: What you should do (trust this!)
-- **consequences**: What will happen if you proceed
-
-## Workflow Pipeline
-
-The workflow feature provides a 10-step guided development process with best-practice Git support:
-
-```
-trigger_workflow()
-       |
-       v
-[AUTOMATIC CHECKS]
-  1. Type checking (tsc --noEmit)
-  2. Lint/Format (eslint --fix)
-  3. Run tests
-  4. Coverage analysis (files needing tests)
-  5. Benchmarks (optional)
-       |
-       v
-[HUMAN GATES]
-  6. Write Tests (if coverage found gaps)
-  7. Commit (approve_commit)
-  8. Push (approve_push)
-  9. Create PR (skipped if on main)
-  10. Code Review (approve_code_review)
-```
-
-### Branch Management
-
-Best practice: Work on feature branches, not directly on main.
-
-```
-# Check current branch status
-get_branch_info(workspace_path="/path/to/project")
-
-# Create a feature branch
-create_branch(workspace_path="/path/to/project", branch_name="feature/my-feature")
-
-# Sync with latest main (rebase)
-sync_branch(workspace_path="/path/to/project", method="rebase")
-```
-
-The workflow enforces feature branch usage by default (`requireFeatureBranch: true`).
-Toggle this in the UI or set in `.claudette/workflow-config.json`.
-
-## Example Usage
-
-```
-# Check for errors
-get_errors(workspace_path="/path/to/project")
-
-# Run full workflow
-trigger_workflow(workspace_path="/path/to/project")
-
-# Check workflow status
-get_workflow_status(workspace_path="/path/to/project")
-
-# After checks pass, commit
-generate_commit_message(workspace_path="/path/to/project")
-approve_commit(workspace_path="/path/to/project", message="Add new feature")
-
-# Push changes
-approve_push(workspace_path="/path/to/project")
-```
-
-## Requirements
-
-- Node.js 18+
-- Claudette IDE server running on port 52001 (for full functionality)
-
-## License
-
-MIT
+# Claudette MCP Server
+
+MCP server for Claudette IDE - providing Claude with comprehensive workspace management tools.
+
+## Installation
+
+```bash
+npx @azerate/claudette-mcp
+```
+
+Or install globally:
+```bash
+npm install -g @azerate/claudette-mcp
+```
+
+## Setup
+
+### Option 1: Add via Claude Code CLI
+```bash
+claude mcp add claudette -- npx @azerate/claudette-mcp
+```
+
+### Option 2: Add to .mcp.json (project-level)
+Create `.mcp.json` in your project root:
+```json
+{
+  "mcpServers": {
+    "claudette": {
+      "type": "stdio",
+      "command": "npx",
+      "args": ["@azerate/claudette-mcp"]
+    }
+  }
+}
+```
+
+### Option 3: Add to Claude Code settings
+Add to `~/.claude.json`:
+```json
+"mcpServers": {
+  "claudette": {
+    "type": "stdio",
+    "command": "npx",
+    "args": ["@azerate/claudette-mcp"]
+  }
+}
+```
+
+## Available Tools
+
+### Code Quality
+
+| Tool | Description |
+|------|-------------|
+| `get_errors` | Get TypeScript compilation errors for the workspace |
+| `run_tests` | Run Jest tests and return results |
+| `get_test_results` | Get the latest test results |
+| `run_benchmarks` | Run performance benchmarks (tinybench/vitest) |
+| `get_benchmark_results` | Get the latest benchmark results |
+
+### Git & Changes
+
+| Tool | Description |
+|------|-------------|
+| `get_changes` | Get pending git changes (modified, added, deleted files) |
+| `get_branch_info` | Get current branch, behind/ahead status, sync state |
+| `get_branch_pr_status` | Check if current branch has an open/merged/closed PR |
+| `create_branch` | Create a new feature branch from main/master |
+| `sync_branch` | Rebase or merge current branch with main |
+| `get_checkpoints` | List saved checkpoints (git stash snapshots) |
+| `create_checkpoint` | Create a checkpoint before risky changes |
+| `restore_checkpoint` | Restore workspace to a previous checkpoint |
+| `delete_checkpoint` | Delete a checkpoint permanently |
+
+### Workflow Automation
+
+| Tool | Description |
+|------|-------------|
+| `get_workflow_status` | Get current workflow pipeline status |
+| `get_workflow_recommendation` | **Smart recommendation** - analyzes branch, PR status, and changes to suggest the best next action |
+| `trigger_workflow` | Start the workflow (lint, types, tests, coverage, benchmarks) |
+| `generate_commit_message` | Generate a commit message from changes |
+| `approve_commit` | Stage and commit with the provided message |
+| `approve_push` | Push committed changes to remote |
+| `approve_write_tests` | Mark the write tests step as complete |
+| `create_pr` | Create a pull request using gh CLI |
+| `approve_code_review` | Mark the code review step as complete |
+
+### Project Memory
+
+| Tool | Description |
+|------|-------------|
+| `get_memory` | Get project memory notes |
+| `add_memory` | Add a note to project memory |
+| `clear_memory` | Clear all project memory notes |
+| `delete_memory` | Delete specific notes by index |
+| `replace_memory` | Replace all memory with new notes |
+
+### Scripts & Automation
+
+| Tool | Description |
+|------|-------------|
+| `list_scripts` | List npm scripts and their status |
+| `run_script` | Start an npm script |
+| `stop_script` | Stop a running script |
+| `get_console_output` | Get console output from a script |
+| `check_quick_actions` | Check for pending UI-triggered actions |
+
+### Refactoring
+
+| Tool | Description |
+|------|-------------|
+| `create_refactor_plan` | Analyze workspace and create refactoring plan |
+| `get_refactor_plan` | Get the current refactor plan |
+| `get_next_refactor_step` | Get the next uncompleted step |
+| `verify_refactor` | Run tests and compare to baseline |
+| `complete_refactor_step` | Mark a step as completed |
+| `complete_refactor` | Finish refactoring and delete plan |
+
+## Smart Workflow Recommendations
+
+Before starting a workflow, always call `get_workflow_recommendation` to get intelligent guidance:
+
+```
+get_workflow_recommendation(workspace_path="/path/to/project")
+```
+
+The tool analyzes your current state and recommends the best action:
+
+| Recommended Action | When | What to Do |
+|-------------------|------|------------|
+| `start_workflow` | Normal flow, no blockers | Proceed with `trigger_workflow` |
+| `create_feature_branch` | On main with `requireFeatureBranch` enabled | Use `create_branch` first |
+| `add_to_existing_pr` | On feature branch with open PR | Your commits will update the existing PR |
+| `switch_to_main` | PR was merged, branch is stale | Switch to main, pull, create new branch |
+| `create_new_branch` | PR was closed (not merged) | Create a fresh branch or reopen PR |
+| `sync_branch_first` | Branch is >5 commits behind main | Use `sync_branch` before committing |
+| `no_changes` | No uncommitted changes | Nothing to commit yet |
+
+Each recommendation includes:
+- **reason**: Why this action is recommended
+- **suggestion**: What you should do (trust this!)
+- **consequences**: What will happen if you proceed
+
+## Workflow Pipeline
+
+The workflow feature provides a 10-step guided development process with best-practice Git support:
+
+```
+trigger_workflow()
+       |
+       v
+[AUTOMATIC CHECKS]
+  1. Type checking (tsc --noEmit)
+  2. Lint/Format (eslint --fix)
+  3. Run tests
+  4. Coverage analysis (files needing tests)
+  5. Benchmarks (optional)
+       |
+       v
+[HUMAN GATES]
+  6. Write Tests (if coverage found gaps)
+  7. Commit (approve_commit)
+  8. Push (approve_push)
+  9. Create PR (skipped if on main)
+  10. Code Review (approve_code_review)
+```
+
+### Branch Management
+
+Best practice: Work on feature branches, not directly on main.
+
+```
+# Check current branch status
+get_branch_info(workspace_path="/path/to/project")
+
+# Create a feature branch
+create_branch(workspace_path="/path/to/project", branch_name="feature/my-feature")
+
+# Sync with latest main (rebase)
+sync_branch(workspace_path="/path/to/project", method="rebase")
+```
+
+The workflow enforces feature branch usage by default (`requireFeatureBranch: true`).
+Toggle this in the UI or set in `.claudette/workflow-config.json`.
+
+## Example Usage
+
+```
+# Check for errors
+get_errors(workspace_path="/path/to/project")
+
+# Run full workflow
+trigger_workflow(workspace_path="/path/to/project")
+
+# Check workflow status
+get_workflow_status(workspace_path="/path/to/project")
+
+# After checks pass, commit
+generate_commit_message(workspace_path="/path/to/project")
+approve_commit(workspace_path="/path/to/project", message="Add new feature")
+
+# Push changes
+approve_push(workspace_path="/path/to/project")
+```
+
+## Requirements
+
+- Node.js 18+
+- Claudette IDE server running on port 52001 (for full functionality)
+
+## License
+
+MIT

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,73 @@ 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,state', {
+                        cwd: workspacePath,
+                        encoding: 'utf-8',
+                    });
+                    const parsed = JSON.parse(prInfo);
+                    prNumber = parsed.number?.toString();
+                    prTitle = parsed.title;
+                    // Skip merge if PR is already merged/closed
+                    if (parsed.state !== 'OPEN') {
+                        prNumber = undefined;
+                    }
+                }
+                catch {
+                    // No PR found
+                }
+                // Merge the PR if one exists
+                let merged = false;
+                if (prNumber) {
+                    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',
+                        });
+                        merged = true;
+                    }
+                    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.` }] };
+                await response.json();
+                // Reset workflow after successful merge
+                await fetch(`${CLAUDETTE_API}/api/workflow/reset`, {
+                    method: "POST",
+                    headers: { "Content-Type": "application/json" },
+                    body: JSON.stringify({ path: workspacePath }),
+                });
+                let output = '';
+                if (merged && prNumber) {
+                    output += `✅ PR #${prNumber} merged successfully!\n\n`;
+                    output += `Title: ${prTitle}\n`;
+                    output += `Method: ${mergeMethod}\n`;
+                    output += `Branch deleted: Yes\n`;
                 }
                 else {
-                    return { content: [{ type: "text", text: `❌ Failed: ${result.error}` }] };
+                    output += `✅ Code review approved!\n\n`;
                 }
+                if (reviewer)
+                    output += `Reviewer: ${reviewer}\n`;
+                output += `\nWorkflow complete and reset.`;
+                return { content: [{ type: "text", text: output }] };
             }
             catch (err) {
                 return { content: [{ type: "text", text: `Error: ${err.message}` }] };

package/package.json

@@ -1,39 +1,39 @@
-{
-  "name": "@azerate/claudette-mcp",
-  "version": "1.7.2",
-  "description": "MCP server for Claudette IDE - TypeScript errors, git changes, checkpoints, memory, and script management",
-  "type": "module",
-  "main": "dist/index.js",
-  "bin": {
-    "claudette-mcp": "dist/index.js"
-  },
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "build": "tsc",
-    "start": "node dist/index.js",
-    "prepublishOnly": "npm run build"
-  },
-  "keywords": [
-    "mcp",
-    "claude",
-    "claudette",
-    "typescript",
-    "git",
-    "ide"
-  ],
-  "author": "azerate",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/azerate/claudette"
-  },
-  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.0.0"
-  },
-  "devDependencies": {
-    "@types/node": "^22.0.0",
-    "typescript": "^5.7.0"
-  }
-}
+{
+  "name": "@azerate/claudette-mcp",
+  "version": "1.7.4",
+  "description": "MCP server for Claudette IDE - TypeScript errors, git changes, checkpoints, memory, and script management",
+  "type": "module",
+  "main": "dist/index.js",
+  "bin": {
+    "claudette-mcp": "dist/index.js"
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "tsc",
+    "start": "node dist/index.js",
+    "prepublishOnly": "npm run build"
+  },
+  "keywords": [
+    "mcp",
+    "claude",
+    "claudette",
+    "typescript",
+    "git",
+    "ide"
+  ],
+  "author": "azerate",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/azerate/claudette"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.0.0"
+  },
+  "devDependencies": {
+    "@types/node": "^22.0.0",
+    "typescript": "^5.7.0"
+  }
+}