mergestorm 0.3.59 → 0.3.61

package/README.md

@@ -45,12 +45,12 @@ On a TTY, bare `mergestorm` (or `mergestorm shell`) opens a branded REPL: a comp
 
 ```
 ╭──────────────────────────────────────────────────────────────────────────────╮
-│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.59                                             │
+│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.61                                             │
 │ ▀▀▀▀▀▀▀▀▀     ● 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.59: One-shot stack wait rides out a slow read      │
+│       ▀       New in v0.3.61: Watch names a job Cyclone's push skips         │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 mergestorm
 ╭──────────────────────────────────────────────────────────────────────────────╮

package/dist/stack-blockers.js

@@ -103,6 +103,7 @@ const CYCLONE_HANDOFF_WORDS = {
     ci_billing_block: "GitHub Actions is blocked by billing, so no code change turns CI green",
     ci_missing_secrets: "the failing job needs secrets its run does not have",
     ci_red_on_base: "the same check also fails on the base branch",
+    ci_actor_gated: "the failing job is skipped on a commit pushed by Cyclone, so a fix from Cyclone would not turn it green",
     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's static checks did not cover its fix, so it pushed nothing",

package/dist/stack-dto.d.ts

@@ -174,12 +174,14 @@ export type StackLayerConflictResolution = {
     dispatchId: string | null;
 };
 export type StackLayerCiFixStatus = "verified" | "unverified" | "no_changes" | "held" | "failed";
+export type StackLayerCiFixCheck = "passed" | "failed" | "did_not_run" | "pending";
 export type StackLayerCiFix = {
     status: StackLayerCiFixStatus;
     failingCheck: string | null;
     resultSha: string | null;
     reason: string | null;
     at: string;
+    checkOnResult?: StackLayerCiFixCheck;
 };
 export type StackLayerDto = {
     branch: string;

package/dist/stack-watch.d.ts

@@ -7,6 +7,7 @@ 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;
+export declare const STACK_WATCH_CLOSING_READ_RESERVE_MS = 10000;
 /** Resume selectors are fixed for the entire wait, including transient retries. */
 export type StackWatchCursor = {
     readonly stackId: string;

package/dist/stack-watch.js

@@ -8,6 +8,7 @@ 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 const STACK_WATCH_CLOSING_READ_RESERVE_MS = 10_000;
 export class StackWatchTimeoutError extends Error {
     lastEnvelope;
     constructor(lastEnvelope) {
@@ -80,7 +81,8 @@ export async function pollStackWatch(cfg, stackId, opts = {}) {
                     signal: opts.signal, timeoutMs: route.includes("&wait=")
                         ? Number(new URL(route, "https://local").searchParams.get("wait")) * 1000 + 5_000
                         : finalSnapshot
-                            ? timeoutMs === 0 ? STACK_WATCH_ONE_SHOT_READ_TIMEOUT_MS : STACK_WATCH_DEADLINE_SNAPSHOT_TIMEOUT_MS
+                            ? timeoutMs === 0 ? STACK_WATCH_ONE_SHOT_READ_TIMEOUT_MS
+                                : Math.max(STACK_WATCH_DEADLINE_SNAPSHOT_TIMEOUT_MS, Math.min(DEFAULT_API_TIMEOUT_MS, deadline - now()))
                             : Math.max(1, Math.min(30_000, deadline - now())),
                 });
             }
@@ -172,9 +174,10 @@ export async function pollStackWatch(cfg, stackId, opts = {}) {
     evaluate(stack, queue.entries);
     if (lastEnvelope.status === "attention" || timeoutMs === 0 || terminal)
         return seal(lastEnvelope);
-    while (now() < deadline) {
+    const closingReadReserveMs = Math.min(STACK_WATCH_CLOSING_READ_RESERVE_MS, timeoutMs / 4);
+    while (deadline - now() > closingReadReserveMs) {
         const heldAt = now();
-        const seconds = Math.min(lastEnvelope.busy.length ? STACK_WATCH_BUSY_RECHECK_S : 45, Math.max(1, Math.ceil((deadline - heldAt) / 1000)));
+        const seconds = Math.min(lastEnvelope.busy.length ? STACK_WATCH_BUSY_RECHECK_S : 45, Math.max(1, Math.ceil((deadline - heldAt - closingReadReserveMs) / 1000)));
         const seen = queue.fingerprint ? `&seen=${encodeURIComponent(queue.fingerprint)}` : "";
         const held = await readQueue(`${queueRoute}&wait=${seconds}${seen}`);
         if (JSON.stringify(held.entries) === JSON.stringify(queue.entries)) {

package/dist/ui/banner.js

@@ -215,6 +215,12 @@ const WHATS_NEW = {
     "0.3.59": [
         "One-shot stack wait rides out a slow read",
     ],
+    "0.3.60": [
+        "Timed stack wait rides out a slow last read",
+    ],
+    "0.3.61": [
+        "Watch names a job Cyclone's push skips",
+    ],
 };
 function densityFromVariant(variant) {
     if (variant === "mini" || variant === "nano")

package/package.json

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