@remogram/mcp 0.1.0-beta.5 → 0.1.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remogram/mcp",
-  "version": "0.1.0-beta.5",
+  "version": "0.1.0-beta.8",
   "description": "Remogram MCP server delegating to CLI",
   "type": "module",
   "license": "MIT",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.17.0",
-    "@remogram/cli": "0.1.0-beta.5",
+    "@remogram/cli": "0.1.0-beta.8",
     "zod": "^3.25.76"
   }
 }

package/register-tools.mjs

@@ -1,6 +1,16 @@
 import { z } from 'zod';
+import { normalizeAllowedPaths } from '@remogram/core';
 import { runRemogramCli, packetToMcpContent } from './run-cli.mjs';
 
+/** @internal Build CLI argv for merge_plan MCP tool (exported for transport tests). */
+export function mergePlanMcpCliArgs(input) {
+  const a = ['merge', 'plan', '--number', String(input.number)];
+  for (const glob of normalizeAllowedPaths(input.allowed_paths ?? []) ?? []) {
+    a.push('--allowed-path', glob);
+  }
+  return a;
+}
+
 export function registerTools(server) {
   const tools = [
     {
@@ -134,13 +144,7 @@ export function registerTools(server) {
         number: z.number().int().positive(),
         allowed_paths: z.array(z.string()).optional(),
       }),
-      args: (input) => {
-        const a = ['merge', 'plan', '--number', String(input.number)];
-        for (const glob of input.allowed_paths ?? []) {
-          a.push('--allowed-path', glob);
-        }
-        return a;
-      },
+      args: mergePlanMcpCliArgs,
     },
     {
       name: 'whoami',
@@ -182,6 +186,32 @@ export function registerTools(server) {
       }),
       args: (input) => ['forge', 'changes', '--since', input.since],
     },
+    {
+      name: 'merge_execute',
+      description: 'Execute a forge merge for an open change request after SHA-bound preflight.',
+      inputSchema: z.object({
+        number: z.number().int().positive(),
+        expected_base_sha: z.string().describe('Expected base SHA (40 hex chars)'),
+        expected_head_sha: z.string().describe('Expected head SHA (40 hex chars)'),
+        method: z.enum(['merge']).optional().describe('Merge method (v1: merge only)'),
+      }),
+      args: (input) => {
+        const a = [
+          'merge',
+          'execute',
+          '--number',
+          String(input.number),
+          '--expected-base-sha',
+          input.expected_base_sha,
+          '--expected-head-sha',
+          input.expected_head_sha,
+        ];
+        if (input.method) a.push('--method', input.method);
+        return a;
+      },
+      readOnlyHint: false,
+      destructiveHint: true,
+    },
     {
       name: 'sync_plan',
       description: 'Local vs remote sync facts and divergent-remote blockers.',