mergestorm-mcp 0.1.8 → 0.1.10

package/dist/index.js

@@ -592,6 +592,17 @@ function settingsPatchFromArgs(args) {
     const value = args[key];
     if (value === void 0) continue;
     const row = BEARER_SETTINGS.find((row2) => row2.key === key);
+    if ("kind" in row && row.kind === "seconds") {
+      if (typeof value !== "number" || !Number.isInteger(value) || value < row.min || value > row.max) {
+        throw new CommandError8(
+          `${key} takes a whole number of seconds from ${row.min} through ${row.max}.`,
+          2,
+          "usage"
+        );
+      }
+      Object.assign(patch, { [key]: value });
+      continue;
+    }
     if ("kind" in row) {
       const valid = row.kind === "logins" ? Array.isArray(value) && value.every((login) => typeof login === "string") : typeof value === "string" && row.values.includes(value);
       if (!valid) throw new CommandError8(`Invalid value for ${key}.`, 2, "usage");
@@ -791,6 +802,17 @@ var stackWaitSchema = {
   after_finished_at: z2.string().nullable().optional(),
   bounce_id: z2.string().nullable().optional()
 };
+function stackWaitSummary(envelope) {
+  const base = `Stack ${envelope.stackId} \xB7 ${envelope.status}${stackBlockersSummary2(envelope.blocker && envelope.prNumber != null ? { prNumber: envelope.prNumber, blocker: envelope.blocker } : null, envelope.issues)}${envelope.assessment === "unavailable" ? " \xB7 assessment unavailable" : ""}`;
+  if (envelope.status !== "waiting" && envelope.status !== "in_progress") return base;
+  const selectors = [
+    `stack_id ${JSON.stringify(envelope.cursor.stackId)}`,
+    `enrolled_head_sha ${JSON.stringify(envelope.cursor.enrolledHeadSha)}`,
+    ...envelope.cursor.afterFinishedAt !== void 0 ? [`after_finished_at ${JSON.stringify(envelope.cursor.afterFinishedAt)}`] : [],
+    ...envelope.cursor.bounceId !== void 0 ? [`bounce_id ${JSON.stringify(envelope.cursor.bounceId)}`] : []
+  ];
+  return `${base} \xB7 watch not finished: call stack_wait again with timeout_s 45 and the same cursor: ${selectors.join(", ")}`;
+}
 async function stackWait(input, cfg, deps = {}) {
   const args = z2.object(stackWaitSchema).parse(input);
   const cursor = args.enrolled_head_sha !== void 0 || args.after_finished_at !== void 0 || args.bounce_id !== void 0 ? {
@@ -809,7 +831,7 @@ async function stackWait(input, cfg, deps = {}) {
   } catch (err) {
     if (err instanceof StackWatchError) {
       return {
-        summary: `Stack ${err.lastEnvelope.stackId} \xB7 ${err.lastEnvelope.status}${stackBlockersSummary2(err.lastEnvelope.blocker && err.lastEnvelope.prNumber != null ? { prNumber: err.lastEnvelope.prNumber, blocker: err.lastEnvelope.blocker } : null, err.lastEnvelope.issues)}${err.lastEnvelope.assessment === "unavailable" ? " \xB7 assessment unavailable" : ""}`,
+        summary: stackWaitSummary(err.lastEnvelope),
         data: {
           ...err.lastEnvelope,
           ...err.retryAfterSeconds !== void 0 ? { retry_after_seconds: err.retryAfterSeconds } : {}
@@ -821,7 +843,7 @@ async function stackWait(input, cfg, deps = {}) {
     envelope = err.lastEnvelope;
   }
   return {
-    summary: `Stack ${envelope.stackId} \xB7 ${envelope.status}${stackBlockersSummary2(envelope.blocker && envelope.prNumber != null ? { prNumber: envelope.prNumber, blocker: envelope.blocker } : null, envelope.issues)}${envelope.assessment === "unavailable" ? " \xB7 assessment unavailable" : ""}`,
+    summary: stackWaitSummary(envelope),
     data: envelope
   };
 }
@@ -923,6 +945,13 @@ var MCP_PR_LOOP_INSTRUCTIONS = [
   `- If you skip a finding (not reproducible, policy fork, or needs a human), post a public GitHub PR comment before you stop. First line must be: ${MCP_FINDING_DISMISS_MARKER}. Then one line per skipped finding (path, severity, why).`,
   "- Do not prefix that comment with cyclone-outcome: (reserved)."
 ].join("\n");
+var MCP_STACK_BASE_INSTRUCTIONS = [
+  "Stack PR bases (Mergestorm sets these; leave them):",
+  "- Stack of 2+ PRs: after adopt (stack_adopt, mg stack adopt, or mg stack submit) the bottom PR's GitHub base is the owned trunk mg-stack-<n>, not main. That is correct. Layer 2 is based on layer 1; layer 3+ on the mg-park-* freeze; the git parent of layer 2+ is still the layer below. A 1-PR stack stays on main and gets no mg-stack-<n>.",
+  "- Never retarget a stack PR's GitHub base (gh pr edit --base, a REST base change, or the UI). Moving the bottom to main makes Mergestorm abandon the stack's review unit; setting mg-stack-<n> again does not restore it. If a base was already moved, stop and tell the human; do not run stack land or re-adopt to repair it.",
+  "- mg-stack-<n> is the bottom PR's live parent: merging it into the bottom branch is that PR's conflict repair (bounce-watch rules). Never push to mg-stack-<n>, and never rebase or merge layer 2+ onto it or onto main. mg-park-* is never a merge or rebase target.",
+  "- mg stack submit prints the base each PR opened with; the bottom moves to mg-stack-<n> right after. stack_status trunkBranch is the current trunk."
+].join("\n");
 var MCP_STACK_WATCH_INSTRUCTIONS = [
   "Stack-watch facts (mergestorm.stack_watch/v1):",
   "- waiting with nonempty issues[] is not idle; in_progress can also carry issues[].",
@@ -936,7 +965,7 @@ var MCP_STACK_WATCH_INSTRUCTIONS = [
 
 // src/server.ts
 var MCP_SERVER_NAME = "mergestorm";
-var MCP_SERVER_VERSION = "0.1.8";
+var MCP_SERVER_VERSION = "0.1.10";
 function stripNulls(value) {
   if (Array.isArray(value)) {
     return value.map((item) => stripNulls(item));
@@ -972,6 +1001,8 @@ function createMergestormMcpServer() {
     },
     { instructions: `${MCP_PR_LOOP_INSTRUCTIONS}
 
+${MCP_STACK_BASE_INSTRUCTIONS}
+
 ${MCP_STACK_WATCH_INSTRUCTIONS}` }
   );
   const addTool = server2.registerTool.bind(server2);
@@ -1148,7 +1179,7 @@ ${MCP_STACK_WATCH_INSTRUCTIONS}` }
     "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 requires a Cyclone GitHub App install; without it the API returns cyclone_not_connected \u2014 do not retry, tell the human. Read stack_status with result.stack.id afterward to verify policy and Cyclone ownership.",
+      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 requires a Cyclone GitHub App install; without it the API returns cyclone_not_connected \u2014 do not retry, tell the human. 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.",
       inputSchema: stackAdoptSchema
     },
     async (args) => {
@@ -1203,7 +1234,7 @@ ${MCP_STACK_WATCH_INSTRUCTIONS}` }
     "stack_status",
     {
       title: "Get stack status",
-      description: "Fetch one owned Mergestorm 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. This tool is read-only.",
+      description: "Fetch one owned Mergestorm 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. This tool is read-only. trunkBranch is mg-stack-<n> for an adopted 2+ PR stack and matches the bottom open PR's GitHub base; an mg-park-* parentBranch is a freeze. Neither is drift to fix.",
       inputSchema: {
         stack_id: z3.string().min(1)
       }
@@ -1220,7 +1251,7 @@ ${MCP_STACK_WATCH_INSTRUCTIONS}` }
     "stack_wait",
     {
       title: "Wait for stack attention",
-      description: "Wait for a stack to need attention. Returns a mergestorm.stack_watch/v1 envelope; timeout_s: 0 returns one snapshot and timeout_s: 1-45 waits up to that many seconds, returning the current status (waiting or in_progress) if a snapshot was read and no attention is found. A timeout with either of those statuses is not a failure. A timeout of failed means no assessment was produced. This tool is read-only.",
+      description: "Wait for a stack to need attention. Returns a mergestorm.stack_watch/v1 envelope; timeout_s: 0 returns one snapshot and timeout_s: 1-45 waits up to that many seconds, returning the current status (waiting or in_progress) if a snapshot was read and no attention is found. A timeout with either of those statuses is not a failure; waiting and in_progress end this slice, and the next call is stack_wait again with the same cursor. A timeout of failed means no assessment was produced. This tool is read-only. Attention never calls for changing a PR's GitHub base.",
       inputSchema: stackWaitSchema
     },
     async (args, extra) => {
@@ -1253,7 +1284,7 @@ ${MCP_STACK_WATCH_INSTRUCTIONS}` }
     "settings_get",
     {
       title: "Get settings",
-      description: "Read the Bearer /api/v1/settings toggles, including auto_patch_enabled and cyclone_connected. This tool is read-only."
+      description: "Read the Bearer /api/v1/settings toggles, including auto_patch_enabled, auto_land_settle_seconds (how long Auto land waits before queueing), and cyclone_connected. This tool is read-only."
     },
     async () => {
       try {
@@ -1267,12 +1298,12 @@ ${MCP_STACK_WATCH_INSTRUCTIONS}` }
     "settings_set",
     {
       title: "Update settings",
-      description: "Update writable Bearer /api/v1/settings values and return the stored result. At least one key is required. cyclone_connected and github_connected are read-only and cannot be set.",
+      description: "Update writable Bearer /api/v1/settings values and return the stored result. At least one key is required. auto_land_settle_seconds is a whole number of seconds from 15 through 300; it applies to settle clocks that start after the write. cyclone_connected and github_connected are read-only and cannot be set.",
       inputSchema: {
         ...Object.fromEntries(
           BEARER_SETTINGS2.map((row) => [
             row.key,
-            ("kind" in row ? row.kind === "logins" ? z3.array(z3.string()) : z3.enum(row.values) : z3.boolean()).optional()
+            ("kind" in row ? row.kind === "logins" ? z3.array(z3.string()) : row.kind === "seconds" ? z3.number().int().min(row.min).max(row.max) : z3.enum(row.values) : z3.boolean()).optional()
           ])
         ),
         // Preserve these args so the handler rejects them even alongside a writable key.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mergestorm-mcp",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "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.22",
+    "mergestorm": "0.3.24",
     "zod": "^3.24.2"
   },
   "devDependencies": {