mergestorm-mcp 0.2.21 → 0.2.22

package/README.md

@@ -1,6 +1,6 @@
 # mergestorm-mcp
 
-Stdio MCP server for Mergestorm. Tools: `whoami`, `credits`, `review_list`, `review_submit`, `review_wait`, `review_wait_pr`, `review_dismiss`, `issue_create`, `stack_adopt`, `stack_list`, `stack_publish`, `stack_publish_status`, `stack_set`, `stack_status`, `stack_wait`, `queue_status`, `settings_get`, `settings_set`.
+Stdio MCP server for Mergestorm. Tools: `whoami`, `credits`, `review_list`, `review_submit`, `review_wait`, `review_wait_pr`, `review_dismiss`, `issue_create`, `stack_adopt`, `stack_list`, `stack_publish`, `stack_publish_status`, `stack_set`, `stack_status`, `stack_wait`, `queue_status`, `settings_get`, `settings_set`, `repo_settings_get`, `repo_settings_set`.
 
 Every tool declares MCP `annotations` for read-only access, destructive changes, idempotence, and external systems. Reads are read-only; submission, adoption, dismissal, and policy changes are writes. Tools that can change existing policy, topology, or review gates are marked potentially destructive even when some inputs only preview or read. Annotations describe effects; the client still controls approval and authorization.
 

package/dist/index.js

@@ -6,7 +6,7 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 // src/server.ts
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { z as z5 } from "zod";
-import { CommandError as CommandError13, BEARER_SETTINGS as BEARER_SETTINGS2 } from "mergestorm/client";
+import { CommandError as CommandError14, BEARER_SETTINGS as BEARER_SETTINGS2 } from "mergestorm/client";
 
 // src/brand-icons.ts
 var MARK_RECTS = [
@@ -897,8 +897,70 @@ async function settingsSet(args, cfg) {
   };
 }
 
