mergestorm-mcp 0.2.14 → 0.2.16

package/README.md

@@ -18,9 +18,9 @@ Every tool declares MCP `annotations` for read-only access, destructive changes,
 
 The stack tools expose reads plus one scoped policy write:
 
-- `stack_adopt({ owner, repo, pr_number, auto_land?, auto_review?, auto_patch? })` adopts an open PR chain with optional per-stack policy. Omitted policy does not force Cyclone off. `auto_review` and `auto_patch` accept `true`, `false`, or `null`; `null` clears the override. Read `stack_status` with the returned `result.stack.id` to verify policy and Cyclone ownership. Adoption needs the Mergestorm Surge GitHub App on the repository (Cyclone is the auto-patch App). A refusal keeps the code `cyclone_not_connected` or `cyclone_not_installed`; its message, and `error.reason` starting with `surge_` when Surge is the one to install, say which App is missing.
+- `stack_adopt({ owner, repo, pr_number, auto_land?, auto_review?, auto_patch?, auto_resolve_conflicts?, auto_fix_ci? })` adopts an open PR chain with optional per-stack policy. Omitted policy does not force Cyclone off. `auto_review`, `auto_patch`, `auto_resolve_conflicts`, and `auto_fix_ci` accept `true`, `false`, or `null`; `null` clears the override. Read `stack_status` with the returned `result.stack.id` to verify policy and Cyclone ownership. Adoption needs the Mergestorm Surge GitHub App on the repository (Cyclone is the auto-patch App). A refusal keeps the code `cyclone_not_connected` or `cyclone_not_installed`; its message, and `error.reason` starting with `surge_` when Surge is the one to install, say which App is missing.
 - `stack_list` returns the current API key owner's registered stacks.
-- `stack_set({ stack_id, auto_land?, auto_review?, auto_patch? })` sets per-stack policy on one owned stack. `auto_land` flips Auto land. `auto_review` and `auto_patch` pin Vortex auto-review or Cyclone auto-patch for that stack in either direction (`true` or `false`); `null` clears the pin so the stack follows the account setting. Pass at least one key. Account settings are never changed here.
+- `stack_set({ stack_id, auto_land?, auto_review?, auto_patch?, auto_resolve_conflicts?, auto_fix_ci? })` sets per-stack policy on one owned stack. `auto_land` flips Auto land. `auto_review`, `auto_patch`, `auto_resolve_conflicts`, and `auto_fix_ci` pin Vortex auto-review, Cyclone auto-patch, Auto-resolve merge conflicts, or Auto-fix failing CI for that stack in either direction (`true` or `false`); `null` clears the pin so the stack follows the account setting. Pass at least one key. Account settings are never changed here.
 - `stack_status({ stack_id })` returns one owned stack with enriched checks and agent state, plus `attention`, `issues`, and `currentCandidate` from the same blocker rules as `stack_wait`, read against that stack's own merge queue. It returns a structured `stack_not_found` or `rate_limited` error.
 - `stack_wait({ stack_id, timeout_s?, enrolled_head_sha?, after_finished_at?, bounce_id? })` waits for a stack or queue state change and returns the latest snapshots. `timeout_s: 0` returns one snapshot; a positive timeout after a snapshot with no attention returns the current `waiting` or `in_progress` status with selectors to use for the next call. An unread deadline returns `failed`. While Cyclone or Vortex is still working on the blocked PR, `stack_wait` and `stack_status` return `in_progress` instead of `attention`, with `busy[]` naming the PR, blocker, and agent, and `agents` carrying that PR's `vortexStatus`, `cycloneStatus`, `vortexReview`, and busy flags. A nonempty `busy[]` means wait. A queued Vortex run holds for at most 15 minutes, `seam_pending` alone does not hold, and reviewing or patching holds until the run finishes or its lease or check run is cleared. A blocker no agent run clears (a merge conflict vs the live parent, a restack `Conflict` or `Restack failed`, a Draft PR, a seam review pending with no review running, "Seam review stuck in reviewing, no review running", "Seam re-review pending, no review running", "Seam verdict is for an older head, no review running", or a review skipped for review quota) is still named during that `in_progress`, in `blocker`, `prNumber`, `headSha`, and `issues[]`, with `actAfter: "agents_idle"` and `waitingOn` listing the busy agents; act when a snapshot after the agents finish returns `attention`, re-reading the blocker then. For the three stuck-seam blockers, `repair` has kind `seam_review_stuck`: do not patch or push; tell the human to click Continue, which re-queues the seam review at the live head. `repair` is included when another concrete repair hint is available. Blockers the agents can change keep `blocker` and `actAfter` null. If a hold looks stuck, refresh `stack_status` and tell the human.
 

