mergestorm 0.3.44 → 0.3.46

package/README.md

@@ -45,7 +45,7 @@ On a TTY, bare `mergestorm` (or `mergestorm shell`) opens a branded REPL: a comp
 
 ```
 ╭──────────────────────────────────────────────────────────────────────────────╮
-│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.44                                             │
+│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.46                                             │
 │ ▀▀▀▀▀▀▀▀▀     ● msk_live_… · maelstrom                                       │
 │  ▀▀▀▀▀▀       [████████░░░░░░░░░░░░░░░░░░░░░░] 25% used                      │
 │   ▝▀▀▀▀▀      local reviews + stacked PRs · mergestorm.ai                    │

package/dist/client/index.d.ts

@@ -7,5 +7,5 @@ export { REVIEW_JOB_ENVELOPE_SCHEMA, toReviewJobEnvelope, type ReviewEnvelopeFal
 export { discoverTrunk } from "../git-stack.js";
 export { BOUNCE_KIND_LABELS, deriveStackAgentsBusy, mergeQueueBounceLabel, type StackAgentsBusy } from "../stack-dto.js";
 export { STACK_WATCH_SCHEMA, STACK_WATCH_DEFAULT_TIMEOUT_MS, STACK_WATCH_BUSY_RECHECK_S, StackWatchError, StackWatchTimeoutError, pollStackWatch, type PollStackWatchOptions, type StackWatchCursor, type StackWatchEnvelope, } from "../stack-watch.js";
-export { stackBlockers, stackBlockersSummary, sameHead, layerAgents, layerAgentsBusy, conflictLiveParent, stackRepair, agentsCannotClear, autoResolveActive, type StackAgentBusy, type StackBlocker, type StackBusyAgent, type StackHeldBlocker, type StackLandGatePending, type StackLayerAgents, type StackRepairHint, } from "../stack-blockers.js";
+export { stackBlockers, stackBlockersSummary, sameHead, layerAgents, layerAgentsBusy, conflictLiveParent, stackRepair, agentsCannotClear, autoFixCiActive, autoResolveActive, type StackAgentBusy, type StackBlocker, type StackBusyAgent, type StackHeldBlocker, type StackLandGatePending, type StackLayerAgents, type StackRepairHint, } from "../stack-blockers.js";
 export { STACK_WATCH_NOT_DONE_SENTENCE, STACK_WATCH_NOTIFY_PATTERN, stackWatchBackgroundCommand, stackTerminalReason, stackWatchNextArgs, stackWatchObligation, type StackWatchDoneReason, type StackWatchNext, type StackWatchNextArgs, type StackWatchObligation, type StackWatchObligationInput, type StackWatchReason, } from "../stack-watch-obligation.js";

package/dist/client/index.js

@@ -7,5 +7,5 @@ export { REVIEW_JOB_ENVELOPE_SCHEMA, toReviewJobEnvelope, } from "../ui/job-enve
 export { discoverTrunk } from "../git-stack.js";
 export { BOUNCE_KIND_LABELS, deriveStackAgentsBusy, mergeQueueBounceLabel } from "../stack-dto.js";
 export { STACK_WATCH_SCHEMA, STACK_WATCH_DEFAULT_TIMEOUT_MS, STACK_WATCH_BUSY_RECHECK_S, StackWatchError, StackWatchTimeoutError, pollStackWatch, } from "../stack-watch.js";
-export { stackBlockers, stackBlockersSummary, sameHead, layerAgents, layerAgentsBusy, conflictLiveParent, stackRepair, agentsCannotClear, autoResolveActive, } from "../stack-blockers.js";
+export { stackBlockers, stackBlockersSummary, sameHead, layerAgents, layerAgentsBusy, conflictLiveParent, stackRepair, agentsCannotClear, autoFixCiActive, autoResolveActive, } from "../stack-blockers.js";
 export { STACK_WATCH_NOT_DONE_SENTENCE, STACK_WATCH_NOTIFY_PATTERN, stackWatchBackgroundCommand, stackTerminalReason, stackWatchNextArgs, stackWatchObligation, } from "../stack-watch-obligation.js";

package/dist/stack-blockers.d.ts

@@ -52,6 +52,7 @@ export type StackRepairHint = {
     branch: string;
     failingCheck: string | null;
     steps: string;
+    note?: string;
 } | {
     kind: "vortex_findings";
     prNumber: number;
@@ -163,6 +164,7 @@ export declare const SEAM_REREVIEW_NOT_RUNNING = "Seam re-review pending, no rev
 export declare const SEAM_VERDICT_STALE = "Seam verdict is for an older head, no review running";
 export declare const VORTEX_FINDINGS_NEED_PERSON = "Vortex findings need a person";
 export declare function autoResolveActive(stack: StackDto, layer: StackLayerDto): boolean;
+export declare function autoFixCiActive(stack: StackDto, layer: StackLayerDto): boolean;
 export declare const VORTEX_AUTO_REVIEW_OFF = "Vortex auto-review is off, so this head was not reviewed";
 export declare const VORTEX_BILLING_SKIPPED = "Vortex skipped this head: it could not confirm billing";
 export declare const VORTEX_REVIEW_INCOMPLETE = "Vortex reviewed only part of this PR";

package/dist/stack-blockers.js

@@ -91,6 +91,19 @@ const CYCLONE_HANDOFF_WORDS = {
     auto_resolve_daily_cap: "Cyclone already resolved conflicts on this PR twice today, its daily cap",
     stack_auto_resolve_off: "auto-resolve conflicts is off for this stack",
     account_auto_resolve_off: "auto-resolve conflicts is off for the account and this stack does not turn it on",
+    ci_fix_did_not_hold: "CI still fails on Cyclone's own CI fix",
+    auto_fix_ci_daily_cap: "Cyclone already fixed CI on this PR twice today, its daily cap",
+    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_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_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) {
     return CYCLONE_HANDOFF_WORDS[reason] ?? reason.replaceAll("_", " ");
@@ -114,6 +127,22 @@ function conflictHandoffNote(stack, layer) {
     }
     return null;
 }
+export function autoFixCiActive(stack, layer) {
+    return !stack.cycloneCiOff && !isLandPrLayer(stack, layer) &&
+        !sameHead(layer.cycloneCiHandoff?.headSha, layer.headSha);
+}
+function ciHandoffNote(stack, layer) {
+    if (isLandPrLayer(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.`;
+    }
+    if (stack.cycloneCiOff) {
+        return `Cyclone will not fix this failing CI by itself: ${cycloneHandoffWords(stack.cycloneCiOff)}.`;
+    }
+    return null;
+}
 function vortexFindingsLeftForPerson(stack, layer) {
     return vortexChangesRequestedAtHead(layer) && !layerAgentsBusy(layer).cyclone &&
         cycloneHandoffAtHead(stack, layer) !== null;
@@ -139,7 +168,8 @@ const VORTEX_SKIP_BLOCKERS = {
 };
 export function vortexRetryScheduled(layer) {
     const review = layer.vortexReview;
-    return review?.skip_reason?.trim() === "retry_scheduled" && sameHead(review.head_sha, layer.headSha);
+    const reason = review?.skip_reason?.trim();
+    return (reason === "retry_scheduled" || reason === "post_delayed") && sameHead(review?.head_sha, layer.headSha);
 }
 function vortexIdleSkipBlocker(layer) {
     if (layerAgentsBusy(layer).vortex)
@@ -743,6 +773,7 @@ export function stackRepair(stack, attention, layer, bounce, queueWait = null) {
     }
     if (reason === "ci_failed" || attention.bounceKind === "ci_failure") {
         const failingCheck = bounce?.bounceDetail?.failingCheck?.trim() || layer.checks?.failingName?.trim() || null;
+        const note = ciHandoffNote(stack, layer);
         return {
             kind: "ci_failure",
             prNumber: layer.prNumber,
@@ -750,6 +781,7 @@ export function stackRepair(stack, attention, layer, bounce, queueWait = null) {
             branch: layer.branch,
             failingCheck,
             steps: `Read the failing ${failingCheck ? `check ${failingCheck}` : "checks"} on ${layer.branch} (gh run list --branch ${layer.branch}, then gh run view <run-id> --log-failed), fix it on ${layer.branch} with the smallest patch, run that check locally, confirm the remote head is still ${layer.headSha ?? "the head you started from"}, then an ordinary git push. Do not retarget the PR base.`,
+            ...(note ? { note } : {}),
         };
     }
     return null;

package/dist/stack-dto.d.ts

@@ -116,7 +116,7 @@ export type StackAgentsBusy = {
 };
 export declare const STACK_AGENT_QUEUED_STALE_MS: number;
 export declare const AUTO_RESOLVE_ENQUEUE_GRACE_MS: number;
-export declare function deriveStackAgentsBusy(layer: Pick<StackLayerDto, "headSha" | "vortexStatus" | "cycloneStatus" | "agentRuns" | "vortexReview" | "cycloneConflictPendingSince">, opts?: {
+export declare function deriveStackAgentsBusy(layer: Pick<StackLayerDto, "headSha" | "vortexStatus" | "cycloneStatus" | "agentRuns" | "vortexReview" | "cycloneConflictPendingSince" | "cycloneCiPendingSince">, opts?: {
     cycloneClaimed?: boolean;
     nowMs?: number;
 }): StackAgentsBusy;
@@ -215,6 +215,8 @@ export type StackLayerDto = {
     cycloneHandoff?: StackCycloneHandoff | null;
     cycloneConflictHandoff?: StackCycloneHandoff | null;
     cycloneConflictPendingSince?: string | null;
+    cycloneCiHandoff?: StackCycloneHandoff | null;
+    cycloneCiPendingSince?: string | null;
     conflictDetail: string | null;
     restackError?: RestackError | null;
     lastRestackedSha: string | null;
@@ -309,6 +311,7 @@ export type StackUnitDto = {
 export type CycloneOwnerMatch = "same" | "different" | "none" | "lookup_failed";
 export type CyclonePatchOffReason = "stack_auto_patch_off" | "account_auto_patch_off" | "cyclone_not_connected";
 export type CycloneConflictOffReason = "stack_auto_resolve_off" | "account_auto_resolve_off" | "cyclone_not_connected";
+export type CycloneCiOffReason = "stack_auto_fix_ci_off" | "account_auto_fix_ci_off" | "cyclone_not_connected";
 export type StackDto = {
     id: string;
     owner: string;
@@ -389,6 +392,7 @@ export type StackDto = {
     cycloneOwnerMatch?: CycloneOwnerMatch;
     cyclonePatchOff?: CyclonePatchOffReason;
     cycloneConflictOff?: CycloneConflictOffReason;
+    cycloneCiOff?: CycloneCiOffReason;
     infrastructureInstallUserId?: string | null;
     infrastructureOwnerMatch?: CycloneOwnerMatch;
     layers: StackLayerDto[];

package/dist/stack-dto.js

@@ -48,12 +48,15 @@ export function deriveStackAgentsBusy(layer, opts = {}) {
         vortexRuns.some((run) => run.status === "reviewing") ||
         freshQueued ||
         (layer.agentRuns === undefined && review === undefined && layer.vortexStatus === "reviewing");
-    const pendingSince = Date.parse(layer.cycloneConflictPendingSince ?? "");
-    const conflictPending = Number.isFinite(pendingSince) && nowMs - pendingSince <= AUTO_RESOLVE_ENQUEUE_GRACE_MS;
+    const withinGrace = (since) => {
+        const sinceMs = Date.parse(since ?? "");
+        return Number.isFinite(sinceMs) && nowMs - sinceMs <= AUTO_RESOLVE_ENQUEUE_GRACE_MS;
+    };
     const cyclone = opts.cycloneClaimed === true || layer.cycloneStatus === "patching" ||
         runs.some((run) => run.agent === "cyclone" && run.status === "patching") ||
         runs.some((run) => run.agent === "cyclone" && agentShaMayBeHead(run.sha, headSha) && queuedFresh(run)) ||
-        conflictPending;
+        withinGrace(layer.cycloneConflictPendingSince) ||
+        withinGrace(layer.cycloneCiPendingSince);
     return { vortex, cyclone, headSha };
 }
 /** Every bounce kind understood by the shared contract. */

package/dist/ui/banner.js

@@ -170,6 +170,12 @@ const WHATS_NEW = {
     "0.3.44": [
         "Cyclone can auto-resolve stack conflicts",
     ],
+    "0.3.45": [
+        "Cyclone can auto-fix red stack CI",
+    ],
+    "0.3.46": [
+        "Watch waits while GitHub delays a review",
+    ],
 };
 function densityFromVariant(variant) {
     if (variant === "mini" || variant === "nano")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mergestorm",
-  "version": "0.3.44",
+  "version": "0.3.46",
   "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-bounce-watch/SKILL.md

@@ -9,7 +9,7 @@ Use only these shipped Mergestorm MCP tools: `stack_wait`, `stack_status`, `queu
 
 ## Who fixes what
 
-Cyclone, with auto-patch on, patches only Vortex review findings: Core and seam review findings on any layer, the land PR included. It does not fix merge conflicts, restack conflicts, failing CI, or any other landing blocker by itself. Those are yours, whatever the auto-patch setting. With auto-resolve conflicts on for the stack, Cyclone resolves a layer conflict itself (never the land PR's conflict with main): while `busy[]` shows Cyclone, wait, and fix the conflict only after its handoff, when the watch returns `attention`. Do not turn auto-patch off to fix them; it changes nothing for them.
+Cyclone, with auto-patch on, patches only Vortex review findings: Core and seam review findings on any layer, the land PR included. It does not fix merge conflicts, restack conflicts, failing CI, or any other landing blocker by itself. Those are yours, whatever the auto-patch setting. With auto-resolve conflicts on for the stack, Cyclone resolves a layer conflict itself (never the land PR's conflict with main): while `busy[]` shows Cyclone, wait, and fix the conflict only after its handoff, when the watch returns `attention`. With auto-fix CI on for the stack, Cyclone fixes a settled red check on a layer itself (never the land PR), or asks Surge for one re-run of a flaky one: while `busy[]` shows Cyclone, wait, and fix the failure only after its handoff, when the watch returns `attention`. Do not turn auto-patch off to fix them; it changes nothing for them.
 
 ## Not done until landed