mergestorm 0.3.57 → 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.57                                             │
+│  ▀▀▀▀▀▀▀▀▀▀▘  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.57: issue create --help shows the usage            │
+│       ▀       New in v0.3.59: One-shot stack wait rides out a slow read      │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 mergestorm
 ╭──────────────────────────────────────────────────────────────────────────────╮

package/dist/commands/stack.js

@@ -1,4 +1,4 @@
-import { stackBlockers, stackBlockersSummary } from "../stack-blockers.js";
+import { cycloneStatusWords, stackBlockers, stackBlockersSummary } from "../stack-blockers.js";
 import { STACK_WATCH_NOT_DONE_SENTENCE, STACK_WATCH_NOTIFY_PATTERN, stackTerminalReason, stackWatchObligation, } from "../stack-watch-obligation.js";
 import { adoptStack, ensureUpperPark, findStackPull, getEnrichedStack, getStackPublication, landNextStack, listMergeQueueEntries, listStacks, openStackPull, claimStackPulls, restackStack, setStackPolicy, } from "../api.js";
 import { loadConfig } from "../config.js";
@@ -1283,7 +1283,7 @@ export async function cmdStackStatus(args, deps = {}) {
         lines.push(`    ${String(layer.position).padStart(2)}  ${pr}${head}  ${layer.state.padEnd(14)}  ${layer.branch}` +
             `  CI: ${layer.ciStatus ?? "unknown"}  review: ${layer.reviewStatus ?? "unknown"}` +
             (layer.vortexStatus ? `  Vortex: ${layer.vortexStatus}` : "") +
-            (layer.cycloneStatus ? `  Cyclone: ${layer.cycloneStatus}` : ""));
+            (layer.cycloneStatus ? `  Cyclone: ${cycloneStatusWords(layer)}` : ""));
     }
     if (queueWait && !attention)
         lines.push(`  Queue: #${queueWait.prNumber} ${queueWait.text}`);

package/dist/stack-blockers.d.ts

