mergestorm 0.3.47 → 0.3.48

package/README.md

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

package/dist/stack-blockers.d.ts

@@ -165,6 +165,8 @@ export declare const SEAM_VERDICT_STALE = "Seam verdict is for an older head, no
 export declare const VORTEX_FINDINGS_NEED_PERSON = "Vortex findings need a person";
 export declare function autoResolveActive(stack: StackDto, layer: StackLayerDto): boolean;
 export declare function autoFixCiActive(stack: StackDto, layer: StackLayerDto): boolean;
+export declare const CI_DID_NOT_FINISH_BLOCKER = "CI did not finish \u2014 left for a person";
+export declare function pendingCiLeftForPerson(stack: StackDto, layer: StackLayerDto): boolean;
 export declare const VORTEX_AUTO_REVIEW_OFF = "Vortex auto-review is off, so this head was not reviewed";
 export declare const VORTEX_BILLING_SKIPPED = "Vortex skipped this head: it could not confirm billing";
 export declare const VORTEX_REVIEW_INCOMPLETE = "Vortex reviewed only part of this PR";

package/dist/stack-blockers.js

@@ -131,6 +131,11 @@ export function autoFixCiActive(stack, layer) {
     return !stack.cycloneCiOff && !isLandPrLayer(stack, layer) &&
         !sameHead(layer.cycloneCiHandoff?.headSha, layer.headSha);
 }
+export const CI_DID_NOT_FINISH_BLOCKER = "CI did not finish — left for a person";
+export function pendingCiLeftForPerson(stack, layer) {
+    return layer.ciStatus === "pending" && !isLandPrLayer(stack, layer) &&
+        sameHead(layer.cycloneCiHandoff?.headSha, layer.headSha);
+}
 function ciHandoffNote(stack, layer) {
     if (isLandPrLayer(stack, layer))
         return null;
@@ -272,6 +277,8 @@ function layerAttention(stack, layer, queue, cursor) {
             const name = layer.checks?.failingName?.trim();
             return hardBlock(`CI failed${name ? ` — ${name}` : ""}`, "ci_failed");
         }
+        if (pendingCiLeftForPerson(stack, layer))
+            return hardBlock(CI_DID_NOT_FINISH_BLOCKER, "ci_failed");
         if (layer.vortexStatus === "failed" && !vortexRetryScheduled(layer) &&
             (!layer.vortexReview?.head_sha || sameHead(layer.vortexReview.head_sha, layer.headSha))) {
             return hardBlock(VORTEX_REVIEW_FAILED, "vortex_failed");
@@ -780,7 +787,9 @@ export function stackRepair(stack, attention, layer, bounce, queueWait = null) {
             headSha: layer.headSha ?? null,
             branch: layer.branch,
             failingCheck,
-            steps: `Read the failing ${failingCheck ? `check ${failingCheck}` : "checks"} on ${layer.branch} (gh run list --branch ${layer.branch}, then gh run view <run-id> --log-failed), fix it on ${layer.branch} with the smallest patch, run that check locally, confirm the remote head is still ${layer.headSha ?? "the head you started from"}, then an ordinary git push. Do not retarget the PR base.`,
+            steps: pendingCiLeftForPerson(stack, layer)
+                ? `CI on ${layer.branch} at ${layer.headSha ?? "its live head"} ended cancelled or interrupted and did not finish after Cyclone's one re-run. Find the cancelled run (gh run list --branch ${layer.branch}), read why it stopped (gh run view <run-id>), and re-run it (gh run rerun <run-id>) if it was a runner or infrastructure stop. If the job itself cancels, fix that on ${layer.branch} and push. Do not retarget the PR base.`
+                : `Read the failing ${failingCheck ? `check ${failingCheck}` : "checks"} on ${layer.branch} (gh run list --branch ${layer.branch}, then gh run view <run-id> --log-failed), fix it on ${layer.branch} with the smallest patch, run that check locally, confirm the remote head is still ${layer.headSha ?? "the head you started from"}, then an ordinary git push. Do not retarget the PR base.`,
             ...(note ? { note } : {}),
         };
     }

package/dist/stack-dto.d.ts

@@ -427,12 +427,25 @@ export type MergeQueueBounceBatch = {
     withPrNumbers: number[];
 };
 export type MergeQueueBatchState = "verifying" | "landing" | "landed" | "stopped" | "bounced" | "abandoned";
+export type MergeQueueBatchCiCheckState = "passed" | "skipped" | "failed" | "running" | "queued";
+export type MergeQueueBatchCiCheckDto = {
+    name: string;
+    state: MergeQueueBatchCiCheckState;
+    startedAt: string | null;
+    completedAt: string | null;
+};
+export type MergeQueueBatchCiDto = {
+    sha: string;
+    observedAt: string;
+    checks: MergeQueueBatchCiCheckDto[];
+};
 export type MergeQueueEntryBatchDto = {
     id: string;
     position: number;
     size: number;
     state: MergeQueueBatchState;
     landedCount: number;
+    ci?: MergeQueueBatchCiDto | null;
 };
 export type MergeQueueAheadDto = {
     stackId: string | null;

package/dist/ui/banner.js

@@ -179,6 +179,9 @@ const WHATS_NEW = {
     "0.3.47": [
         "New stack PRs are adopted on Work at submit",
     ],
+    "0.3.48": [
+        "Watch names CI Cyclone could not finish",
+    ],
 };
 function densityFromVariant(variant) {
     if (variant === "mini" || variant === "nano")

package/package.json

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