mergestorm 0.3.52 → 0.3.53

package/README.md

@@ -45,12 +45,12 @@ On a TTY, bare `mergestorm` (or `mergestorm shell`) opens a branded REPL: a comp
 
 ```
 ╭──────────────────────────────────────────────────────────────────────────────╮
-│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.52                                             │
+│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.53                                             │
 │ ▀▀▀▀▀▀▀▀▀     ● msk_live_… · maelstrom                                       │
 │  ▀▀▀▀▀▀       [████████░░░░░░░░░░░░░░░░░░░░░░] 25% used                      │
 │   ▝▀▀▀▀▀      local reviews + stacked PRs · mergestorm.ai                    │
 │     ▝▀▀▘      review a diff · usage for tabs · /help for all commands        │
-│       ▀       New in v0.3.52: Sign-in errors name the agent login            │
+│       ▀       New in v0.3.53: Busy queue no longer reads as stuck            │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 mergestorm
 ╭──────────────────────────────────────────────────────────────────────────────╮

package/dist/stack-blockers.d.ts

@@ -199,6 +199,7 @@ export type MergeQueueWait = {
     waitReason: string | null;
     aheadStackId: string | null;
     aheadOther: boolean;
+    idleSince?: string | null;
 };
 export declare function mergeQueueWait(queue: readonly MergeQueueEntryDto[], nowMs: number): MergeQueueWait | null;
 export declare function conflictLiveParent(stack: StackDto, layer: StackLayerDto): string | null;

package/dist/stack-blockers.js

@@ -102,7 +102,7 @@ const CYCLONE_HANDOFF_WORDS = {
     ci_red_on_base: "the same check also fails on the base branch",
     ci_rerun_exhausted: "Cyclone already had Surge re-run this check once at this head",
     ci_rerun_unavailable: "the failure looked flaky and Surge could not re-run it",
-    ci_unverified: "Cyclone could not confirm a fix locally, so it pushed nothing",
+    ci_unverified: "Cyclone's static checks did not cover its fix, so it pushed nothing",
     ci_unreadable: "Cyclone could not read the failing checks",
     ci_needs_actions_read: "Cyclone's GitHub App cannot read the Actions logs on this repo",
     ci_unresolved: "Cyclone's CI fix failed",
@@ -520,11 +520,22 @@ export function mergeQueueWait(queue, nowMs) {
         const queuedFor = minutesOf(queuedMs);
         const ahead = entry.aheadInRepo;
         if (!ahead) {
+            const progressAt = entry.repoQueue?.progressAt ?? null;
+            const progressMs = progressAt ? waitedMs(progressAt, nowMs) : null;
+            const idleMs = queuedMs != null && progressMs != null ? Math.min(queuedMs, progressMs) : queuedMs;
+            const queuedAhead = entry.repoQueue?.queuedAhead ?? 0;
+            const turn = queuedAhead > 0
+                ? `behind ${queuedAhead} older queued ${queuedAhead === 1 ? "entry" : "entries"}`
+                : "not picked up yet";
+            const moved = progressMs != null && queuedMs != null && progressMs < queuedMs
+                ? `; the queue last moved ${minutesOf(progressMs)}m ago`
+                : "";
             return {
-                text: `Queued ${queuedFor}m in the merge queue, not picked up yet${reason ? ` (last note: ${reason})` : ""}`,
-                stalled: queuedMs != null && queuedMs >= MERGE_QUEUE_STALL_ATTENTION_MS,
+                text: `Queued ${queuedFor}m in the merge queue, ${turn}${moved}${reason ? ` (last note: ${reason})` : ""}`,
+                stalled: idleMs != null && idleMs >= MERGE_QUEUE_STALL_ATTENTION_MS,
                 notPickedUp: true,
                 since: entry.enqueuedAt, waitReason: reason, aheadStackId: null, aheadOther: false,
+                idleSince: moved ? progressAt : null,
             };
         }
         const aheadMs = ahead.claimedAt ? waitedMs(ahead.claimedAt, nowMs) : null;
@@ -554,7 +565,7 @@ function queueStalledSteps(stack, layer, wait) {
         return `#${layer.prNumber} is waiting in the merge queue behind another entry in ${stack.owner}/${stack.repo} that has made no progress since ${wait.since ?? "it was claimed"}. Nothing on ${layer.branch} needs a change. ${ahead} If it stays stuck, tell the human: the queue for this repo is held by that entry.`;
     }
     if (wait.notPickedUp) {
-        return `#${layer.prNumber} has been queued in the merge queue for ${stack.owner}/${stack.repo} since ${wait.since ?? "it was enqueued"} and nothing is working on it or on an entry ahead of it${wait.waitReason ? `; its last note is: ${wait.waitReason}` : ""}. Nothing on ${layer.branch} needs a change: do not patch or push for this. If the note says the base branch keeps moving, the queue is waiting for a quiet moment on it and continues by itself once pushes to that branch pause. Otherwise tell the human: the merge queue is not picking this entry up; they can take the stack out of the queue and enqueue it again (mg queue rm ${stack.id}, then mg queue add ${stack.id}). Do not retarget the PR base.`;
+        return `#${layer.prNumber} has been queued in the merge queue for ${stack.owner}/${stack.repo} since ${wait.since ?? "it was enqueued"} and nothing is working on it or on an entry ahead of it${wait.idleSince ? `: the queue last claimed or finished an entry at ${wait.idleSince}` : ""}${wait.waitReason ? `; its last note is: ${wait.waitReason}` : ""}. Nothing on ${layer.branch} needs a change: do not patch or push for this. If the note says the base branch keeps moving, the queue is waiting for a quiet moment on it and continues by itself once pushes to that branch pause. Otherwise tell the human: the merge queue is not picking this entry up; they can take the stack out of the queue and enqueue it again (mg queue rm ${stack.id}, then mg queue add ${stack.id}). Do not retarget the PR base.`;
     }
     return `The merge queue has held #${layer.prNumber} at ${layer.headSha ?? "its head"} since ${wait.since ?? "it was claimed"} without landing or bouncing it${wait.waitReason ? `; its last note is: ${wait.waitReason}` : ", and it recorded no reason"}. If the note names a failing check or a conflict on ${layer.branch}, fix that with an ordinary push. If it waits on CI, list the head's checks (gh run list --branch ${layer.branch}) and re-run the one that never finished (gh run rerun <run-id>). If nothing moves after that, tell the human: they can take the stack out of the queue and enqueue it again (mg queue rm ${stack.id}, then mg queue add ${stack.id}). Do not retarget the PR base.`;
 }

package/dist/stack-dto.d.ts

@@ -457,6 +457,10 @@ export type MergeQueueAheadDto = {
     claimedAt: string | null;
     waitReason: string | null;
 };
+export type MergeQueueRepoQueueDto = {
+    queuedAhead: number;
+    progressAt: string | null;
+};
 export type MergeQueueEntryDto = {
     id: string;
     stackId: string;
@@ -482,4 +486,5 @@ export type MergeQueueEntryDto = {
     finishedAt: string | null;
     claimedAt?: string | null;
     aheadInRepo?: MergeQueueAheadDto | null;
+    repoQueue?: MergeQueueRepoQueueDto | null;
 };

package/dist/ui/banner.js

@@ -194,6 +194,9 @@ const WHATS_NEW = {
     "0.3.52": [
         "Sign-in errors name the agent login",
     ],
+    "0.3.53": [
+        "Busy queue no longer reads as stuck",
+    ],
 };
 function densityFromVariant(variant) {
     if (variant === "mini" || variant === "nano")

package/package.json

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