package/dist/index.js

@@ -201,8 +201,9 @@ var stackWaitSchema = {
 function repairSummary(repair) {
   if (!repair) return "";
   const files = "files" in repair && repair.files.length ? ` Files: ${repair.files.join(", ")}.` : "";
+  const note = "note" in repair && repair.note ? ` ${repair.note}` : "";
   return `
-Repair #${repair.prNumber} (${repair.kind}).${files} ${repair.steps}`;
+Repair #${repair.prNumber} (${repair.kind}).${files} ${repair.steps}${note}`;
 }
 function withWatchText(watch, body) {
   return `${watch.message}
@@ -761,10 +762,15 @@ import {
 } from "mergestorm/client";
 function settingsSummary(settings) {
   const autoPatch = settings.auto_patch_enabled ? "on" : "off";
+  const automations = [
+    settings.auto_resolve_conflicts_enabled ? "auto_resolve_conflicts on" : null,
+    settings.auto_fix_ci_enabled ? "auto_fix_ci on" : null
+  ].filter((label) => label !== null);
+  const autoPatchLabel = [`auto_patch ${autoPatch}`, ...automations].join(" \xB7 ");
   const cyclone = settings.cyclone_connected ? "Cyclone connected" : "Cyclone not connected";
-  if (typeof settings.stacks_ready !== "boolean") return `auto_patch ${autoPatch} \xB7 ${cyclone}`;
+  if (typeof settings.stacks_ready !== "boolean") return `${autoPatchLabel} \xB7 ${cyclone}`;
   const stacks = settings.stacks_ready ? "stacks, merge queue and Auto land ready" : "stacks, merge queue and Auto land not ready (install Mergestorm Surge)";
-  return `auto_patch ${autoPatch} \xB7 ${cyclone} (auto patch) \xB7 ${stacks}`;
+  return `${autoPatchLabel} \xB7 ${cyclone} (auto patch) \xB7 ${stacks}`;
 }
 async function settingsGet(cfg) {
   const settings = await getSettings(cfg);
@@ -856,18 +862,22 @@ function stackSetPatch(input) {
   if (typeof input.auto_land === "boolean") patch.autoEnqueueWhenReady = input.auto_land;
   if (input.auto_review !== void 0) patch.autoReviewOverride = input.auto_review;
   if (input.auto_patch !== void 0) patch.autoPatchOverride = input.auto_patch;
+  if (input.auto_resolve_conflicts !== void 0) {
+    patch.autoResolveConflictsOverride = input.auto_resolve_conflicts;
+  }
+  if (input.auto_fix_ci !== void 0) patch.autoFixCiOverride = input.auto_fix_ci;
   return patch;
 }
 async function stackSet(stackId, input, cfg) {
   const patch = stackSetPatch(input);
   if (Object.keys(patch).length === 0) {
     return {
-      summary: "stack_set needs at least one of auto_land, auto_review, auto_patch",
+      summary: "stack_set needs at least one of auto_land, auto_review, auto_patch, auto_resolve_conflicts, auto_fix_ci",
       isError: true,
       data: {
         error: {
           code: "invalid_input",
-          message: "Pass at least one of auto_land, auto_review, auto_patch.",
+          message: "Pass at least one of auto_land, auto_review, auto_patch, auto_resolve_conflicts, auto_fix_ci.",
           stack_id: stackId
         }
       }
@@ -884,6 +894,12 @@ async function stackSet(stackId, input, cfg) {
   if (input.auto_patch !== void 0) {
     parts.push(`auto-patch ${triWord(input.auto_patch)}`);
   }
+  if (input.auto_resolve_conflicts !== void 0) {
+    parts.push(`auto-resolve-conflicts ${triWord(input.auto_resolve_conflicts)}`);
+  }
+  if (input.auto_fix_ci !== void 0) {
+    parts.push(`auto-fix-ci ${triWord(input.auto_fix_ci)}`);
+  }
   const watch = stackWatchObligation3({ stackId, terminal: null, unread: true, freshCursor: true });
   return {
     summary: withWatchText(watch, `${parts.join(", ")} for stack ${stackId}`),
@@ -892,6 +908,8 @@ async function stackSet(stackId, input, cfg) {
       ...typeof input.auto_land === "boolean" ? { auto_land: input.auto_land } : {},
       ...input.auto_review !== void 0 ? { auto_review: input.auto_review } : {},
       ...input.auto_patch !== void 0 ? { auto_patch: input.auto_patch } : {},
+      ...input.auto_resolve_conflicts !== void 0 ? { auto_resolve_conflicts: input.auto_resolve_conflicts } : {},
+      ...input.auto_fix_ci !== void 0 ? { auto_fix_ci: input.auto_fix_ci } : {},
       result,
       watch
     }
@@ -905,7 +923,9 @@ var stackAdoptSchema = {
   pr_number: z2.number().int().min(1),
   auto_land: z2.boolean().optional(),
   auto_review: z2.boolean().nullable().optional(),
-  auto_patch: z2.boolean().nullable().optional()
+  auto_patch: z2.boolean().nullable().optional(),
+  auto_resolve_conflicts: z2.boolean().nullable().optional(),
+  auto_fix_ci: z2.boolean().nullable().optional()
 };
 var inputSchema = z2.object(stackAdoptSchema);
 async function stackAdopt(input, cfg) {
@@ -972,6 +992,12 @@ function stackSummary(stack, entries = []) {
   if (typeof stack.autoPatchOverride === "boolean") {
     overrides.push(`auto-patch ${stack.autoPatchOverride ? "on" : "off"}`);
   }
+  if (typeof stack.autoResolveConflictsOverride === "boolean") {
+    overrides.push(`auto-resolve-conflicts ${stack.autoResolveConflictsOverride ? "on" : "off"}`);
+  }
+  if (typeof stack.autoFixCiOverride === "boolean") {
+    overrides.push(`auto-fix-ci ${stack.autoFixCiOverride ? "on" : "off"}`);
+  }
   if (stack.cycloneOwnerMatch) {
     overrides.push(`cyclone-owner ${stack.cycloneOwnerMatch}`);
   }
@@ -1160,14 +1186,15 @@ var MCP_STACK_WATCH_INSTRUCTIONS = [
   `- While the stack has a live merge queue entry, stack_wait carries queueWait (the entry's wait reason, how long it has been held, and the stack queued ahead of it) and the status line names it. The watch returns attention, blocker "Merge queue stuck: ..." and repair kind queue_stalled, when the entry (or the entry ahead of it) has been held for 45 minutes without landing or bouncing, or has sat queued for 45 minutes with nothing working on it or ahead of it.`,
   '- When no Vortex run works on the head and its review was skipped because auto-review is off (blocker "Vortex auto-review is off, so this head was not reviewed") or because billing could not be confirmed ("Vortex skipped this head: it could not confirm billing"), or it covered only part of the PR ("Vortex reviewed only part of this PR"), the watch returns attention at once with repair kind vortex_skipped. Do not patch for it; the repair names the mention or setting that gets the head reviewed.',
   '- A live-head Vortex request_changes handoff returns attention with blocker "Vortex findings need a person" and repair kind vortex_findings; verify the review and inline findings against the live head before repair.',
-  "- Cyclone patches a land PR when auto-patch is on for that stack (its override, else the account setting); otherwise the watching agent fixes the land PR's blocker on mg-stack-<n>.",
+  "- Cyclone, with auto-patch on, patches only Vortex review findings (Core and seam, on any layer, the land PR included). It does not fix merge conflicts, restack conflicts, failing CI, or any other landing blocker by itself; the watching agent fixes those, whatever the auto-patch setting, and does not turn auto-patch off to do it. With auto-resolve conflicts on for the stack, Cyclone resolves a layer conflict itself (never the land PR's conflict with main): while busy[] shows Cyclone, wait, and fix the conflict only after its handoff, when the watch returns attention. With auto-fix CI on for the stack, Cyclone fixes a settled red check on a layer itself (never the land PR), or asks Surge for one re-run of a flaky one: while busy[] shows Cyclone, wait, and fix the failure only after its handoff, when the watch returns attention.",
+  "- Cyclone patches Vortex findings on a land PR when auto-patch is on for that stack (its override, else the account setting); every other land PR blocker, a conflict with main or failing CI included, is fixed by the watching agent on mg-stack-<n>.",
   '- More states the watch names: a Vortex review skipped because the PR author is on the ignored authors list or because reviews are turned off for the repository is attention at once with repair kind vortex_skipped; a Vortex retry that is scheduled ("Vortex hit a temporary error on this head and will retry by itself") is a wait listed in issues[], never attention; "Review failed" carries repair kind vortex_failed (comment @mergestorm-vortex review or push a new commit; if it fails again tell the human); a PR open on mg-stack-N that is not a layer of the stack is attention at once, blocker "The land PR cannot be queued: ...", repair kind members_remaining (do not patch or push; close, retarget or adopt that PR).',
   "- Use the mergestorm-bounce-watch skill for the fix-then-watch policy."
 ].join("\n");
 
 // src/server.ts
 var MCP_SERVER_NAME = "mergestorm";
-var MCP_SERVER_VERSION = "0.2.14";
+var MCP_SERVER_VERSION = "0.2.16";
 var MCP_SERVER_INSTRUCTIONS = [
   MCP_STACK_DONE_INSTRUCTIONS,
   MCP_PR_LOOP_INSTRUCTIONS,
@@ -1376,7 +1403,7 @@ function createMergestormMcpServer() {
     "stack_adopt",
     {
       title: "Adopt PR stack",
-      description: "Adopt an open GitHub PR chain into a Mergestorm stack. auto_land is boolean; auto_review and auto_patch accept true, false, or null, where null clears the override. Omitted auto_land seeds from auto_land_default; omitted auto_review and auto_patch overrides are not seeded. Never changes account settings. Adoption needs the Mergestorm Surge GitHub App on the repository. Stacks, the merge queue and Auto land run through that App; Cyclone is the auto-patch App. Without it the API returns cyclone_not_connected or cyclone_not_installed; the message, and error.reason starting with surge_ when Surge is the one to install, say which App is missing \u2014 do not retry, tell the human what the message says. Read stack_status with result.stack.id afterward to verify policy and Cyclone ownership. With 2+ PRs, adopt moves the bottom PR's GitHub base to mg-stack-<n> and parks PR3+ on an mg-park-* freeze; a 1-PR stack stays on main. Leave those bases. Never retarget the bottom back to main." + STACK_WATCH_RESULT_NOTE,
+      description: "Adopt an open GitHub PR chain into a Mergestorm stack. auto_land is boolean; auto_review, auto_patch, auto_resolve_conflicts, and auto_fix_ci accept true, false, or null, where null clears the override. Omitted auto_land seeds from auto_land_default; omitted overrides are not seeded. Never changes account settings. Adoption needs the Mergestorm Surge GitHub App on the repository. Stacks, the merge queue and Auto land run through that App; Cyclone is the auto-patch App. Without it the API returns cyclone_not_connected or cyclone_not_installed; the message, and error.reason starting with surge_ when Surge is the one to install, say which App is missing \u2014 do not retry, tell the human what the message says. Read stack_status with result.stack.id afterward to verify policy and Cyclone ownership. With 2+ PRs, adopt moves the bottom PR's GitHub base to mg-stack-<n> and parks PR3+ on an mg-park-* freeze; a 1-PR stack stays on main. Leave those bases. Never retarget the bottom back to main." + STACK_WATCH_RESULT_NOTE,
       inputSchema: stackAdoptSchema,
       annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: true }
     },
@@ -1407,22 +1434,26 @@ function createMergestormMcpServer() {
     "stack_set",
     {
       title: "Set stack policy",
-      description: "Set per-stack automation on one owned Mergestorm stack: auto_land arms or disarms Auto land; auto_review and auto_patch pin Vortex auto-review or Cyclone auto-patch for this stack only (true or false), and null clears the pin so the stack follows the account setting again. Pass at least one key. Never changes account settings." + STACK_WATCH_RESULT_NOTE,
+      description: "Set per-stack automation on one owned Mergestorm stack: auto_land arms or disarms Auto land; auto_review, auto_patch, auto_resolve_conflicts, and auto_fix_ci pin Vortex auto-review, Cyclone auto-patch, Auto-resolve merge conflicts, or Auto-fix failing CI for this stack only (true or false), and null clears the pin so the stack follows the account setting again. Pass at least one key. Never changes account settings." + STACK_WATCH_RESULT_NOTE,
       inputSchema: {
         stack_id: z3.string().min(1),
         auto_land: z3.boolean().optional(),
         auto_review: z3.boolean().nullable().optional(),
-        auto_patch: z3.boolean().nullable().optional()
+        auto_patch: z3.boolean().nullable().optional(),
+        auto_resolve_conflicts: z3.boolean().nullable().optional(),
+        auto_fix_ci: z3.boolean().nullable().optional()
       },
       annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: true, openWorldHint: true }
     },
-    async ({ stack_id, auto_land, auto_review, auto_patch }) => {
+    async ({ stack_id, auto_land, auto_review, auto_patch, auto_resolve_conflicts, auto_fix_ci }) => {
       try {
         return ok(
           await stackSet(stack_id, {
             ...auto_land !== void 0 ? { auto_land } : {},
             ...auto_review !== void 0 ? { auto_review } : {},
-            ...auto_patch !== void 0 ? { auto_patch } : {}
+            ...auto_patch !== void 0 ? { auto_patch } : {},
+            ...auto_resolve_conflicts !== void 0 ? { auto_resolve_conflicts } : {},
+            ...auto_fix_ci !== void 0 ? { auto_fix_ci } : {}
           })
         );
       } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mergestorm-mcp",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "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.42",
+    "mergestorm": "0.3.45",
     "zod": "^3.24.2"
   },
   "devDependencies": {