mergestorm 0.3.58 → 0.3.59

package/README.md

@@ -45,12 +45,12 @@ On a TTY, bare `mergestorm` (or `mergestorm shell`) opens a branded REPL: a comp
 
 ```
 ╭──────────────────────────────────────────────────────────────────────────────╮
-│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.58                                             │
+│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.59                                             │
 │ ▀▀▀▀▀▀▀▀▀     ● 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.58: Watch reports Auto land switched off           │
+│       ▀       New in v0.3.59: One-shot stack wait rides out a slow read      │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 mergestorm
 ╭──────────────────────────────────────────────────────────────────────────────╮

package/dist/stack-blockers.js

@@ -1,4 +1,4 @@
-import { CYCLONE_FIX_HELD_REASON, deriveStackAgentsBusy, mergeQueueBounceLabel, restackRetryPending, } from "./stack-dto.js";
+import { CYCLONE_CI_FIX_HELD_REASON, CYCLONE_FIX_HELD_REASON, deriveStackAgentsBusy, mergeQueueBounceLabel, restackRetryPending, } from "./stack-dto.js";
 export function landGateIsPending(reason) {
     const token = reason?.trim().replace(/^landing blocked:\s*/i, "").match(/^[a-z_]+/i)?.[0] ?? "";
     return /_(?:pending|running)$/i.test(token);
@@ -108,13 +108,15 @@ const CYCLONE_HANDOFF_WORDS = {
     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_fix_held: "Cyclone wrote a CI fix and held it on purpose, so it pushed nothing",
     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, detail) {
     const words = CYCLONE_HANDOFF_WORDS[reason] ?? reason.replaceAll("_", " ");
-    return reason === CYCLONE_FIX_HELD_REASON && detail?.trim() ? `${words}: ${detail.trim()}` : words;
+    const held = reason === CYCLONE_FIX_HELD_REASON || reason === CYCLONE_CI_FIX_HELD_REASON;
+    return held && detail?.trim() ? `${words}: ${detail.trim()}` : words;
 }
 export function cycloneStatusWords(layer) {
     if (!layer.cycloneStatus)
@@ -161,7 +163,7 @@ function ciHandoffNote(stack, layer) {
         return null;
     const handoff = layer.cycloneCiHandoff;
     if (handoff && sameHead(handoff.headSha, layer.headSha)) {
-        return `Cyclone tried to fix this failing CI at ${layer.headSha ?? handoff.headSha} and left it for a person (${cycloneHandoffWords(handoff.reason)}), so it will not try this head again.`;
+        return `Cyclone tried to fix this failing CI at ${layer.headSha ?? handoff.headSha} and left it for a person (${cycloneHandoffWords(handoff.reason, handoff.detail)}), so it will not try this head again.`;
     }
     if (stack.cycloneCiOff) {
         return `Cyclone will not fix this failing CI by itself: ${cycloneHandoffWords(stack.cycloneCiOff)}.`;

package/dist/stack-dto.d.ts

@@ -66,6 +66,7 @@ export type StackVortexReviewView = {
 };
 export type StackCycloneStatus = "patching" | "awaiting_fix" | "held" | "failed";
 export declare const CYCLONE_FIX_HELD_REASON = "fix_held";
+export declare const CYCLONE_CI_FIX_HELD_REASON = "ci_fix_held";
 export type StackCycloneHandoff = {
     headSha: string;
     reason: string;
@@ -172,7 +173,7 @@ export type StackLayerConflictResolution = {
      */
     dispatchId: string | null;
 };
-export type StackLayerCiFixStatus = "verified" | "unverified" | "no_changes" | "failed";
+export type StackLayerCiFixStatus = "verified" | "unverified" | "no_changes" | "held" | "failed";
 export type StackLayerCiFix = {
     status: StackLayerCiFixStatus;
     failingCheck: string | null;
@@ -440,7 +441,7 @@ export type MergeQueueBounceBatch = {
     withPrNumbers: number[];
 };
 export type MergeQueueBatchState = "verifying" | "landing" | "landed" | "stopped" | "bounced" | "abandoned";
-export type MergeQueueBatchCiCheckState = "passed" | "skipped" | "failed" | "running" | "queued";
+export type MergeQueueBatchCiCheckState = "passed" | "skipped" | "cancelled" | "failed" | "running" | "queued";
 export type MergeQueueBatchCiCheckDto = {
     name: string;
     state: MergeQueueBatchCiCheckState;

package/dist/stack-dto.js

@@ -24,6 +24,7 @@ export function restackRetryPending(error, layer) {
  */
 export const AUTO_LAND_OFF_REASONS = ["user", "archive", "watcher", "cancelled", "landed", "bounced"];
 export const CYCLONE_FIX_HELD_REASON = "fix_held";
+export const CYCLONE_CI_FIX_HELD_REASON = "ci_fix_held";
 export const STACK_AGENT_QUEUED_STALE_MS = 15 * 60 * 1000;
 export const AUTO_RESOLVE_ENQUEUE_GRACE_MS = 2 * 60_000;
 function agentShaMayBeHead(sha, head) {

package/dist/stack-watch.d.ts

@@ -5,6 +5,8 @@ import type { Config } from "./config.js";
 export declare const STACK_WATCH_SCHEMA: "mergestorm.stack_watch/v1";
 export declare const STACK_WATCH_DEFAULT_TIMEOUT_MS = 45000;
 export declare const STACK_WATCH_BUSY_RECHECK_S = 15;
+export declare const STACK_WATCH_ONE_SHOT_READ_TIMEOUT_MS = 30000;
+export declare const STACK_WATCH_DEADLINE_SNAPSHOT_TIMEOUT_MS = 5000;
 /** Resume selectors are fixed for the entire wait, including transient retries. */
 export type StackWatchCursor = {
     readonly stackId: string;

package/dist/stack-watch.js

@@ -1,11 +1,13 @@
 import { currentLayer, layerAgents, stackBlockers, } from "./stack-blockers.js";
 import { stackTerminalReason, stackWatchObligation, } from "./stack-watch-obligation.js";
 import { setTimeout as sleep } from "node:timers/promises";
-import { apiFetch } from "./api.js";
+import { apiFetch, DEFAULT_API_TIMEOUT_MS } from "./api.js";
 import { REVIEW_POLL_INTERVAL_MS, REVIEW_POLL_MAX_TRANSIENT_RETRIES, isTransientReviewPollError, isTransientReviewPollStatus, transientRetryWaitMs, } from "./commands/review-client.js";
 export const STACK_WATCH_SCHEMA = "mergestorm.stack_watch/v1";
 export const STACK_WATCH_DEFAULT_TIMEOUT_MS = 45_000;
 export const STACK_WATCH_BUSY_RECHECK_S = 15;
+export const STACK_WATCH_ONE_SHOT_READ_TIMEOUT_MS = DEFAULT_API_TIMEOUT_MS;
+export const STACK_WATCH_DEADLINE_SNAPSHOT_TIMEOUT_MS = 5_000;
 export class StackWatchTimeoutError extends Error {
     lastEnvelope;
     constructor(lastEnvelope) {
@@ -77,7 +79,9 @@ export async function pollStackWatch(cfg, stackId, opts = {}) {
                 response = await fetch(cfg, route, {
                     signal: opts.signal, timeoutMs: route.includes("&wait=")
                         ? Number(new URL(route, "https://local").searchParams.get("wait")) * 1000 + 5_000
-                        : finalSnapshot ? 5_000 : Math.max(1, Math.min(30_000, deadline - now())),
+                        : finalSnapshot
+                            ? timeoutMs === 0 ? STACK_WATCH_ONE_SHOT_READ_TIMEOUT_MS : STACK_WATCH_DEADLINE_SNAPSHOT_TIMEOUT_MS
+                            : Math.max(1, Math.min(30_000, deadline - now())),
                 });
             }
             catch (err) {

package/dist/ui/banner.js

@@ -212,6 +212,9 @@ const WHATS_NEW = {
     "0.3.58": [
         "Watch reports Auto land switched off",
     ],
+    "0.3.59": [
+        "One-shot stack wait rides out a slow read",
+    ],
 };
 function densityFromVariant(variant) {
     if (variant === "mini" || variant === "nano")

package/package.json

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