mergestorm 0.3.31 → 0.3.33

package/README.md

@@ -45,7 +45,7 @@ On a TTY, bare `mergestorm` (or `mergestorm shell`) opens a branded REPL: a comp
 
 ```
 ╭──────────────────────────────────────────────────────────────────────────────╮
-│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.31                                             │
+│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.33                                             │
 │ ▀▀▀▀▀▀▀▀▀     ● msk_live_… · maelstrom                                       │
 │  ▀▀▀▀▀▀       [████████░░░░░░░░░░░░░░░░░░░░░░] 25% used                      │
 │   ▝▀▀▀▀▀      local reviews + stacked PRs · mergestorm.ai                    │

package/dist/api.js

@@ -570,6 +570,12 @@ async function queueMutation(route, failLabel, cfg) {
         }
         throw new CommandError("Merge queue API is not available on this server yet. Deploy the API update or use the dashboard.");
     }
+    if (status === 409) {
+        const refusal = body;
+        if (refusal?.error === "conflict_unchanged" && typeof refusal.message === "string") {
+            throw new CommandError(refusal.message);
+        }
+    }
     if (status < 200 || status >= 300) {
         throw new CommandError(`${failLabel} (HTTP ${status}): ${JSON.stringify(body)}`);
     }

package/dist/stack-blockers.js

@@ -76,6 +76,11 @@ function seamGateBlocker(stack, layer) {
         return SEAM_REVIEW_NOT_RUNNING;
     return null;
 }
+function headChecksAllGreen(layer) {
+    const checks = layer.checks;
+    return layer.ciStatus === "success" && !!checks && checks.total > 0 &&
+        checks.failure === 0 && checks.pending === 0 && checks.success > 0;
+}
 /** Shared live-fact precedence; bounce history is only passed for the candidate. */
 function layerAttention(stack, layer, queue, cursor) {
     const none = { blocker: null, bounceKind: null };
@@ -138,6 +143,8 @@ function layerAttention(stack, layer, queue, cursor) {
     if (!sameHead(bounce.bounceDetail?.headSha ?? bounce.verifyHeadSha, layer.headSha) ||
         (bounce.bounceDetail?.prNumber != null && bounce.bounceDetail.prNumber !== layer.prNumber))
         return none;
+    if (kind === "ci_failure" && !bounce.bounceDetail?.batch && headChecksAllGreen(layer))
+        return none;
     return { blocker: mergeQueueBounceLabel(bounce), bounceKind: kind, bounce };
 }
 const AUTO_LAND_DISARMING_BOUNCE_KINDS = ["merge_failed", "gh_error", "ci_timeout"];

package/dist/stack-dto.d.ts

@@ -390,6 +390,8 @@ export type MergeQueueBounceDetail = {
     conflictBranch?: string;
     conflictDetail?: string;
     conflictPaths?: string[];
+    baseBranch?: string;
+    baseSha?: string;
     message?: string;
     warning?: string;
     batch?: MergeQueueBounceBatch;

package/dist/ui/banner.js

@@ -126,6 +126,12 @@ const WHATS_NEW = {
     "0.3.31": [
         "every stack Next line offers mg stack watch",
     ],
+    "0.3.32": [
+        "queue add explains a held merge conflict",
+    ],
+    "0.3.33": [
+        "stack watch clears a CI failure rerun green",
+    ],
 };
 function densityFromVariant(variant) {
     if (variant === "mini" || variant === "nano")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mergestorm",
-  "version": "0.3.31",
+  "version": "0.3.33",
   "description": "Mergestorm CLI (mg) — local reviews & stacked PRs. MIT; build from source: https://github.com/marginsystems/mergestorm-cli",
   "license": "MIT",
   "type": "module",