mergestorm 0.3.51 → 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.51                                             │
+│  ▀▀▀▀▀▀▀▀▀▀▘  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: mg dismiss records an audited finding dismissal           │
+│       ▀       New in v0.3.53: Busy queue no longer reads as stuck            │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 mergestorm
 ╭──────────────────────────────────────────────────────────────────────────────╮

package/dist/api.js

@@ -81,7 +81,7 @@ function rethrowFetchAbort(err, timeoutMs) {
 export async function apiFetch(cfg, route, init = {}) {
     const key = resolveApiKey(cfg);
     if (!key) {
-        throw new CommandError("No API key. Run `mergestorm login` or set MERGESTORM_API_KEY.", 1, "missing_api_key");
+        throw new CommandError("No API key. Run `mergestorm login` (agents: `mergestorm login --start`, then `--finish`) or set MERGESTORM_API_KEY.", 1, "missing_api_key");
     }
     const { json, timeoutMs = DEFAULT_API_TIMEOUT_MS, signal: userSignal, ...rest } = init;
     const headers = {
@@ -114,7 +114,7 @@ export async function apiFetch(cfg, route, init = {}) {
         // keep text
     }
     if (res.status === 401) {
-        throw new CommandError("API key invalid or revoked. Run `mergestorm login`.", 1, "auth_invalid");
+        throw new CommandError("API key invalid or revoked. Run `mergestorm login` (agents: `mergestorm login --start`, then `--finish`).", 1, "auth_invalid");
     }
     const retryAfterSeconds = parseRetryAfterSeconds({
         header: res.headers.get("retry-after"),

package/dist/commands/browse.js

@@ -183,7 +183,7 @@ export async function openTabsBrowser(initial) {
     const cfg = await loadConfig();
     const key = resolveApiKey(cfg);
     if (!key) {
-        throw new CommandError("Not logged in. Run `mergestorm login`.");
+        throw new CommandError("Not logged in. Run `mergestorm login` (agents: `mergestorm login --start`, then `--finish`).");
     }
     let me = null;
     let keyInvalid = false;

package/dist/commands/login.js

@@ -220,6 +220,9 @@ export async function cmdLogin(args) {
     console.log(`  ${ansi.brightGreen(pending.openUrl)}`);
     console.log(`\n  Code: ${ansi.bold(pending.userCode)}\n`);
     openBrowser(pending.openUrl);
+    if (!process.stdout.isTTY) {
+        console.log("No terminal here. If this command may be cut off before the approval, use `mergestorm login --start`, then `mergestorm login --finish`.");
+    }
     console.log("Waiting for approval…");
     await pollDeviceLogin(pending, "mergestorm login", "Run `mergestorm login` again.");
 }

package/dist/commands/whoami.js

@@ -9,7 +9,7 @@ export async function cmdWhoami(args, opts = {}) {
     const cfg = await loadConfig();
     const key = resolveApiKey(cfg);
     if (!key) {
-        throw new CommandError("Not logged in. Run `mergestorm login`.");
+        throw new CommandError("Not logged in. Run `mergestorm login` (agents: `mergestorm login --start`, then `--finish`).");
     }
     if (!asJson && canBrowse()) {
         await openTabsBrowser("status");

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

@@ -78,6 +78,7 @@ function cycloneHandoffAtHead(stack, layer) {
     return stack.cyclonePatchOff ?? (stack.autoPatchOverride === false ? "auto_patch_off" : null);
 }
 const CYCLONE_HANDOFF_WORDS = {
+    failed: "Cyclone's patch failed, so it pushed nothing",
     auto_patch_off: "auto-patch is off for this stack",
     stack_auto_patch_off: "auto-patch is off for this stack",
     account_auto_patch_off: "auto-patch is off for the account and this stack does not turn it on",
@@ -101,16 +102,21 @@ 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",
     stack_auto_fix_ci_off: "auto-fix CI is off for this stack",
     account_auto_fix_ci_off: "auto-fix CI is off for the account and this stack does not turn it on",
 };
-function cycloneHandoffWords(reason) {
+function cycloneHandoffWords(reason, detail) {
+    if (reason === "failed" && detail?.trim())
+        return `Cyclone wrote a fix and held it, so it pushed nothing: ${detail.trim()}`;
     return CYCLONE_HANDOFF_WORDS[reason] ?? reason.replaceAll("_", " ");
 }
+function cycloneHandoffDetailAtHead(layer) {
+    return sameHead(layer.cycloneHandoff?.headSha, layer.headSha) ? layer.cycloneHandoff.detail ?? null : null;
+}
 function isLandPrLayer(stack, layer) {
     return layer.prNumber === stack.unit?.landPrNumber || (!!stack.unit?.branch && layer.branch === stack.unit.branch);
 }
@@ -514,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;
@@ -548,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.`;
 }
@@ -794,7 +811,7 @@ export function stackRepair(stack, attention, layer, bounce, queueWait = null) {
             branch: layer.branch,
             handoff,
             findings,
-            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.`,
+            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, cycloneHandoffDetailAtHead(layer))})` : ""}, 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/stack-dto.d.ts

@@ -69,6 +69,7 @@ export type StackCycloneHandoff = {
     headSha: string;
     reason: string;
     at: string | null;
+    detail?: string | null;
 };
 export type StackAgentName = "vortex" | "cyclone";
 /**
@@ -108,6 +109,7 @@ export type StackAgentRun = {
         reviewed: number;
         total: number;
     } | null;
+    detail?: string | null;
 };
 export type StackAgentsBusy = {
     vortex: boolean;
@@ -455,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;
@@ -480,4 +486,5 @@ export type MergeQueueEntryDto = {
     finishedAt: string | null;
     claimedAt?: string | null;
     aheadInRepo?: MergeQueueAheadDto | null;
+    repoQueue?: MergeQueueRepoQueueDto | null;
 };

package/dist/ui/banner.js

@@ -191,6 +191,12 @@ const WHATS_NEW = {
     "0.3.51": [
         "Watch names findings held on a throttled head",
     ],
+    "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.51",
+  "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",

package/skill/mergestorm-pr-loop/SKILL.md

@@ -22,7 +22,7 @@ mg skill install --claude --cursor --agents
 1. There is an already-open GitHub PR on a Vortex-monitored repo. No PR, wrong skill.
 2. Auto-patch (Cyclone) must be off for this PR so you are the only patcher. Do not take anyone's word for it: the settings API and the PR's stack are the source of truth, and step 1 of the loop verifies them before anything else runs. Cyclone is off for the PR when its adopted stack has `autoPatchOverride` `false`, or when that override is unset and the account `auto_patch_enabled` is `false`.
 3. The Bearer key and the Cyclone GitHub App install must be the same Mergestorm account. `stack_list` / `stack_status` expose `keyUserId`, `cycloneInstallUserId`, and `cycloneOwnerMatch`. Cyclone apply always uses the install account, not the key. If those identities differ, your `settings_get` mute reading is about the wrong person.
-4. `whoami` works on the `mergestorm` MCP server (or `mg whoami --json` exits 0). Otherwise stop and ask for install/login.
+4. `whoami` works on the `mergestorm` MCP server (or `mg whoami --json` exits 0). Otherwise stop and ask for install, or sign in yourself: run `mg login --start`, send the person the link it prints, and after they approve it run `mg login --finish`.
 
 ## Loop (in order)