mergestorm 0.3.43 → 0.3.45

package/README.md

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

package/dist/api.d.ts

@@ -225,6 +225,8 @@ export type StackPolicyPatch = {
     autoEnqueueWhenReady?: boolean;
     autoReviewOverride?: boolean | null;
     autoPatchOverride?: boolean | null;
+    autoResolveConflictsOverride?: boolean | null;
+    autoFixCiOverride?: boolean | null;
 };
 /** Drop undefined keys so the wire body only carries what was requested. */
 export declare function stackPolicyBody(policy: StackPolicyPatch | undefined): StackPolicyPatch;

package/dist/api.js

@@ -361,6 +361,12 @@ export function stackPolicyBody(policy) {
     if (policy?.autoPatchOverride !== undefined) {
         body.autoPatchOverride = policy.autoPatchOverride;
     }
+    if (policy?.autoResolveConflictsOverride !== undefined) {
+        body.autoResolveConflictsOverride = policy.autoResolveConflictsOverride;
+    }
+    if (policy?.autoFixCiOverride !== undefined) {
+        body.autoFixCiOverride = policy.autoFixCiOverride;
+    }
     return body;
 }
 /** Adopt an open PR chain (Bearer POST /api/v1/stacks/adopt). */

package/dist/automation-catalog.d.ts

