mergestorm 0.3.50 → 0.3.52

package/README.md

@@ -45,12 +45,12 @@ On a TTY, bare `mergestorm` (or `mergestorm shell`) opens a branded REPL: a comp
 
 ```
 ╭──────────────────────────────────────────────────────────────────────────────╮
-│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.50                                             │
+│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.52                                             │
 │ ▀▀▀▀▀▀▀▀▀     ● 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.52: Sign-in errors name the agent login            │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 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.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))
@@ -75,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",
@@ -105,9 +109,14 @@ const CYCLONE_HANDOFF_WORDS = {
     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);
 }
@@ -149,9 +158,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 +800,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, 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;

package/dist/ui/banner.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mergestorm",
-  "version": "0.3.50",
+  "version": "0.3.52",
   "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)