+// src/tools/repo-settings.ts
+import {
+  CommandError as CommandError10,
+  REPO_SETTINGS_KEYS,
+  listRepoSettings,
+  patchRepoSettings
+} from "mergestorm/client";
+var ARG_BY_KEY = {
+  auto_patch_enabled: "auto_patch",
+  auto_review_enabled: "auto_review",
+  auto_land_default: "auto_land"
+};
+function parseRepo(raw) {
+  const match = typeof raw === "string" ? /^([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)$/.exec(raw.trim()) : null;
+  if (!match) throw new CommandError10("repo takes <owner>/<repo>.", 2, "usage");
+  return { owner: match[1], repo: match[2] };
+}
+function words(value) {
+  return value === null ? "inherit" : value ? "on" : "off";
+}
+function repoSettingsSummary(entry) {
+  return `${entry.owner}/${entry.repo}: ${REPO_SETTINGS_KEYS.map((key) => `${ARG_BY_KEY[key]} ${words(entry[key])}`).join(" \xB7 ")}`;
+}
+function repoSettingsPatchFromArgs(args) {
+  const patch = {};
+  for (const key of REPO_SETTINGS_KEYS) {
+    const value = args[ARG_BY_KEY[key]];
+    if (value === void 0) continue;
+    if (value !== null && typeof value !== "boolean") {
+      throw new CommandError10(`${ARG_BY_KEY[key]} takes true, false, or null.`, 2, "usage");
+    }
+    patch[key] = value;
+  }
+  if (Object.keys(patch).length === 0) {
+    throw new CommandError10(
+      `At least one of ${Object.values(ARG_BY_KEY).join(", ")} is required.`,
+      2,
+      "usage"
+    );
+  }
+  return patch;
+}
+async function repoSettingsGet(args, cfg) {
+  const wanted = args.repo === void 0 ? null : parseRepo(args.repo);
+  const all = await listRepoSettings(cfg);
+  if (!wanted) {
+    return {
+      summary: all.length === 0 ? "No repositories are connected to this account." : all.map(repoSettingsSummary).join("\n"),
+      data: { repos: all }
+    };
+  }
+  const slug = `${wanted.owner}/${wanted.repo}`.toLowerCase();
+  const entry = all.find((candidate) => `${candidate.owner}/${candidate.repo}`.toLowerCase() === slug);
+  if (!entry) throw new CommandError10(`${wanted.owner}/${wanted.repo} is not connected to this account.`);
+  return { summary: repoSettingsSummary(entry), data: { ...entry } };
+}
+async function repoSettingsSet(args, cfg) {
+  const { owner, repo } = parseRepo(args.repo);
+  const entry = await patchRepoSettings(owner, repo, repoSettingsPatchFromArgs(args), cfg);
+  return { summary: repoSettingsSummary(entry), data: { ...entry } };
+}
+
 // src/tools/stack-adopt.ts
-import { adoptStack, CommandError as CommandError10, stackWatchObligation as stackWatchObligation4 } from "mergestorm/client";
+import { adoptStack, CommandError as CommandError11, stackWatchObligation as stackWatchObligation4 } from "mergestorm/client";
 import { z as z3 } from "zod";
 
 // src/tools/stack-set.ts
@@ -1008,11 +1070,11 @@ async function stackAdopt(input, cfg) {
       summary: message,
       data: {
         error: {
-          code: err instanceof CommandError10 ? err.code ?? "stack_adopt_failed" : "stack_adopt_failed",
+          code: err instanceof CommandError11 ? err.code ?? "stack_adopt_failed" : "stack_adopt_failed",
           message,
-          ...err instanceof CommandError10 ? { exit_code: err.exitCode } : {},
-          ...err instanceof CommandError10 && err.reason !== void 0 ? { reason: err.reason } : {},
-          ...err instanceof CommandError10 && err.retryAfterSeconds !== void 0 ? { retry_after_seconds: err.retryAfterSeconds } : {}
+          ...err instanceof CommandError11 ? { exit_code: err.exitCode } : {},
+          ...err instanceof CommandError11 && err.reason !== void 0 ? { reason: err.reason } : {},
+          ...err instanceof CommandError11 && err.retryAfterSeconds !== void 0 ? { retry_after_seconds: err.retryAfterSeconds } : {}
         }
       },
       isError: true
@@ -1083,7 +1145,7 @@ async function stackList(cfg) {
 
 // src/tools/stack-publish.ts
 import {
-  CommandError as CommandError11,
+  CommandError as CommandError12,
   publishWorkingBranch,
   stackWatchObligation as stackWatchObligation5,
   workingBranchPublication
@@ -1112,9 +1174,9 @@ function failure(err, fallback) {
     summary: message,
     data: {
       error: {
-        code: err instanceof CommandError11 ? err.code ?? fallback : fallback,
+        code: err instanceof CommandError12 ? err.code ?? fallback : fallback,
         message,
-        ...err instanceof CommandError11 && err.retryAfterSeconds !== void 0 ? { retry_after_seconds: err.retryAfterSeconds } : {}
+        ...err instanceof CommandError12 && err.retryAfterSeconds !== void 0 ? { retry_after_seconds: err.retryAfterSeconds } : {}
       }
     },
     isError: true
@@ -1246,7 +1308,7 @@ async function stackStatus(stackId, cfg) {
 
 // src/tools/whoami.ts
 import {
-  CommandError as CommandError12,
+  CommandError as CommandError13,
   apiBase,
   configPath,
   getMe as getMe2,
@@ -1257,7 +1319,7 @@ async function whoami(cfg, serverVersion) {
   const resolved = cfg ?? await loadConfig7();
   const key = resolveApiKey(resolved);
   if (!key) {
-    throw new CommandError12(
+    throw new CommandError13(
       "No API key. Run `mergestorm login` (agents: `mergestorm login --start`, then `--finish`) or set MERGESTORM_API_KEY.",
       1,
       "missing_api_key"
@@ -1265,7 +1327,7 @@ async function whoami(cfg, serverVersion) {
   }
   const me = await getMe2(resolved);
   if (!me) {
-    throw new CommandError12("Live account details unavailable. Could not verify account with /me.");
+    throw new CommandError13("Live account details unavailable. Could not verify account with /me.");
   }
   const data = {
     key_prefix: me.key.prefix,
@@ -1340,7 +1402,7 @@ var MCP_STACK_WATCH_INSTRUCTIONS = [
 
 // src/server.ts
 var MCP_SERVER_NAME = "mergestorm";
-var MCP_SERVER_VERSION = "0.2.21";
+var MCP_SERVER_VERSION = "0.2.22";
 var MCP_SERVER_INSTRUCTIONS = [
   MCP_STACK_DONE_INSTRUCTIONS,
   MCP_PR_LOOP_INSTRUCTIONS,
@@ -1359,14 +1421,14 @@ function ok(payload) {
   };
 }
 function fail(err) {
-  const message = err instanceof CommandError13 ? err.code ? `Mergestorm request failed (${err.code}${err.reason ? `, reason ${err.reason}` : ""}): ${err.message}.` : err.message : err instanceof Error ? err.message : String(err);
+  const message = err instanceof CommandError14 ? err.code ? `Mergestorm request failed (${err.code}${err.reason ? `, reason ${err.reason}` : ""}): ${err.message}.` : err.message : err instanceof Error ? err.message : String(err);
   return ok({
     isError: true,
     summary: message,
     data: {
       error: {
         message: err instanceof Error ? err.message : String(err),
-        ...err instanceof CommandError13 ? {
+        ...err instanceof CommandError14 ? {
           exit_code: err.exitCode,
           ...err.code !== void 0 ? { code: err.code } : {},
           ...err.reason !== void 0 ? { reason: err.reason } : {},
@@ -1708,6 +1770,43 @@ function createMergestormMcpServer() {
       }
     }
   );
+  addTool(
+    "repo_settings_get",
+    {
+      title: "Get repository settings",
+      description: "Read the repository-level Auto patch, Auto review and Auto land values for the repositories connected to this account. Each value is true, false, or null; null means not set, so the account setting applies. Auto patch and Auto review precedence is the stack override (stack_set), then the repository value, then the account setting (settings_get). The Auto land repository value only seeds new stacks at adoption; it does not override an existing stack. Pass repo as owner/repo for one repository, or omit it for all.",
+      inputSchema: { repo: z5.string().min(3).optional() },
+      annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: true }
+    },
+    async (args) => {
+      try {
+        return ok(await repoSettingsGet(args ?? {}));
+      } catch (err) {
+        return fail(err);
+      }
+    }
+  );
+  addTool(
+    "repo_settings_set",
+    {
+      title: "Update repository settings",
+      description: "Set Auto patch (Cyclone), Auto review (Vortex) or the Auto land default for every stack and pull request in one repository connected to this account, and return the stored result. true or false sets the repository value; null clears it so the account setting applies again. A stack override (stack_set) still wins for that stack. auto_patch and auto_review apply to open stacks without an override from their next decision; nothing is cancelled or re-queued. auto_land only seeds new stacks. Only the account that connected the repository can change it. Never changes account settings.",
+      inputSchema: {
+        repo: z5.string().min(3),
+        auto_patch: z5.boolean().nullable().optional(),
+        auto_review: z5.boolean().nullable().optional(),
+        auto_land: z5.boolean().nullable().optional()
+      },
+      annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: true }
+    },
+    async (args) => {
+      try {
+        return ok(await repoSettingsSet(args ?? {}));
+      } catch (err) {
+        return fail(err);
+      }
+    }
+  );
   addTool(
     "settings_get",
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mergestorm-mcp",
-  "version": "0.2.21",
+  "version": "0.2.22",
   "description": "Mergestorm MCP server — identity, review, and read-only stack tools over stdio",
   "license": "MIT",
   "type": "module",
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.30.0",
-    "mergestorm": "0.3.54",
+    "mergestorm": "0.3.56",
     "zod": "^3.24.2"
   },
   "devDependencies": {