@@ -1,4 +1,4 @@
-import { type MergeQueueEntryDto, type StackAgentsBusy, type StackDto, type StackLayerDto } from "./stack-dto.js";
+import { type AutoLandOffReason, type MergeQueueEntryDto, type StackAgentsBusy, type StackDto, type StackLayerDto } from "./stack-dto.js";
 import type { StackWatchCursor } from "./stack-watch.js";
 export type StackBlocker = {
     prNumber: number;
@@ -6,7 +6,7 @@ export type StackBlocker = {
     blocker: string;
     bounceKind: string | null;
 };
-export type StackBlockerReason = "restack_conflict" | "restack_failed" | "draft_pr" | "merge_conflict" | "ci_failed" | "vortex_failed" | "vortex_out_of_quota" | "vortex_skipped" | "vortex_findings_need_person" | "seam_failed" | "seam_findings" | "seam_not_running" | "seam_review_stuck" | "seam_rereview_not_running" | "seam_verdict_stale" | "unit_abandoned" | "land_gate" | "bounce" | "auto_land_off" | "auto_land_ci_pending" | "auto_land_members_remaining" | "auto_land_vortex_wait" | "auto_land_promote_failed" | "auto_land_ci_unreadable" | "auto_land_waited" | "queue_stalled" | "land_pr_missing";
+export type StackBlockerReason = "restack_conflict" | "restack_failed" | "draft_pr" | "merge_conflict" | "ci_failed" | "vortex_failed" | "vortex_out_of_quota" | "vortex_skipped" | "vortex_findings_need_person" | "seam_failed" | "seam_findings" | "seam_not_running" | "seam_review_stuck" | "seam_rereview_not_running" | "seam_verdict_stale" | "unit_abandoned" | "land_gate" | "bounce" | "auto_land_off" | "auto_land_switched_off" | "auto_land_ci_pending" | "auto_land_members_remaining" | "auto_land_vortex_wait" | "auto_land_promote_failed" | "auto_land_ci_unreadable" | "auto_land_waited" | "queue_stalled" | "land_pr_missing";
 export type ClassifiedStackBlocker = StackBlocker & {
     reason: StackBlockerReason;
 };
@@ -89,6 +89,13 @@ export type StackRepairHint = {
     branch: string;
     bounceKind: string;
     steps: string;
+} | {
+    kind: "auto_land_switched_off";
+    prNumber: number;
+    headSha: string | null;
+    branch: string;
+    offReason: AutoLandOffReason;
+    steps: string;
 } | {
     kind: "ci_pending" | "vortex_not_green";
     prNumber: number;
@@ -163,6 +170,7 @@ export declare const SEAM_REVIEW_STUCK = "Seam review stuck in reviewing, no rev
 export declare const SEAM_REREVIEW_NOT_RUNNING = "Seam re-review pending, no review running";
 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 cycloneStatusWords(layer: Pick<StackLayerDto, "cycloneStatus" | "cycloneHandoff" | "headSha">): string | null;
 export declare function autoResolveActive(stack: StackDto, layer: StackLayerDto): boolean;
 export declare function autoFixCiActive(stack: StackDto, layer: StackLayerDto): boolean;
 export declare const CI_DID_NOT_FINISH_BLOCKER = "CI did not finish \u2014 left for a person";

package/dist/stack-blockers.js

@@ -1,4 +1,4 @@
-import { 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);
@@ -79,6 +79,7 @@ function cycloneHandoffAtHead(stack, layer) {
 }
 const CYCLONE_HANDOFF_WORDS = {
     failed: "Cyclone's patch failed, so it pushed nothing",
+    fix_held: "Cyclone wrote a fix and held it on purpose, 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",
     repo_auto_patch_off: "auto-patch is off for this repository and this stack does not turn it on",
@@ -107,14 +108,23 @@ 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) {
-    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("_", " ");
+    const words = CYCLONE_HANDOFF_WORDS[reason] ?? reason.replaceAll("_", " ");
+    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)
+        return null;
+    if (layer.cycloneStatus !== "held")
+        return layer.cycloneStatus;
+    const detail = cycloneHandoffDetailAtHead(layer)?.trim();
+    return detail ? `held its fix, not pushed (${detail})` : "held its fix, not pushed";
 }
 function cycloneHandoffDetailAtHead(layer) {
     return sameHead(layer.cycloneHandoff?.headSha, layer.headSha) ? layer.cycloneHandoff.detail ?? null : null;
@@ -153,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)}.`;
@@ -162,6 +172,7 @@ function ciHandoffNote(stack, layer) {
 }
 const CYCLONE_HELD_FINDINGS_REASONS = [
     "failed",
+    CYCLONE_FIX_HELD_REASON,
     "left_for_human",
     "infra_failure",
     "pr_state_unavailable",
@@ -359,6 +370,8 @@ function layerAttention(stack, layer, queue, cursor) {
         return none;
     if (kind === "ci_failure" && !bounce.bounceDetail?.batch && (headChecksAllGreen(layer) || headChecksRerunning(layer)))
         return none;
+    if (kind === "ci_timeout" && headChecksAllGreen(layer))
+        return none;
     const label = mergeQueueBounceLabel(bounce);
     return { blocker: label, reason: "bounce", bounceKind: kind, bounce };
 }
@@ -391,6 +404,17 @@ function disarmingBounce(stack, queue) {
         return recorded;
     return undefined;
 }
+const AUTO_LAND_SWITCHED_OFF_PREFIX = "Auto land switched off: ";
+const AUTO_LAND_SWITCHED_OFF_BY = {
+    cancelled: "its merge queue entry was cancelled",
+    watcher: "Mergestorm found nothing it could land",
+};
+function switchedOffByAnotherActor(stack) {
+    if (stack.archivedAt || stack.autoEnqueueWhenReady !== false)
+        return undefined;
+    const reason = stack.autoLandOff?.reason;
+    return reason && AUTO_LAND_SWITCHED_OFF_BY[reason] ? reason : undefined;
+}
 export const AUTO_LAND_CI_PENDING_ATTENTION_MS = 45 * 60_000;
 export const AUTO_LAND_VORTEX_WAIT_ATTENTION_MS = 30 * 60_000;
 export const AUTO_LAND_PROMOTE_FAILED_ATTEMPTS = 3;
@@ -725,13 +749,27 @@ export function stackRepair(stack, attention, layer, bounce, queueWait = null) {
         };
     }
     if (reason === "auto_land_off" && attention.bounceKind) {
+        const nothingToFix = attention.bounceKind === "ci_timeout" && headChecksAllGreen(layer);
         return {
             kind: "auto_land_off",
             prNumber: layer.prNumber,
             headSha: layer.headSha ?? null,
             branch: layer.branch,
             bounceKind: attention.bounceKind,
-            steps: `The ${attention.bounceKind} bounce turned Auto land off, so nothing will enqueue this stack. Fix the cause of the bounce on ${layer.branch}, then turn Auto land back on (mg stack set ${stack.id} --auto-land on) or enqueue the stack.`,
+            steps: nothingToFix
+                ? `The ci_timeout bounce turned Auto land off, so nothing will enqueue this stack. Every check on ${layer.branch} is green at this head now, so nothing needs a change: do not patch or push for it. Turn Auto land back on (mg stack set ${stack.id} --auto-land on) or enqueue the stack.`
+                : `The ${attention.bounceKind} bounce turned Auto land off, so nothing will enqueue this stack. Fix the cause of the bounce on ${layer.branch}, then turn Auto land back on (mg stack set ${stack.id} --auto-land on) or enqueue the stack.`,
+        };
+    }
+    const offReason = stack.autoLandOff?.reason;
+    if (reason === "auto_land_switched_off" && offReason) {
+        return {
+            kind: "auto_land_switched_off",
+            prNumber: layer.prNumber,
+            headSha: layer.headSha ?? null,
+            branch: layer.branch,
+            offReason,
+            steps: `Auto land is off for this stack (autoLandOff reason ${offReason}: ${AUTO_LAND_SWITCHED_OFF_BY[offReason] ?? offReason}), so nothing will enqueue it and it will not land by itself. No bounce did this and nothing in the layers needs a change: do not patch or push for it. A person or another agent session may have switched it off on purpose, so do not turn Auto land back on yourself. Tell the human that Auto land is off and why, and turn it back on (mg stack set ${stack.id} --auto-land on) only when they say so.`,
         };
     }
     if (reason === "vortex_failed") {
@@ -920,6 +958,13 @@ export function stackBlockers(stack, entries = [], cursor = {}, nowMs = Date.now
                 result = { blocker: `${AUTO_LAND_OFF_BLOCKER_PREFIX}${kind} bounce`, reason: "auto_land_off", bounceKind: kind, bounce: disarmed };
             }
         }
+        if (!result.blocker && selected) {
+            const offReason = switchedOffByAnotherActor(stack);
+            if (offReason) {
+                result = { blocker: `${AUTO_LAND_SWITCHED_OFF_PREFIX}${AUTO_LAND_SWITCHED_OFF_BY[offReason]}`,
+                    reason: "auto_land_switched_off", bounceKind: null };
+            }
+        }
         let waitNamed = false;
         if (!result.blocker) {
             const waiting = autoLandWaitNamed(stack, layer, nowMs);

package/dist/stack-dto.d.ts

@@ -64,7 +64,9 @@ export type StackVortexReviewView = {
     /** Which table spoke: the authority row, a live job, a lease, or nothing. */
     source: "pr_reviews" | "github_webhook_jobs" | "lease" | "none";
 };
-export type StackCycloneStatus = "patching" | "awaiting_fix" | "failed";
+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;
@@ -171,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;
@@ -439,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

@@ -23,6 +23,8 @@ export function restackRetryPending(error, layer) {
  * dependency-free and byte-for-byte aligned with the canonical wire contract.
  */
 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

@@ -209,6 +209,12 @@ const WHATS_NEW = {
     "0.3.57": [
         "issue create --help shows the usage",
     ],
+    "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/dist/ui/logo.d.ts

@@ -5,14 +5,7 @@
  * puts it. Same X/width as the SVG, shifted up half a cell. Painted fg 77.
  */
 export declare const TORNADO_LOGO: string[];
-/** Single idle frame. Kept for callers that index frames. */
-export declare const TORNADO_FRAMES: string[][];
 /** Every sprite glyph is one column. */
 export declare const TORNADO_LOGO_WIDTH: number;
-export declare const TORNADO_LOGO_COMPACT: string[];
-/** @deprecated Use {@link TORNADO_LOGO}. */
-export declare const STORM_MARK: string[];
-/** @deprecated Use {@link TORNADO_LOGO_WIDTH}. */
-export declare const STORM_MARK_WIDTH: number;
 /** Paint one sprite row: each run of glyphs in brand green 77, spaces left bare. */
 export declare function paintSpriteRow(row: string): string;

package/dist/ui/logo.js

@@ -13,15 +13,8 @@ export const TORNADO_LOGO = [
     "    ▝▀▀▘    ",
     "      ▀     ",
 ];
-/** Single idle frame. Kept for callers that index frames. */
-export const TORNADO_FRAMES = [TORNADO_LOGO];
 /** Every sprite glyph is one column. */
 export const TORNADO_LOGO_WIDTH = Math.max(...TORNADO_LOGO.map((line) => [...line].length));
-export const TORNADO_LOGO_COMPACT = TORNADO_LOGO;
-/** @deprecated Use {@link TORNADO_LOGO}. */
-export const STORM_MARK = TORNADO_LOGO;
-/** @deprecated Use {@link TORNADO_LOGO_WIDTH}. */
-export const STORM_MARK_WIDTH = TORNADO_LOGO_WIDTH;
 /** Paint one sprite row: each run of glyphs in brand green 77, spaces left bare. */
 export function paintSpriteRow(row) {
     return row.replace(/[^ ]+/g, (run) => ansi.brightGreen(run));

package/dist/ui/prompt.d.ts

@@ -35,35 +35,18 @@ export declare class PromptClosedError extends Error {
  * prompt cells survive (`merg` + `mergestorm` -> `mergmmmmmergestorm`).
  */
 export declare function promptRedrawPrefix(inputRow: number): string;
-/**
- * From the content row, move to the first row after the input chrome
- * and erase the slash overlay. Boxed chrome is top + content + bottom
- * (`down(2)`). Plain chrome is the content line (`down(1)`).
- */
-export declare function promptClearOverlay(boxed: boolean): string;
 /**
  * Cursor home + ED 0: clears the whole screen from row 1 and leaves the
  * cursor there. Used to redraw the welcome panel on resize, where the old
  * frame's row count is unknowable after the terminal rewraps.
  */
 export declare const HEADER_REDRAW_PREFIX = "\u001B[H\u001B[0J";
-export declare const MOUSE_ENABLE = "\u001B[?1000h\u001B[?1006h";
-export declare const MOUSE_DISABLE = "\u001B[?1000l\u001B[?1006l";
-export type SpriteRect = {
-    col: number;
-    row: number;
-    width: number;
-    height: number;
-};
-/** SGR coordinates and the rectangle are both 1-based. */
-export declare function hitTestSprite(col: number, row: number, rect: SpriteRect): boolean;
 export declare const DROPDOWN_MAX_COMMAND_ROWS = 8;
 export declare function formatSlashLabel(spec: CommandSpec): string;
 export declare function specMatchesTerm(spec: CommandSpec, term: string): boolean;
 export declare function slashToken(buffer: string): string | null;
 export declare function matchSlashCommands(buffer: string, specs: CommandSpec[], dismissed?: boolean): CommandSpec[];
 export declare function isExactSlashCommand(buffer: string, specs: CommandSpec[]): boolean;
-export declare function dropdownMaxRows(terminalRows: number | undefined, inputRow: number): number;
 export declare function dropdownViewport(count: number, index: number, maxRows: number): {
     start: number;
     moreAbove: number;

package/dist/ui/prompt.js

@@ -25,27 +25,12 @@ const clearDown = "\u001b[0J";
 export function promptRedrawPrefix(inputRow) {
     return `${up(inputRow)}\r${clearDown}`;
 }
-/**
- * From the content row, move to the first row after the input chrome
- * and erase the slash overlay. Boxed chrome is top + content + bottom
- * (`down(2)`). Plain chrome is the content line (`down(1)`).
- */
-export function promptClearOverlay(boxed) {
-    return `${down(boxed ? 2 : 1)}\r${clearDown}`;
-}
 /**
  * Cursor home + ED 0: clears the whole screen from row 1 and leaves the
  * cursor there. Used to redraw the welcome panel on resize, where the old
  * frame's row count is unknowable after the terminal rewraps.
  */
 export const HEADER_REDRAW_PREFIX = `\u001b[H${clearDown}`;
-export const MOUSE_ENABLE = "\u001b[?1000h\u001b[?1006h";
-export const MOUSE_DISABLE = "\u001b[?1000l\u001b[?1006l";
-/** SGR coordinates and the rectangle are both 1-based. */
-export function hitTestSprite(col, row, rect) {
-    return col >= rect.col && col < rect.col + rect.width &&
-        row >= rect.row && row < rect.row + rect.height;
-}
 export const DROPDOWN_MAX_COMMAND_ROWS = 8;
 export function formatSlashLabel(spec) {
     const extra = spec.aliases?.length
@@ -77,12 +62,6 @@ export function isExactSlashCommand(buffer, specs) {
         return false;
     return specs.some((spec) => spec.name === token || (spec.aliases ?? []).includes(token));
 }
-export function dropdownMaxRows(terminalRows, inputRow) {
-    const rows = typeof terminalRows === "number" && Number.isFinite(terminalRows) && terminalRows >= 1
-        ? terminalRows
-        : 24;
-    return Math.max(1, Math.min(DROPDOWN_MAX_COMMAND_ROWS, rows - inputRow - 3));
-}
 export function dropdownViewport(count, index, maxRows) {
     const max = Math.max(1, maxRows);
     if (count <= max)

package/package.json

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

package/skill/mergestorm-bounce-watch/SKILL.md

@@ -61,6 +61,8 @@ Re-arm only when all of these hold:
 
 Do not re-arm when `autoLandOff` is null or missing or its `reason` is anything but `bounced` (`user` means the human turned Auto land off; `archive`, `watcher`, `cancelled`, and `landed` are not yours to undo), when the stack was never armed, when the stack is archived, or when any condition above fails; report the newest bounce and stop.
 
+When `autoLandOff.reason` is `cancelled` or `watcher` and the current PR has no live blocker of its own, the watch returns `attention` with blocker `Auto land switched off: <why>` and repair kind `auto_land_switched_off`. A live blocker on that PR (failed CI, a conflict, Vortex findings) is reported first and handled by its own repair; the switched-off attention follows once it is cleared. For the switched-off attention itself, no bounce did it and the layers need no change: do not patch, push, or turn Auto land back on yourself. A person or another agent session may have switched it off on purpose. Tell the human that Auto land is off and why, and turn it back on only when they say so.
+
 After a patch, re-arm as soon as your push is confirmed; do not wait for CI or reviews, since Auto land itself waits for green checks and idle agents. First recheck the remote head of the PR you pushed, or of the bounced PR for an infra-only cause (`git ls-remote origin refs/heads/<branch>`), and `stack_status`: if that head is not the SHA you pushed or confirmed green, stop and tell the human; if Auto land is already on, leave it. Then call `stack_set` with `stack_id` and `auto_land: true` (the CLI equivalent is `mg stack set <id> --auto-land on`), and confirm with `stack_status` that `autoEnqueueWhenReady` is `true`. Pass no other `stack_set` key. Keep the `after_finished_at` and `bounce_id` selectors for that bounce and keep watching until the stack lands.
 
 The cap is one re-arm per distinct `bounce_id` and 3 per stack per watch. Every arm clears `autoLandOff`, so a disarm after your re-arm reads its own reason, never your old bounce. A human who takes the stack back while it is off (turns Auto land off, archives or unarchives it, or cancels its queue entry) replaces `bounced` with `user`, `archive`, or `cancelled`, so `bounced` also means nobody took it back since that bounce. A fourth disarming bounce after three re-arms means your diagnosis is wrong or the fault is outside your scope. At the cap, leave Auto land off and stop: tell the human the stack is not landed, Auto land is off, and list each bounce you re-armed for (id, kind, PR, head, `finishedAt`) with what you did for it, plus the newest bounce and the current head and check state.