@@ -6,6 +6,14 @@ export declare const BEARER_SETTINGS: readonly [{
     readonly key: "auto_patch_enabled";
     readonly flag: "--auto-patch";
     readonly label: "Auto patch";
+}, {
+    readonly key: "auto_resolve_conflicts_enabled";
+    readonly flag: "--auto-resolve-conflicts";
+    readonly label: "Auto-resolve merge conflicts";
+}, {
+    readonly key: "auto_fix_ci_enabled";
+    readonly flag: "--auto-fix-ci";
+    readonly label: "Auto-fix failing CI";
 }, {
     readonly key: "vortex_show_thinking_traces";
     readonly flag: "--vortex-thinking";
@@ -94,4 +102,4 @@ export type BearerSettingsValues = {
         values: readonly (infer Value)[];
     } ? Value : boolean;
 };
-export declare const BEARER_BOOLEAN_SETTINGS_KEYS: ("auto_review_enabled" | "auto_patch_enabled" | "vortex_show_thinking_traces" | "repo_overview_enabled" | "cyclone_skip_ci_enabled" | "cyclone_patch_unverified_languages" | "vortex_auto_overflow_enabled" | "vortex_skip_all_clear_comments" | "vortex_seam_specialist_enabled" | "auto_land_default" | "auto_land_settle_seconds" | "merge_queue_batch_enabled" | "merge_queue_batch_size" | "ignored_bot_logins" | "vortex_bot_skip_check" | "vortex_findings_check" | "cyclone_patch_failure_check")[];
+export declare const BEARER_BOOLEAN_SETTINGS_KEYS: ("auto_review_enabled" | "auto_patch_enabled" | "auto_resolve_conflicts_enabled" | "auto_fix_ci_enabled" | "vortex_show_thinking_traces" | "repo_overview_enabled" | "cyclone_skip_ci_enabled" | "cyclone_patch_unverified_languages" | "vortex_auto_overflow_enabled" | "vortex_skip_all_clear_comments" | "vortex_seam_specialist_enabled" | "auto_land_default" | "auto_land_settle_seconds" | "merge_queue_batch_enabled" | "merge_queue_batch_size" | "ignored_bot_logins" | "vortex_bot_skip_check" | "vortex_findings_check" | "cyclone_patch_failure_check")[];

package/dist/automation-catalog.js

@@ -1,6 +1,8 @@
 export const BEARER_SETTINGS = [
     { key: "auto_review_enabled", flag: "--auto-review", label: "Auto review" },
     { key: "auto_patch_enabled", flag: "--auto-patch", label: "Auto patch" },
+    { key: "auto_resolve_conflicts_enabled", flag: "--auto-resolve-conflicts", label: "Auto-resolve merge conflicts" },
+    { key: "auto_fix_ci_enabled", flag: "--auto-fix-ci", label: "Auto-fix failing CI" },
     { key: "vortex_show_thinking_traces", flag: "--vortex-thinking", label: "Vortex thinking traces" },
     { key: "repo_overview_enabled", flag: "--repo-overview", label: "Repo overview" },
     { key: "cyclone_skip_ci_enabled", flag: "--cyclone-skip-ci", label: "Skip CI on Cyclone commits" },

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, 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, } 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/commands/browse.d.ts

@@ -27,7 +27,7 @@ export declare function buildStatusTabLines(input: StatusTabInput): string[];
 /** In-place job detail for the Jobs tab (same envelope as `status <id>`). */
 export declare function formatJobDetailLines(row: ReviewJobRow): string[];
 /** Human labels for the Config tab and the static `settings` printout. */
-export declare const SETTINGS_LABELS: Record<"auto_review_enabled" | "auto_patch_enabled" | "vortex_show_thinking_traces" | "repo_overview_enabled" | "cyclone_skip_ci_enabled" | "cyclone_patch_unverified_languages" | "vortex_auto_overflow_enabled" | "vortex_skip_all_clear_comments" | "vortex_seam_specialist_enabled" | "auto_land_default" | "auto_land_settle_seconds" | "merge_queue_batch_enabled" | "merge_queue_batch_size" | "ignored_bot_logins" | "vortex_bot_skip_check" | "vortex_findings_check" | "cyclone_patch_failure_check", string>;
+export declare const SETTINGS_LABELS: Record<"auto_review_enabled" | "auto_patch_enabled" | "auto_resolve_conflicts_enabled" | "auto_fix_ci_enabled" | "vortex_show_thinking_traces" | "repo_overview_enabled" | "cyclone_skip_ci_enabled" | "cyclone_patch_unverified_languages" | "vortex_auto_overflow_enabled" | "vortex_skip_all_clear_comments" | "vortex_seam_specialist_enabled" | "auto_land_default" | "auto_land_settle_seconds" | "merge_queue_batch_enabled" | "merge_queue_batch_size" | "ignored_bot_logins" | "vortex_bot_skip_check" | "vortex_findings_check" | "cyclone_patch_failure_check", string>;
 export declare const STACKS_READY_LABEL = "Stacks, merge queue, Auto land";
 export declare const STACKS_READY_WORDS: {
     readonly on: "ready";

package/dist/commands/registry.js

@@ -180,7 +180,7 @@ export const COMMAND_REGISTRY = [
         summary: "Automation toggles (Config tab on a TTY)",
         usage: [
             "mergestorm settings [--json]    Read the automation toggles (Config tab on a TTY)",
-            "  [--auto-review on|off] [--auto-patch on|off] [--vortex-thinking on|off]",
+            "  [--auto-review on|off] [--auto-patch on|off] [--auto-resolve-conflicts on|off] [--auto-fix-ci on|off] [--vortex-thinking on|off]",
             "  [--repo-overview on|off]",
             "  [--cyclone-skip-ci on|off]",
             "  [--cyclone-patch-unverified on|off]  Patch languages we cannot typecheck",
@@ -238,15 +238,15 @@ export const COMMAND_REGISTRY = [
         name: "stack",
         summary: "Stacks: /stack how-to, list yours, create → submit",
         usage: [
-            "mergestorm stack create [name]  New local layer ([--onto] [--trunk] [--extend] [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off])",
-            "mergestorm stack submit         Push/open active stack ([--extend] [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off])",
+            "mergestorm stack create [name]  New local layer ([--onto] [--trunk] [--extend] [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off] [--auto-resolve-conflicts on|off] [--auto-fix-ci on|off])",
+            "mergestorm stack submit         Push/open active stack ([--extend] [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off] [--auto-resolve-conflicts on|off] [--auto-fix-ci on|off])",
             "mergestorm stack reset --force  Clear this repo's pre-submit authoring state",
             "mergestorm stack list [--json]  List registered stacks",
             "mergestorm stack status <stack-id> [--json]  Enriched stack status",
             "mergestorm stack wait <stack-id> [--json] [--timeout <s>]  Wait for stack attention (default 45s, max 300s; 0 = one snapshot, no wait). --json: one document on stdout; timeout notice on stderr, exit 5",
             "mergestorm stack watch <stack-id> [--until attention|landed] [--ignore <blocker-substring>] [--max <minutes>] [--head <sha>] [--json]  Background watcher: silent while waiting; MS-WATCH ATTENTION exits 3, MS-WATCH LANDED exits 0",
-            "mergestorm stack set <stack-id> [--auto-land on|off] [--auto-review on|off|default] [--auto-patch on|off|default] [--json]  Per-stack policy",
-            "mergestorm stack adopt <owner/repo>#<pr> [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off]  Import an open PR chain",
+            "mergestorm stack set <stack-id> [--auto-land on|off] [--auto-review on|off|default] [--auto-patch on|off|default] [--auto-resolve-conflicts on|off|default] [--auto-fix-ci on|off|default] [--json]  Per-stack policy",
+            "mergestorm stack adopt <owner/repo>#<pr> [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off] [--auto-resolve-conflicts on|off] [--auto-fix-ci on|off]  Import an open PR chain",
             "mergestorm stack restack <stack-id>   Restack stack descendants",
             "mergestorm stack land <stack-id>      Land bottom PR (or promote into unit)",
         ],

package/dist/commands/settings.d.ts

@@ -3,7 +3,7 @@ import { type SettingsPatch, type SettingsResponse } from "../api.js";
  * CLI flag → Bearer settings key. Boolean flags take on|off. The connected flags are
  * read-only on the API and deliberately have no flag here.
  */
-export declare const SETTINGS_FLAGS: Record<string, "auto_review_enabled" | "auto_patch_enabled" | "vortex_show_thinking_traces" | "repo_overview_enabled" | "cyclone_skip_ci_enabled" | "cyclone_patch_unverified_languages" | "vortex_auto_overflow_enabled" | "vortex_skip_all_clear_comments" | "vortex_seam_specialist_enabled" | "auto_land_default" | "auto_land_settle_seconds" | "merge_queue_batch_enabled" | "merge_queue_batch_size" | "ignored_bot_logins" | "vortex_bot_skip_check" | "vortex_findings_check" | "cyclone_patch_failure_check">;
+export declare const SETTINGS_FLAGS: Record<string, "auto_review_enabled" | "auto_patch_enabled" | "auto_resolve_conflicts_enabled" | "auto_fix_ci_enabled" | "vortex_show_thinking_traces" | "repo_overview_enabled" | "cyclone_skip_ci_enabled" | "cyclone_patch_unverified_languages" | "vortex_auto_overflow_enabled" | "vortex_skip_all_clear_comments" | "vortex_seam_specialist_enabled" | "auto_land_default" | "auto_land_settle_seconds" | "merge_queue_batch_enabled" | "merge_queue_batch_size" | "ignored_bot_logins" | "vortex_bot_skip_check" | "vortex_findings_check" | "cyclone_patch_failure_check">;
 type IgnoreBotOperation = {
     action: "add" | "remove";
     login: string;

package/dist/commands/stack.d.ts

@@ -42,12 +42,14 @@ export declare function parseAdoptTarget(args: string[]): {
 /** Empty + populated bodies for the TTY `stack list` panel. */
 export declare function buildStackListLines(stacks: StackDto[]): string[];
 /** Short per-stack policy suffixes: Auto land when on, overrides when pinned. */
-export declare function stackPolicyLabels(s: Pick<StackDto, "autoEnqueueWhenReady" | "autoReviewOverride" | "autoPatchOverride">): string[];
+export declare function stackPolicyLabels(s: Pick<StackDto, "autoEnqueueWhenReady" | "autoReviewOverride" | "autoPatchOverride" | "autoResolveConflictsOverride" | "autoFixCiOverride">): string[];
 /** Per-open policy flags shared by create, submit, and adopt (`on|off` only). */
 export type StackOpenPolicyFlags = {
     autoLand?: boolean;
     autoReview?: boolean;
     autoPatch?: boolean;
+    autoResolveConflicts?: boolean;
+    autoFixCi?: boolean;
 };
 /** Wire policy for adopt from the parsed `on|off` flags; absent keys stay off the body. */
 export declare function openPolicyPatch(flags: StackOpenPolicyFlags): StackPolicyPatch | undefined;
@@ -60,6 +62,8 @@ export declare function parseStackCreateArgs(args: string[]): {
     autoLand?: boolean;
     autoReview?: boolean;
     autoPatch?: boolean;
+    autoResolveConflicts?: boolean;
+    autoFixCi?: boolean;
     asJson: boolean;
 };
 /** Parse `stack submit` argv. Exported for tests. */
@@ -68,6 +72,8 @@ export declare function parseStackSubmitArgs(args: string[]): {
     autoLand?: boolean;
     autoReview?: boolean;
     autoPatch?: boolean;
+    autoResolveConflicts?: boolean;
+    autoFixCi?: boolean;
     rest: boolean;
     asJson: boolean;
 };
@@ -78,6 +84,8 @@ export declare function parseStackAdoptArgs(args: string[]): {
     autoLand?: boolean;
     autoReview?: boolean;
     autoPatch?: boolean;
+    autoResolveConflicts?: boolean;
+    autoFixCi?: boolean;
     asJson: boolean;
 };
 export type StackSetArgs = {
@@ -86,6 +94,8 @@ export type StackSetArgs = {
     autoLand?: boolean;
     autoReview?: boolean | null;
     autoPatch?: boolean | null;
+    autoResolveConflicts?: boolean | null;
+    autoFixCi?: boolean | null;
     asJson: boolean;
 };
 export declare function parseStackSetArgs(args: string[]): StackSetArgs;

package/dist/commands/stack.js

@@ -27,7 +27,8 @@ export function stackRepairLine(repair) {
     if (!repair)
         return [];
     const files = "files" in repair && repair.files.length ? ` (files: ${repair.files.join(", ")})` : "";
-    return [`Repair #${repair.prNumber} ${repair.kind}${files}: ${repair.steps}`];
+    const note = "note" in repair && repair.note ? ` ${repair.note}` : "";
+    return [`Repair #${repair.prNumber} ${repair.kind}${files}: ${repair.steps}${note}`];
 }
 export function stackWatchTextLines(watch) {
     if (!watch)
@@ -47,8 +48,8 @@ export function openStackWatch(stackId, opts = {}) {
     return stackWatchObligation({ stackId, terminal: null, unread: opts.unread, freshCursor: true });
 }
 const STACK_USAGE = `usage:
-  mergestorm stack create [name] [--onto <branch>] [--trunk <branch>] [--extend] [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off] [--json]
-  mergestorm stack submit [--extend] [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off] [--rest] [--json]
+  mergestorm stack create [name] [--onto <branch>] [--trunk <branch>] [--extend] [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off] [--auto-resolve-conflicts on|off] [--auto-fix-ci on|off] [--json]
+  mergestorm stack submit [--extend] [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off] [--auto-resolve-conflicts on|off] [--auto-fix-ci on|off] [--rest] [--json]
   mergestorm stack reset --force
   mergestorm stack list [--json]
   mergestorm stack status <stack-id> [--json]
@@ -60,12 +61,13 @@ const STACK_USAGE = `usage:
     Prints one MS-WATCH ATTENTION line and exits 3 on attention or a repeated failed read; prints
     MS-WATCH LANDED and exits 0 only for a confirmed landing. Other terminal reasons exit 3 with ATTENTION. Run it as a background command.
     --json writes exactly one JSON document to stdout and sends the MS-WATCH lines to stderr.
-  mergestorm stack set <stack-id> [--auto-land on|off] [--auto-review on|off|default] [--auto-patch on|off|default] [--json]
-  mergestorm stack adopt <owner/repo>#<pr> [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off] [--json]
+  mergestorm stack set <stack-id> [--auto-land on|off] [--auto-review on|off|default] [--auto-patch on|off|default] [--auto-resolve-conflicts on|off|default] [--auto-fix-ci on|off|default] [--json]
+  mergestorm stack adopt <owner/repo>#<pr> [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off] [--auto-resolve-conflicts on|off] [--auto-fix-ci on|off] [--json]
   mergestorm stack restack <stack-id> [--json]
   mergestorm stack land <stack-id> [--json]
 
-  --auto-review / --auto-patch pin Vortex auto-review / Cyclone auto-patch for
+  --auto-review / --auto-patch / --auto-resolve-conflicts / --auto-fix-ci pin
+  Vortex auto-review and the Cyclone automations for
   one stack in either direction. Absent, or \`default\` on stack set, follows
   the account setting.
   stack submit opens PRs with a body generated from each layer tip commit.
@@ -188,6 +190,12 @@ export function stackPolicyLabels(s) {
     if (typeof s.autoPatchOverride === "boolean") {
         labels.push(`auto-patch ${s.autoPatchOverride ? "on" : "off"}`);
     }
+    if (typeof s.autoResolveConflictsOverride === "boolean") {
+        labels.push(`auto-resolve-conflicts ${s.autoResolveConflictsOverride ? "on" : "off"}`);
+    }
+    if (typeof s.autoFixCiOverride === "boolean") {
+        labels.push(`auto-fix-ci ${s.autoFixCiOverride ? "on" : "off"}`);
+    }
     return labels;
 }
 function formatStackHuman(s, includeLayers = true) {
@@ -214,6 +222,8 @@ const OPEN_POLICY_FLAGS = [
     { flag: "--auto-land", key: "autoLand" },
     { flag: "--auto-review", key: "autoReview" },
     { flag: "--auto-patch", key: "autoPatch" },
+    { flag: "--auto-resolve-conflicts", key: "autoResolveConflicts" },
+    { flag: "--auto-fix-ci", key: "autoFixCi" },
 ];
 /**
  * Consume one `--auto-* on|off` flag at `args[i]` (space or `=` form). Returns
@@ -239,6 +249,10 @@ export function openPolicyPatch(flags) {
         ...(typeof flags.autoLand === "boolean" ? { autoEnqueueWhenReady: flags.autoLand } : {}),
         ...(typeof flags.autoReview === "boolean" ? { autoReviewOverride: flags.autoReview } : {}),
         ...(typeof flags.autoPatch === "boolean" ? { autoPatchOverride: flags.autoPatch } : {}),
+        ...(typeof flags.autoResolveConflicts === "boolean"
+            ? { autoResolveConflictsOverride: flags.autoResolveConflicts }
+            : {}),
+        ...(typeof flags.autoFixCi === "boolean" ? { autoFixCiOverride: flags.autoFixCi } : {}),
     };
     return Object.keys(patch).length > 0 ? patch : undefined;
 }
@@ -305,6 +319,8 @@ export function parseStackCreateArgs(args) {
         autoLand: policy.autoLand,
         autoReview: policy.autoReview,
         autoPatch: policy.autoPatch,
+        autoResolveConflicts: policy.autoResolveConflicts,
+        autoFixCi: policy.autoFixCi,
         asJson,
     };
 }
@@ -333,13 +349,15 @@ export function parseStackSubmitArgs(args) {
             i = next - 1;
             continue;
         }
-        throw new CommandError("usage: mergestorm stack submit [--extend] [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off] [--rest] [--json]");
+        throw new CommandError("usage: mergestorm stack submit [--extend] [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off] [--auto-resolve-conflicts on|off] [--auto-fix-ci on|off] [--rest] [--json]");
     }
     return {
         extend,
         autoLand: policy.autoLand,
         autoReview: policy.autoReview,
         autoPatch: policy.autoPatch,
+        autoResolveConflicts: policy.autoResolveConflicts,
+        autoFixCi: policy.autoFixCi,
         rest,
         asJson,
     };
@@ -387,16 +405,20 @@ export function parseStackAdoptArgs(args) {
         autoLand: policy.autoLand,
         autoReview: policy.autoReview,
         autoPatch: policy.autoPatch,
+        autoResolveConflicts: policy.autoResolveConflicts,
+        autoFixCi: policy.autoFixCi,
         asJson,
     };
 }
 export function parseStackSetArgs(args) {
-    const usage = "usage: mergestorm stack set <stack-id> [--auto-land on|off] [--auto-review on|off|default] [--auto-patch on|off|default] [--json]";
+    const usage = "usage: mergestorm stack set <stack-id> [--auto-land on|off] [--auto-review on|off|default] [--auto-patch on|off|default] [--auto-resolve-conflicts on|off|default] [--auto-fix-ci on|off|default] [--json]";
     const verb = "stack set <stack-id>";
     let stackId;
     let autoLand;
     let autoReview;
     let autoPatch;
+    let autoResolveConflicts;
+    let autoFixCi;
     let asJson = false;
     for (let i = 0; i < args.length; i++) {
         const arg = args[i];
@@ -421,6 +443,18 @@ export function parseStackSetArgs(args) {
         else if (arg.startsWith("--auto-patch=")) {
             autoPatch = parseOnOffDefault(arg.slice("--auto-patch=".length), "--auto-patch", verb);
         }
+        else if (arg === "--auto-resolve-conflicts") {
+            autoResolveConflicts = parseOnOffDefault(args[++i], "--auto-resolve-conflicts", verb);
+        }
+        else if (arg.startsWith("--auto-resolve-conflicts=")) {
+            autoResolveConflicts = parseOnOffDefault(arg.slice("--auto-resolve-conflicts=".length), "--auto-resolve-conflicts", verb);
+        }
+        else if (arg === "--auto-fix-ci") {
+            autoFixCi = parseOnOffDefault(args[++i], "--auto-fix-ci", verb);
+        }
+        else if (arg.startsWith("--auto-fix-ci=")) {
+            autoFixCi = parseOnOffDefault(arg.slice("--auto-fix-ci=".length), "--auto-fix-ci", verb);
+        }
         else if (arg.startsWith("-") || stackId !== undefined) {
             throw new CommandError(usage);
         }
@@ -428,7 +462,11 @@ export function parseStackSetArgs(args) {
             stackId = arg;
         }
     }
-    if (autoLand === undefined && autoReview === undefined && autoPatch === undefined) {
+    if (autoLand === undefined &&
+        autoReview === undefined &&
+        autoPatch === undefined &&
+        autoResolveConflicts === undefined &&
+        autoFixCi === undefined) {
         throw new CommandError(usage);
     }
     return {
@@ -436,6 +474,8 @@ export function parseStackSetArgs(args) {
         ...(autoLand !== undefined ? { autoLand } : {}),
         ...(autoReview !== undefined ? { autoReview } : {}),
         ...(autoPatch !== undefined ? { autoPatch } : {}),
+        ...(autoResolveConflicts !== undefined ? { autoResolveConflicts } : {}),
+        ...(autoFixCi !== undefined ? { autoFixCi } : {}),
         asJson,
     };
 }
@@ -445,7 +485,7 @@ export function parseStackResetArgs(args) {
     }
 }
 export async function cmdStackCreate(args, deps = {}) {
-    const { name, onto, trunk: trunkFlag, extend, autoLand, autoReview, autoPatch, asJson, } = parseStackCreateArgs(args);
+    const { name, onto, trunk: trunkFlag, extend, autoLand, autoReview, autoPatch, autoResolveConflicts, autoFixCi, asJson, } = parseStackCreateArgs(args);
     const cwd = deps.cwd ?? process.cwd();
     const gitTopLevelFn = deps.gitTopLevel ?? gitTopLevel;
     const worktreeDirtyFn = deps.worktreeDirty ?? worktreeDirty;
@@ -525,6 +565,8 @@ export async function cmdStackCreate(args, deps = {}) {
             autoEnqueueWhenReady: autoLand,
             autoReviewOverride: autoReview,
             autoPatchOverride: autoPatch,
+            autoResolveConflictsOverride: autoResolveConflicts,
+            autoFixCiOverride: autoFixCi,
         });
     }
     catch (err) {
@@ -573,7 +615,7 @@ export async function cmdStackCreate(args, deps = {}) {
     await present("Stack", created);
 }
 export async function cmdStackSubmit(args, deps = {}) {
-    const { extend, autoLand, autoReview, autoPatch, rest, asJson } = parseStackSubmitArgs(args);
+    const { extend, autoLand, autoReview, autoPatch, autoResolveConflicts, autoFixCi, rest, asJson } = parseStackSubmitArgs(args);
     const api = rest ? "rest" : githubApiFromEnv(deps.env ?? process.env);
     const progress = (message) => {
         if (asJson)
@@ -687,6 +729,8 @@ export async function cmdStackSubmit(args, deps = {}) {
         autoLand: pick(autoLand, stored?.autoEnqueueWhenReady),
         autoReview: pick(autoReview, stored?.autoReviewOverride),
         autoPatch: pick(autoPatch, stored?.autoPatchOverride),
+        autoResolveConflicts: pick(autoResolveConflicts, stored?.autoResolveConflictsOverride),
+        autoFixCi: pick(autoFixCi, stored?.autoFixCiOverride),
     });
     const existingPrs = new Map();
     for (const plan of plans) {
@@ -1062,6 +1106,12 @@ export function stackSetSummary(parsed) {
     if (parsed.autoPatch !== undefined) {
         lines.push(`Auto-patch ${tri(parsed.autoPatch)}`);
     }
+    if (parsed.autoResolveConflicts !== undefined) {
+        lines.push(`Auto-resolve merge conflicts ${tri(parsed.autoResolveConflicts)}`);
+    }
+    if (parsed.autoFixCi !== undefined) {
+        lines.push(`Auto-fix failing CI ${tri(parsed.autoFixCi)}`);
+    }
     return lines;
 }
 export function withWatch(body, watch) {
@@ -1076,6 +1126,10 @@ export async function cmdStackSet(args, deps = {}) {
         ...(parsed.autoLand !== undefined ? { autoEnqueueWhenReady: parsed.autoLand } : {}),
         ...(parsed.autoReview !== undefined ? { autoReviewOverride: parsed.autoReview } : {}),
         ...(parsed.autoPatch !== undefined ? { autoPatchOverride: parsed.autoPatch } : {}),
+        ...(parsed.autoResolveConflicts !== undefined
+            ? { autoResolveConflictsOverride: parsed.autoResolveConflicts }
+            : {}),
+        ...(parsed.autoFixCi !== undefined ? { autoFixCiOverride: parsed.autoFixCi } : {}),
     }, cfg);
     const watch = openStackWatch(parsed.stackId, { unread: true });
     if (parsed.asJson) {
@@ -1088,9 +1142,9 @@ export async function cmdStackSet(args, deps = {}) {
     ]);
 }
 async function cmdStackAdopt(args) {
-    const { owner, repo, prNumber, autoLand, autoReview, autoPatch, asJson } = parseStackAdoptArgs(args);
+    const { owner, repo, prNumber, autoLand, autoReview, autoPatch, autoResolveConflicts, autoFixCi, asJson, } = parseStackAdoptArgs(args);
     const cfg = await loadConfig();
-    const body = await adoptStack(owner, repo, prNumber, cfg, openPolicyPatch({ autoLand, autoReview, autoPatch }));
+    const body = await adoptStack(owner, repo, prNumber, cfg, openPolicyPatch({ autoLand, autoReview, autoPatch, autoResolveConflicts, autoFixCi }));
     const adoptedId = typeof body === "object" && body !== null
         ? body.stack?.id
         : undefined;

package/dist/stack-blockers.d.ts

@@ -44,6 +44,7 @@ export type StackRepairHint = {
     liveParent: string | null;
     files: string[];
     steps: string;
+    note?: string;
 } | {
     kind: "ci_failure";
     prNumber: number;
@@ -51,6 +52,7 @@ export type StackRepairHint = {
     branch: string;
     failingCheck: string | null;
     steps: string;
+    note?: string;
 } | {
     kind: "vortex_findings";
     prNumber: number;
@@ -161,6 +163,8 @@ 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 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";
@@ -201,7 +205,7 @@ export declare function restackFailedRepairSteps(branch: string, liveParent: str
     kind: string;
     detail?: string | null;
 }): string;
-export declare function agentsCannotClear(reason: StackBlockerReason): boolean;
+export declare function agentsCannotClear(reason: StackBlockerReason, stack?: StackDto, layer?: StackLayerDto): boolean;
 export declare function stackRepair(stack: StackDto, attention: ClassifiedStackBlocker | null, layer: StackLayerDto | undefined, bounce: MergeQueueEntryDto | undefined, queueWait?: MergeQueueWait | null): StackRepairHint | null;
 export declare const LAND_PR_MISSING_PREFIX = "No open land PR for ";
 /** Pair-gate attention plus live hard blocks on every other open layer. */

package/dist/stack-blockers.js

@@ -86,10 +86,63 @@ const CYCLONE_HANDOFF_WORDS = {
     unsupported_language: "the findings are in a language Cyclone does not patch",
     policy_owner_changed: "the stack's owner changed while the patch was queued",
     patch_job_lost: "Cyclone's patch job was lost before it finished",
+    conflict_needs_person: "Cyclone could not resolve the conflict and left it for a person",
+    conflict_unresolved: "Cyclone's conflict resolution failed",
+    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("_", " ");
 }
+function isLandPrLayer(stack, layer) {
+    return layer.prNumber === stack.unit?.landPrNumber || (!!stack.unit?.branch && layer.branch === stack.unit.branch);
+}
+export function autoResolveActive(stack, layer) {
+    return !stack.cycloneConflictOff && !isLandPrLayer(stack, layer) &&
+        !sameHead(layer.cycloneConflictHandoff?.headSha, layer.headSha);
+}
+function conflictHandoffNote(stack, layer) {
+    if (isLandPrLayer(stack, layer))
+        return null;
+    const handoff = layer.cycloneConflictHandoff;
+    if (handoff && sameHead(handoff.headSha, layer.headSha)) {
+        return `Cyclone tried to resolve this conflict at ${layer.headSha ?? handoff.headSha} and left it for a person (${cycloneHandoffWords(handoff.reason)}), so it will not try this head again.`;
+    }
+    if (stack.cycloneConflictOff) {
+        return `Cyclone will not resolve this conflict by itself: ${cycloneHandoffWords(stack.cycloneConflictOff)}.`;
+    }
+    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;
@@ -530,7 +583,10 @@ const AGENTS_CANNOT_CLEAR = [
     "vortex_skipped",
     "unit_abandoned",
 ];
-export function agentsCannotClear(reason) {
+const AUTO_RESOLVE_REASONS = ["restack_conflict", "merge_conflict"];
+export function agentsCannotClear(reason, stack, layer) {
+    if (stack && layer && AUTO_RESOLVE_REASONS.includes(reason) && autoResolveActive(stack, layer))
+        return false;
     return AGENTS_CANNOT_CLEAR.includes(reason);
 }
 export function stackRepair(stack, attention, layer, bounce, queueWait = null) {
@@ -553,6 +609,7 @@ export function stackRepair(stack, attention, layer, bounce, queueWait = null) {
     const mergeConflict = reason === "merge_conflict";
     if (restackConflict || mergeConflict) {
         const liveParent = landPr ? landPrLiveParent(stack, layer) : conflictLiveParent(stack, layer);
+        const note = conflictHandoffNote(stack, layer);
         return {
             kind: restackConflict ? "restack_conflict" : "merge_conflict",
             prNumber: layer.prNumber,
@@ -561,6 +618,7 @@ export function stackRepair(stack, attention, layer, bounce, queueWait = null) {
             liveParent,
             files: conflictFiles(layer, bounce),
             steps: conflictRepairSteps(layer.branch, liveParent),
+            ...(note ? { note } : {}),
         };
     }
     if (reason === "restack_failed" && layer.restackError) {
@@ -714,6 +772,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,
@@ -721,6 +780,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;
@@ -872,7 +932,7 @@ export function stackBlockers(stack, entries = [], cursor = {}, nowMs = Date.now
     const landGatePending = landLayer && landing && landGateIsPending(landing)
         ? { prNumber: landLayer.prNumber, headSha: landLayer.headSha ?? null, reason: landing }
         : null;
-    if (busy.length && attention && classified && agentsCannotClear(classified.reason)) {
+    if (busy.length && attention && classified && agentsCannotClear(classified.reason, stack, attentionLayer)) {
         const held = { ...attention, actAfter: "agents_idle", waitingOn: busy.map((entry) => entry.agent) };
         return { attention: null, held, issues: [attention, ...issues], currentCandidate, bounce: undefined, busy, agents,
             repair: stackRepair(stack, classified, attentionLayer, undefined, queueWait), landGatePending, queueWait: queued };

package/dist/stack-dto.d.ts

@@ -115,7 +115,8 @@ export type StackAgentsBusy = {
     headSha: string | null;
 };
 export declare const STACK_AGENT_QUEUED_STALE_MS: number;
-export declare function deriveStackAgentsBusy(layer: Pick<StackLayerDto, "headSha" | "vortexStatus" | "cycloneStatus" | "agentRuns" | "vortexReview">, opts?: {
+export declare const AUTO_RESOLVE_ENQUEUE_GRACE_MS: number;
+export declare function deriveStackAgentsBusy(layer: Pick<StackLayerDto, "headSha" | "vortexStatus" | "cycloneStatus" | "agentRuns" | "vortexReview" | "cycloneConflictPendingSince" | "cycloneCiPendingSince">, opts?: {
     cycloneClaimed?: boolean;
     nowMs?: number;
 }): StackAgentsBusy;
@@ -212,6 +213,10 @@ export type StackLayerDto = {
     vortexReview?: StackVortexReviewView;
     agentsBusy?: StackAgentsBusy | null;
     cycloneHandoff?: StackCycloneHandoff | null;
+    cycloneConflictHandoff?: StackCycloneHandoff | null;
+    cycloneConflictPendingSince?: string | null;
+    cycloneCiHandoff?: StackCycloneHandoff | null;
+    cycloneCiPendingSince?: string | null;
     conflictDetail: string | null;
     restackError?: RestackError | null;
     lastRestackedSha: string | null;
@@ -305,6 +310,8 @@ 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;
@@ -361,6 +368,8 @@ export type StackDto = {
      * account `auto_patch_enabled` flag; a boolean wins in both directions.
      */
     autoPatchOverride?: boolean | null;
+    autoResolveConflictsOverride?: boolean | null;
+    autoFixCiOverride?: boolean | null;
     /**
      * Bearer / stack-row user. Cyclone apply follows this user's auto-patch
      * policy and credits for an adopted stack (HOUSE-1), even when
@@ -382,6 +391,8 @@ export type StackDto = {
      */
     cycloneOwnerMatch?: CycloneOwnerMatch;
     cyclonePatchOff?: CyclonePatchOffReason;
+    cycloneConflictOff?: CycloneConflictOffReason;
+    cycloneCiOff?: CycloneCiOffReason;
     infrastructureInstallUserId?: string | null;
     infrastructureOwnerMatch?: CycloneOwnerMatch;
     layers: StackLayerDto[];

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 STACK_AGENT_QUEUED_STALE_MS = 15 * 60 * 1000;
+export const AUTO_RESOLVE_ENQUEUE_GRACE_MS = 2 * 60_000;
 function agentShaMayBeHead(sha, head) {
     const left = sha?.trim().toLowerCase();
     const right = head?.trim().toLowerCase();
@@ -36,18 +37,26 @@ export function deriveStackAgentsBusy(layer, opts = {}) {
     const nowMs = opts.nowMs ?? Date.now();
     const runs = (layer.agentRuns ?? []).filter((run) => !run.finishedAt);
     const vortexRuns = runs.filter((run) => run.agent === "vortex" && agentShaMayBeHead(run.sha, headSha));
-    const freshQueued = vortexRuns.some((run) => {
+    const queuedFresh = (run) => {
         const queuedAt = Date.parse(run.startedAt ?? "");
         return run.status === "queued" && Number.isFinite(queuedAt) && nowMs - queuedAt <= STACK_AGENT_QUEUED_STALE_MS;
-    });
+    };
+    const freshQueued = vortexRuns.some(queuedFresh);
     const review = layer.vortexReview;
     const reviewOnHead = !!review && agentShaMayBeHead(review.head_sha, headSha);
     const vortex = (reviewOnHead && review.status === "reviewing") ||
         vortexRuns.some((run) => run.status === "reviewing") ||
         freshQueued ||
         (layer.agentRuns === undefined && review === undefined && layer.vortexStatus === "reviewing");
+    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" && run.status === "patching") ||
+        runs.some((run) => run.agent === "cyclone" && agentShaMayBeHead(run.sha, headSha) && queuedFresh(run)) ||
+        withinGrace(layer.cycloneConflictPendingSince) ||
+        withinGrace(layer.cycloneCiPendingSince);
     return { vortex, cyclone, headSha };
 }
 /** Every bounce kind understood by the shared contract. */

package/dist/stack-meta.d.ts

@@ -9,6 +9,8 @@ export type LocalStack = {
     /** Per-open override carried from `stack create` to `stack submit`; absent = account flag. */
     autoReviewOverride?: boolean;
     autoPatchOverride?: boolean;
+    autoResolveConflictsOverride?: boolean;
+    autoFixCiOverride?: boolean;
 };
 export type StackMeta = {
     version: 2;
@@ -30,6 +32,8 @@ export type LocalStackPolicy = {
     autoEnqueueWhenReady?: boolean;
     autoReviewOverride?: boolean;
     autoPatchOverride?: boolean;
+    autoResolveConflictsOverride?: boolean;
+    autoFixCiOverride?: boolean;
 };
 export declare function setActivePolicy(meta: StackMeta, policy: LocalStackPolicy): StackMeta;
 export declare function saveStackMeta(meta: StackMeta, cwd?: string, stacksRoot?: string): Promise<void>;

package/dist/stack-meta.js

@@ -12,6 +12,8 @@ const LOCAL_STACK_FLAGS = [
     "autoEnqueueWhenReady",
     "autoReviewOverride",
     "autoPatchOverride",
+    "autoResolveConflictsOverride",
+    "autoFixCiOverride",
 ];
 /** Exported only for legacy migration/tests. New state never uses this path. */
 export const STACK_META_REL = LEGACY_STACK_META_REL;

package/dist/ui/banner.js

@@ -167,6 +167,12 @@ const WHATS_NEW = {
     "0.3.43": [
         "watch --ignore holds a blocker as its minutes tick",
     ],
+    "0.3.44": [
+        "Cyclone can auto-resolve stack conflicts",
+    ],
+    "0.3.45": [
+        "Cyclone can auto-fix red stack CI",
+    ],
 };
 function densityFromVariant(variant) {
     if (variant === "mini" || variant === "nano")

package/package.json

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

@@ -7,6 +7,10 @@ description: Watch stacks explicitly named by the human while Auto land is on, p
 
 Use only these shipped Mergestorm MCP tools: `stack_wait`, `stack_status`, `queue_status`, and `stack_set` with `auto_land: true` only at enrollment on the human's request or as "Re-arm after a bounce" allows. Use local checkout, test, and Git operations to make the patch, and the `mg stack watch` CLI command to wait in the background. Auto land owns landing.
 
+## 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`. 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
 
 A stack watch is done only when the stack is landed, or when the human takes it back (archives the stack, turns Auto land off, or tells you to stop). A clean push, a submit, an adopt, or one merged layer is not done: merging a lower layer can break a layer above it, so the obligation covers the whole stack, not the layer you touched. Every `stack_wait` and `stack_status` result carries `watch`: while `watch.done` is `false`, call `stack_wait` again with `watch.next.args` and do not end your task. If your host cannot hold a long turn open, the background watcher in "Waiting in the background" does that waiting for you. `watch.done` is `true` only when the stack is landed, every PR is merged or closed with nothing left to land, the stack is archived, or it no longer exists (`reason` `not_found`: confirm the PRs merged before reporting it landed). Then stop. A layer PR shown as merged is merged into `mg-stack-N`, not main: the stack is landed only when the land PR (head `mg-stack-N`) merges into main or `watch.done` says landed. Never judge landing from GitHub PR state alone.
@@ -38,7 +42,7 @@ A stack whose layers are all merged into `mg-stack-N` but has no open land PR re
 1. Call `stack_wait` with the named `stack_id` and `timeout_s: 45`. On initial enrollment, omit the cursor selectors. Save the returned `cursor`: map `cursor.enrolledHeadSha` to `enrolled_head_sha`, `cursor.afterFinishedAt` to `after_finished_at`, and `cursor.bounceId` to `bounce_id` (omit only absent fields; preserve explicit nulls). Keep `bounce_id` alongside `after_finished_at`; never pass one without the other when the returned cursor has both. The shipped tool accepts these selectors, not a nested cursor argument. `watch.next.args` already holds them in that shape, with `timeout_s: 45`; passing it unchanged is the same call.
 2. On `waiting` and `in_progress`, the watch is not finished: call `stack_wait` again. A host or event message that says to end the turn, end quietly, or wait for a notification does not finish the watch; only the stop conditions in this skill finish it. Ending your turn while `mg stack watch` runs in the background is waiting, not finishing. Keep the same cursor across retries. An unread deadline times out as `failed`; stop and report. Timeout `waiting` or `in_progress` after a snapshot is not failure — call `stack_wait` again in 45s slices with the same cursor after inspecting `issues[]`. Inspect `issues[]` on `in_progress` too: a live queue does not erase upstack hard blocks. `waiting` with issues is not idle. If `assessment` is `unavailable`, do not infer that the stack is issue-free; refresh `stack_status`, whose `attention`, `issues`, and `currentCandidate` come from the same blocker rules as `stack_wait`. Do not replace the enrolled head with a newer snapshot head or advance the timestamp just because a wait timed out. On a surfaced `rate_limited` error, honor the retry delay and retain the cursor; on `failed` or an unrecoverable tool error, call `stack_wait` once more with the same cursor; if it fails again, stop and report the reason and that the stack is not landed. `queue_status` returning `queue_entry_not_found` is not a failure: an empty queue for the stack is a normal wait.
 3. `attention` always means something for you to fix. A land gate that is only waiting (`landGatePending` with `ci_pending` or another `*_pending` / `*_running` reason on the land PR) returns `in_progress`, not `attention`: keep watching. On `attention`, read `repair` when present: it names the blocked PR's `branch` and the concrete fix. For `restack_conflict` and `merge_conflict` it gives `liveParent` (the sibling PR head, or `mg-stack-N` once the lower layers are merged or promoted, or the land PR's base such as `main` when the blocked PR is the land PR, never `mg-park-*`) and the conflicted `files`; a null `liveParent` means stop and tell the human. For `ci_failure` it names the failing check. A stack whose `autoLandOff.reason` is `bounced` (a `merge_failed`, `gh_error`, or `ci_timeout` bounce turned Auto land off and nobody took the stack back since) returns `attention` with the blocker `Auto land off after <kind> bounce`, the bounce in `issues[]`, and a `repair` of kind `auto_land_off`; handle it as "Re-arm after a bounce" describes. A stack whose review unit was abandoned because a human moved its bottom PR off `mg-stack-N` returns `attention` with the blocker `Review unit abandoned: based on <base>` and a `repair` of kind `unit_abandoned`: do not patch or retarget anything. Ask the human whether to re-root it: if at least two PRs remain open, tell them that `mg stack adopt owner/repo#<bottom PR>` re-roots it on a new review unit; with only one open PR, re-adopting will not create a review unit, so tell them to close and resubmit it to create a fresh stack, then stop. Auto land records why it is waiting in the stack's `autoLandWait` (`reason`, `prNumber`, `headSha`, `since`), and the watch returns `attention` on that PR when the wait cannot clear on its own: a failing check Auto land reads live on GitHub while the ledger may still show CI green (blocker `CI failed — Auto land reads a failing check on GitHub at this head`, `repair` kind `ci_failure`); a check pending for 45 minutes (`repair` kind `ci_pending`: find the check that never finished and re-run it, or tell the human when no workflow reports it); no approving Vortex review for 30 minutes with no Vortex run working (`repair` kind `vortex_not_green`: fix or dismiss the findings, or tell the human when no review exists at the head); and a promote GitHub refused 3 times with `merge_failed`, after which Auto land stops retrying that head (`repair` kind `promote_failed`: fix the cause on the PR and push a new head, or tell the human when the cause is outside the PR; never toggle Auto land yourself for it). The watch also returns `attention` when GitHub refuses to let Mergestorm read the head's check runs or commit statuses (blocker `Mergestorm cannot read ... on this head`, `repair` kind `ci_unreadable`: do not patch or push; tell the human to grant the Mergestorm GitHub App the permission the repair names), and when any other wait reason has held for 45 minutes, a land gate left pending or running on the land PR included (blocker `Auto land has waited <N>m: <reason in plain words>`, `repair` kind `auto_land_waiting`: read `stack_status`, fix what a commit on the named branch can fix, otherwise tell the human what Auto land waits for and since when). A merge queue entry that has sat queued for 45 minutes with nothing working on it or ahead of it returns `attention` with the blocker `Merge queue stuck: ...` and a `repair` whose kind is queue_stalled: do not patch or push; tell the human. A Vortex review skipped because the PR author is on the ignored authors list, or because reviews are turned off for the repository, returns `attention` at once with a `repair` of kind `vortex_skipped`; a Vortex retry that is scheduled (`Vortex hit a temporary error on this head and will retry by itself`) is a wait listed in `issues[]`, never `attention`. `Review failed` carries a `repair` of kind `vortex_failed`: comment `@mergestorm-vortex review` on the PR or push a new commit, and tell the human if it fails again. A PR open on `mg-stack-N` that is not a layer of the stack returns `attention` at once with the blocker `The land PR cannot be queued: ...` and a `repair` of kind `members_remaining`: do not patch or push; close, retarget or adopt that PR (a draft or fork PR cannot be adopted). A layer whose live head has a Vortex verdict that requests changes after Cyclone left those findings for a person (a hold directive, the Vortex patch cap, auto-patch off, no billing, a batch it gave up on, or a PR state it could not read) returns `attention` with the blocker `Vortex findings need a person` and a `repair` of kind `vortex_findings` naming the Cyclone reason (`handoff`) and where the review is (`findings`): verify each finding against the checkout, fix the real ones with the smallest patch and an ordinary push, and tell the human about the ones you judge wrong. `repair` does not replace the checks below. On `attention`, fix the named PR: `prNumber` and `headSha` identify the blocked PR, while `currentCandidate` identifies the promote candidate. The gate covers the bottom and its direct child only when the child has current-head DIRTY on the live bottom branch. A GitHub DIRTY whose `parentBranch` starts with `mg-park-` is not that gate. Refresh `stack_status`; use `queue_status` with the same `stack_id` when bounce details are needed. Verify the blocker still applies to the current PR head. Never treat `verifyHeadSha` as the current head: it is a queue verification SHA and can be stale or synthetic. Compare the live PR branch head, the current stack layer head, and the checkout before editing. Read the live PR head with `git ls-remote origin refs/heads/<branch>` or `gh api repos/OWNER/REPO/pulls/N --jq .head.sha`. If you need CI logs, use `gh run list --branch <branch>`, `gh run view <run-id> --log-failed`, or `gh api repos/OWNER/REPO/commits/SHA/check-runs`. Read GitHub only through git and these REST calls; do not use other `gh pr` subcommands. Restack `clean` does not mean mergeable or CI-green. Attention is a diagnosis, not permission to mutate stack or queue policy; the only policy change you make is the re-arm in "Re-arm after a bounce". A bounce is the reason to look, not the moment to commit. `stack_wait` and `stack_status` hold the blocked PR's attention themselves while Vortex or Cyclone is still working on that PR, whatever the blocker (a red CI failure, a merge conflict, a bounce, Draft, a failed restack or review): they return `in_progress` instead of `attention`, with `busy[]` naming the PR (`prNumber`, `headSha`), the `blocker`, and the `agent` (`vortex` or `cyclone`), and `agents` carrying that PR's `vortexStatus`, `cycloneStatus`, `vortexReview`, and `busy` flags. `in_progress` with a nonempty `busy[]` means do not patch yet: keep calling `stack_wait` with the same cursor until that work has finished and the watch returns `attention`, then make the follow-up commit. You do not need an extra `stack_status` refresh each slice for this check. A nonempty `busy[]` reports still-working agents on that PR's current head. Vortex holds when `vortexReview` is `reviewing` at the head, an unfinished vortex `agentRuns` row at the head is `reviewing`, or an unfinished vortex run at the head is `queued` and started within the last 15 minutes (with no `agentRuns` or `vortexReview` on the layer, `vortexStatus` `reviewing` holds). Cyclone holds when `cycloneStatus` is `patching`, an unfinished cyclone `agentRuns` row is `patching`, or the server sees a live Cyclone patch lease or an open Cyclone check run on the head. `seam_pending` alone, and a `queued` run older than 15 minutes, are not treated as work in progress. `all_clear`, `findings`, `skipped`, `failed`, `throttled`, `awaiting_fix`, and a null status are finished. A queued Vortex run holds for at most 15 minutes; reviewing and patching hold until the run finishes or its lease or check run is cleared. A blocker no Vortex or Cyclone run can clear is not hidden by the hold: a merge conflict vs the live parent, a restack `Conflict` or `Restack failed` (a parked freeze included), a Draft PR, `Seam review pending, no review running`, or `Review skipped, out of review quota`. For those the envelope stays `in_progress` but names the blocker in the top-level `blocker`, `prNumber`, `headSha`, and `issues[]`, with `actAfter: "agents_idle"`, `waitingOn` listing the busy agents, and `repair` when there is one. Plan the fix from it, but do not patch, merge, or push while `actAfter` is set: keep calling `stack_wait` with the same cursor, and act when a snapshot after the agents finish returns `attention`; a Cyclone push can change or clear the blocker, so re-read it then. Blockers the agents can change (a red CI failure, a failed review, seam findings, a bounce) keep the plain hold: `blocker` is null, `actAfter` is null, and only `busy[]` names them. If a hold looks stuck, refresh `stack_status` and tell the human. Do not turn Cyclone off or Auto land off, and do not turn Auto land on to end the wait; turn it on only as "Re-arm after a bounce" allows. If the remote head moves while you wait, stop and tell the human.
-4. Use a clean worktree on that named PR's head branch and record the remote starting SHA. Fix the current blocker with the smallest patch, and run the relevant checks. For conflicts, the live parent is the sibling PR head or the unit branch (`mg-stack-N`, Mergestorm's owned trunk, not an alias for main) — not the DTO `parentBranch` when that field starts with `mg-park-*`. If `parentBranch` is `mg-park-*`, never merge or rebase onto it; if the real live parent is unknown, stop. The land PR is the one PR whose head is `mg-stack-N`: its live parent is its base (`main`), and merging that base into `mg-stack-N` with an ordinary push is its conflict repair, the same as for any other layer. Cyclone patches a land PR when auto-patch is on for that stack, otherwise you do: when `busy[]` shows no Cyclone run on it, fix its blocker with the smallest patch on `mg-stack-N` and push with an ordinary push, never a force push; while Cyclone is patching it the envelope stays `in_progress` with `busy[]`, so wait. For a conflict, prefer merging that live parent into the PR branch, resolving locally, then an ordinary push. Do not click Dashboard Continue yourself: Continue is a human action, and you relay it to the human only when step 5 or a `repair` names it. When the live parent is a sibling, never rebase onto trunk or `mg-stack-N` instead. Parked-freeze DIRTY alone needs no conflict patch. Leave GitHub bases as Mergestorm set them: the bottom of a 2+ PR stack is based on `mg-stack-N`, layer 2 on layer 1, PR3+ on `mg-park-*`.
+4. Use a clean worktree on that named PR's head branch and record the remote starting SHA. Fix the current blocker with the smallest patch, and run the relevant checks. For conflicts, the live parent is the sibling PR head or the unit branch (`mg-stack-N`, Mergestorm's owned trunk, not an alias for main) — not the DTO `parentBranch` when that field starts with `mg-park-*`. If `parentBranch` is `mg-park-*`, never merge or rebase onto it; if the real live parent is unknown, stop. The land PR is the one PR whose head is `mg-stack-N`: its live parent is its base (`main`), and merging that base into `mg-stack-N` with an ordinary push is its conflict repair, the same as for any other layer. Cyclone patches Vortex findings on a land PR when auto-patch is on for that stack; every other land PR blocker, a conflict with main or failing CI included, is yours: when `busy[]` shows no Cyclone run on it, fix it with the smallest patch on `mg-stack-N` and push with an ordinary push, never a force push; while Cyclone is patching findings on it the envelope stays `in_progress` with `busy[]`, so wait. For a conflict, prefer merging that live parent into the PR branch, resolving locally, then an ordinary push. Do not click Dashboard Continue yourself: Continue is a human action, and you relay it to the human only when step 5 or a `repair` names it. When the live parent is a sibling, never rebase onto trunk or `mg-stack-N` instead. Parked-freeze DIRTY alone needs no conflict patch. Leave GitHub bases as Mergestorm set them: the bottom of a 2+ PR stack is based on `mg-stack-N`, layer 2 on layer 1, PR3+ on `mg-park-*`.
 5. CI-only fixes may run while Cyclone auto-patch is still on for the stack. Auto-patch may stay on, and you still wait until the current Vortex run and the current Cyclone run on that PR have finished before the follow-up commit. When the gate is clean, inspect `issues[]` and fix a live upstack CI failure one PR at a time, refreshing the gate before the next PR. Do not use higher-layer bounce history as a patch target. Do not fight Cyclone: if the remote head moved, stop and tell the human. Do not take over Cyclone's review-finding work while it is active; if the blocker requires that or a policy/queue action rather than a concrete patch, stop and explain what needs human attention. On a `Seam findings` blocker, read that PR's seam finding, the Vortex review "Integration review — IU <n> seam" (`gh api repos/OWNER/REPO/pulls/N/reviews` and `gh api repos/OWNER/REPO/pulls/N/comments`), and patch its concrete findings on that PR's head; a "Decision required" seam finding needs a human, so tell them and do not guess. A seam finding you verified is wrong is recorded with `mg dismiss` (the audited dismissal in `mergestorm-pr-loop`) at that PR's live head and that seam review's id; a `mergestorm-loop: dismiss` comment alone does not clear the seam gate. On `Seam review failed`, do not patch; tell the human, unless a new push already has a seam re-review held in `busy[]`. On `Seam review pending, no review running`, do not patch; tell the human: the seam review was skipped (usually because the monthly review limit is reached) and nothing re-runs it until they raise the limit and click Continue on the stack, or push a new head. On `Seam review stuck in reviewing, no review running`, `Seam re-review pending, no review running`, or `Seam verdict is for an older head, no review running` (repair kind `seam_review_stuck`), do not patch or push; tell the human: no seam review is queued or running for that PR's live head, and clicking Continue on the stack re-queues it (a new pushed head also does). On `Review skipped, out of review quota`, do not patch; tell the human: the review credit limit for the period is reached and nothing re-reviews that head until they raise the limit and push a new head or re-run the review.
 6. Recheck Auto land (off is expected only after a disarming bounce you are handling) and the remote PR head (`git ls-remote origin refs/heads/<branch>`) immediately before pushing. Commit the patch and push the PR head with an ordinary push. A rebase onto that same live parent followed by force-with-lease is allowed only if the remote is still exactly the SHA you started from and Cyclone did not move it; use an explicit lease bound to that starting SHA. This exception never permits rebasing onto a parked freeze or substituting trunk / the unit for a sibling parent. If the remote head moved or the push is rejected because it moved, stop; do not rebase and retry.
 7. After your successful push, leave a clean worktree and keep watching the named stack. Start a new watch cycle with `enrolled_head_sha` set to the SHA you pushed (in the background: `mg stack watch <stack-id> --head <pushed-sha>`). If you handled a bounce, retain the returned `cursor.afterFinishedAt` as `after_finished_at` and `cursor.bounceId` as `bounce_id` so that attempt is not handled again. Keep these selectors unchanged across subsequent retries. Continue watching; do not enqueue anything. If the bounce you handled turned Auto land off, turn it back on as "Re-arm after a bounce" allows; if that section does not allow it, report and stop.