mergestorm 0.3.50 → 0.3.51

package/README.md

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

package/dist/stack-blockers.js

@@ -63,11 +63,14 @@ function coreReviewDoneAtHead(layer) {
     return review?.status === "done" && sameHead(review.head_sha, layer.headSha);
 }
 export const VORTEX_FINDINGS_NEED_PERSON = "Vortex findings need a person";
-function vortexChangesRequestedAtHead(layer) {
+function vortexFindingsRestAtHead(layer) {
     const review = layer.vortexReview;
     if (review && !(review.status === "done" && sameHead(review.head_sha, layer.headSha)))
         return false;
-    return layer.vortexStatus === "findings" && layer.reviewStatus === "changes_requested";
+    return layer.vortexStatus === "findings" || layer.vortexStatus === "throttled";
+}
+function vortexChangesRequestedAtHead(layer) {
+    return vortexFindingsRestAtHead(layer) && layer.reviewStatus === "changes_requested";
 }
 function cycloneHandoffAtHead(stack, layer) {
     if (sameHead(layer.cycloneHandoff?.headSha, layer.headSha))
@@ -149,9 +152,24 @@ function ciHandoffNote(stack, layer) {
     }
     return null;
 }
+const CYCLONE_HELD_FINDINGS_REASONS = [
+    "failed",
+    "left_for_human",
+    "infra_failure",
+    "pr_state_unavailable",
+    "vortex_patch_cap",
+    "patch_job_lost",
+];
+function vortexImportantFindingsHeldAtHead(layer) {
+    return vortexFindingsRestAtHead(layer) && layer.reviewStatus === "reviewed" &&
+        sameHead(layer.cycloneHandoff?.headSha, layer.headSha) &&
+        CYCLONE_HELD_FINDINGS_REASONS.includes(layer.cycloneHandoff.reason);
+}
 function vortexFindingsLeftForPerson(stack, layer) {
-    return vortexChangesRequestedAtHead(layer) && !layerAgentsBusy(layer).cyclone &&
-        cycloneHandoffAtHead(stack, layer) !== null;
+    if (layerAgentsBusy(layer).cyclone)
+        return false;
+    return vortexImportantFindingsHeldAtHead(layer) ||
+        (vortexChangesRequestedAtHead(layer) && cycloneHandoffAtHead(stack, layer) !== null);
 }
 function quotaSkippedReview(layer) {
     const review = layer.vortexReview;
@@ -776,7 +794,7 @@ export function stackRepair(stack, attention, layer, bounce, queueWait = null) {
             branch: layer.branch,
             handoff,
             findings,
-            steps: `Vortex requested changes on ${layer.branch} at ${layer.headSha ?? "its live head"} and Cyclone left them for a person${handoff ? ` (${cycloneHandoffWords(handoff)})` : ""}, so nothing will patch them and Auto land waits. Read the newest Vortex review and its inline comments (${findings}), verify each finding against ${layer.branch} at its live remote head, fix the real ones with the smallest patch, run the tests, confirm the remote head is still ${layer.headSha ?? "the head you started from"}, then an ordinary git push (no force). If a finding is wrong, tell the human; mg dismiss ${stack.owner}/${stack.repo}#${layer.prNumber} --head <sha> --review <id> dismisses that review. Do not retarget the PR base.`,
+            steps: `Vortex ${vortexImportantFindingsHeldAtHead(layer) ? "left Important findings" : "requested changes"} on ${layer.branch} at ${layer.headSha ?? "its live head"} and Cyclone left them for a person${handoff ? ` (${cycloneHandoffWords(handoff)})` : ""}, so nothing will patch them and Auto land waits. Read the newest Vortex review and its inline comments (${findings}), verify each finding against ${layer.branch} at its live remote head, fix the real ones with the smallest patch, run the tests, confirm the remote head is still ${layer.headSha ?? "the head you started from"}, then an ordinary git push (no force). If a finding is wrong, tell the human; mg dismiss ${stack.owner}/${stack.repo}#${layer.prNumber} --head <sha> --review <id> dismisses that review. Do not retarget the PR base.`,
         };
     }
     if (reason === "ci_failed" || attention.bounceKind === "ci_failure") {

package/dist/ui/banner.js

@@ -188,6 +188,9 @@ const WHATS_NEW = {
     "0.3.50": [
         "Agent sign-in: login --start, --finish",
     ],
+    "0.3.51": [
+        "Watch names findings held on a throttled head",
+    ],
 };
 function densityFromVariant(variant) {
     if (variant === "mini" || variant === "nano")

package/package.json

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