mergestorm 0.3.39 → 0.3.41

package/README.md

@@ -45,7 +45,7 @@ On a TTY, bare `mergestorm` (or `mergestorm shell`) opens a branded REPL: a comp
 
 ```
 ╭──────────────────────────────────────────────────────────────────────────────╮
-│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.39                                             │
+│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.41                                             │
 │ ▀▀▀▀▀▀▀▀▀     ● msk_live_… · maelstrom                                       │
 │  ▀▀▀▀▀▀       [████████░░░░░░░░░░░░░░░░░░░░░░] 25% used                      │
 │   ▝▀▀▀▀▀      local reviews + stacked PRs · mergestorm.ai                    │
@@ -103,12 +103,12 @@ mergestorm dismiss <owner/repo>#<n> --head <sha> --review <id> --finding <id> --
 
 ### Watching a stack in the background
 
-`mg stack watch <stack-id>` is for agents that cannot hold a long turn open. Run it as a background command, have your host notify you on output matching `MS-WATCH (ATTENTION|LANDED)`, and end the turn. While it waits it spends no model tokens and talks only to the Mergestorm API, not GitHub.
+`mg stack watch <stack-id>` is for agents that cannot hold a long turn open. Run it as a background command only after confirming that your host can resume the task on completion or output matching `MS-WATCH (ATTENTION|LANDED)`. The process monitors the stack; it does not itself resume a Codex, Claude Code, or Cursor conversation. Without a notification mechanism, keep using bounded `stack_wait` calls or explicitly report that automatic follow-up is unavailable. While it waits it spends no model tokens and talks only to the Mergestorm API, not GitHub.
 
 - It calls `stack wait` in slices of at most 300s and carries the cursor (`enrolled_head_sha`, `after_finished_at`, `bounce_id`) from one slice to the next.
 - It prints nothing while the stack is `waiting` or `in_progress`, including while Cyclone or Vortex holds the blocked PR (`busy[]`, `actAfter: "agents_idle"`).
 - On attention it prints `MS-WATCH ATTENTION pr=<n> head=<sha> blocker="<blocker>" repair=<kind>` and exits 3.
-- When the watch is done it prints `MS-WATCH LANDED stack=<id> reason=<reason>` and exits 0. Only `reason=landed` is a landed stack; `closed`, `archived` and `not_found` end the watch without a land.
+- A confirmed landing prints `MS-WATCH LANDED stack=<id> reason=landed` and exits 0. `closed`, `archived` and `not_found` end the watch with `MS-WATCH ATTENTION stack=<id> reason=<reason>` and exit 3. A missing stack does not prove a landing; verify each PR before reporting it merged.
 - A failed read is retried once. If the retry fails too, it prints `MS-WATCH ATTENTION failed stack=<id> error="<message>"` and exits 3. A rate limit is waited out.
 - `--head <sha>` enrolls the SHA you just pushed. After fixing a blocker, restart the watcher with it.
 - `--ignore <text>` keeps it silent on the first attention whose blocker contains that text (case-insensitive), until the blocker, its PR or its head changes. Use it for a blocker a human has taken over. Repeat the flag for more than one.
@@ -137,7 +137,7 @@ Use `mergestorm dismiss` when a Vortex finding is wrong and you have checked it
 
 If the parent branch is already a layer of a **registered** (submitted) stack, `create` and `submit` refuse unless you pass **`--extend`**. That blocks accidentally gluing an unrelated PR onto an open unit. Growing a registered stack on purpose: `mg stack create --onto <tip> --extend` → commit → `mg stack submit --extend`.
 
-`stack submit` walks the **active** local stack: `git push -u origin` each layer, opens a PR with `gh` (`--base` = parent or trunk; adopt then moves the bottom of a 2+ PR stack onto `mg-stack-<n>` — leave it there; skips heads that already have an open PR; body from the tip commit — Summary + Test plan, preserving Fixes/Closes/Resolves), registers the stack with `POST /api/v1/stacks/adopt` internally (Mergestorm API key), then drops that local stack entry so the next create onto trunk is clean. Push is always your local `git` credentials. PRs open as you when `gh` is installed and `gh api user` succeeds; otherwise `stack submit` asks the Mergestorm API (`POST /api/v1/stacks/pulls`) to open them as Cyclone on your behalf, after checking your GitHub account has write access, and assigns you. Without either, submit stops before pushing and links the Cyclone install page.
+`stack submit` walks the **active** local stack: `git push -u origin` each layer, opens a PR with `gh` (`--base` = parent or trunk; adopt then moves the bottom of a 2+ PR stack onto `mg-stack-<n>` — leave it there; skips heads that already have an open PR; body from the tip commit — Summary + Test plan, preserving Fixes/Closes/Resolves), registers the stack with `POST /api/v1/stacks/adopt` internally (Mergestorm API key), then drops that local stack entry so the next create onto trunk is clean. Push is always your local `git` credentials. PRs open as you when `gh` is installed and `gh api user` succeeds; otherwise `stack submit` asks the Mergestorm API (`POST /api/v1/stacks/pulls`) to open them as the Mergestorm Surge App on your behalf, after checking your GitHub account has write access, and assigns you. Stacks, the merge queue and Auto land run through Surge, and Cyclone is the auto-patch App. Without Surge, submit stops before pushing and prints the server's message, which names the App to install and links its install page. `mg settings` prints a `Stacks, merge queue, Auto land` line when the server reports whether that App is ready.
 
 Legacy repo-local `.mergestorm/stack.json` state migrates automatically on the next stack command. If local authoring state is stale or malformed, use `mg stack reset --force`; this clears only pre-submit CLI state and never deletes branches, PRs, or registered stacks.
 

package/dist/api.d.ts

@@ -1,7 +1,8 @@
 import { type Config } from "./config.js";
 import { BEARER_SETTINGS_KEYS as SETTINGS_WRITABLE_KEYS, type BearerSettingsKey as SettingsWritableKey } from "./automation-catalog.js";
+import { CommandError } from "./errors.js";
 import type { MergeQueueEntryDto, StackDto } from "./stack-dto.js";
-export type { MergeQueueBounceDetail, MergeQueueBounceKind, MergeQueueEnqueuedBy, MergeQueueEnqueuedVia, MergeQueueEntryDto, MergeQueueEntryState, StackBranchState, StackCiStatus, StackDto, StackLayerChecks, StackLayerDto, StackReviewStatus, StackTempestStatus, StackUnitDto, StackUnitMemberDto, } from "./stack-dto.js";
+export type { MergeQueueBounceDetail, MergeQueueBounceKind, MergeQueueEnqueuedBy, MergeQueueEnqueuedVia, MergeQueueEntryDto, MergeQueueEntryState, StackBranchState, StackCiStatus, StackDto, StackLayerChecks, StackLayerDto, StackReviewStatus, StackUnitDto, StackUnitMemberDto, } from "./stack-dto.js";
 /** Default per-request timeout so a hung API cannot stall the shell/CI forever. */
 export declare const DEFAULT_API_TIMEOUT_MS = 30000;
 /** Message prefix of the CommandError thrown when a request exceeds its timeout. */
@@ -172,6 +173,7 @@ export type SettingsPatch = Partial<import("./automation-catalog.js").BearerSett
 export type SettingsResponse = import("./automation-catalog.js").BearerSettingsValues & {
     cyclone_connected: boolean;
     github_connected: boolean;
+    stacks_ready?: boolean;
 };
 /**
  * Fetch Bearer /api/v1/settings; null on 404/network/timeouts so panels can
@@ -228,13 +230,16 @@ export type StackPolicyPatch = {
 export declare function stackPolicyBody(policy: StackPolicyPatch | undefined): StackPolicyPatch;
 /** Adopt an open PR chain (Bearer POST /api/v1/stacks/adopt). */
 export declare function adoptStack(owner: string, repo: string, prNumber: number, cfg?: Config, policy?: StackPolicyPatch): Promise<unknown>;
+export declare const SURGE_REFUSAL_FALLBACK = "Mergestorm Surge is not installed or not ready on this repository. Install it from Agents.";
+export declare function surgeRefusal(body: unknown): CommandError | null;
+export declare const GITHUB_UNREADABLE_MESSAGE = "GitHub could not be read just now; try again.";
 /** Mint or reuse the PR3+ park freeze (Bearer POST /api/v1/stacks/:id/ensure-upper-park). */
 export declare function ensureUpperPark(stackId: string, cfg?: Config): Promise<{
     freezeBranch: string;
     created: boolean;
 }>;
-export declare const CYCLONE_INSTALL_URL = "https://github.com/apps/mergestorm-cyclone/installations/new";
-export declare function cycloneNotInstalledMessage(owner: string, repo: string, installUrl?: string): string;
+export declare const SURGE_INSTALL_URL = "https://github.com/apps/mergestorm-surge/installations/new";
+export declare function surgeNotInstalledMessage(owner: string, repo: string, installUrl?: string): string;
 export declare function findStackPull(cfg: Config, input: {
     owner: string;
     repo: string;

package/dist/api.js

@@ -1,6 +1,6 @@
 import { apiBase, loadConfig, resolveApiKey } from "./config.js";
 import { BEARER_SETTINGS_KEYS as SETTINGS_WRITABLE_KEYS, } from "./automation-catalog.js";
-import { CommandError, REVIEW_EXIT, rateLimitedMessage, } from "./errors.js";
+import { CommandError, REVIEW_EXIT, rateLimitedMessage, plainServerText, } from "./errors.js";
 /** Default per-request timeout so a hung API cannot stall the shell/CI forever. */
 export const DEFAULT_API_TIMEOUT_MS = 30_000;
 /** Message prefix of the CommandError thrown when a request exceeds its timeout. */
@@ -416,12 +416,53 @@ export async function adoptStack(owner, repo, prNumber, cfg, policy) {
             : code === "supabase_unconfigured"
                 ? "Stacks are not configured on this server."
                 : undefined;
+        const surge = surgeRefusal(body);
+        if (surge)
+            throw surge;
         throw new CommandError(message?.trim()
             ? message
             : fallbackMessage ?? `Failed to import stack (HTTP ${status}): ${JSON.stringify(body)}`, 1, code);
     }
     return body;
 }
+const INFRASTRUCTURE_REFUSAL_CODES = [
+    "cyclone_not_connected",
+    "cyclone_not_installed",
+    "cyclone_permission_missing",
+];
+function refusalReason(body) {
+    const reason = (body && typeof body === "object" ? body.reason : undefined);
+    return typeof reason === "string" && plainServerText(reason).trim() ? plainServerText(reason).trim() : undefined;
+}
+export const SURGE_REFUSAL_FALLBACK = "Mergestorm Surge is not installed or not ready on this repository. Install it from Agents.";
+export function surgeRefusal(body) {
+    if (!body || typeof body !== "object")
+        return null;
+    const refusal = body;
+    const reason = refusalReason(body);
+    if (!reason?.startsWith("surge_"))
+        return null;
+    const error = INFRASTRUCTURE_REFUSAL_CODES.find((code) => code === refusal.error);
+    if (!error)
+        return null;
+    const message = serverMessage(refusal.message) ?? SURGE_REFUSAL_FALLBACK;
+    const installUrl = githubAppInstallUrl(refusal.installUrl) ?? "";
+    return new CommandError(installUrl && !message.includes(installUrl) ? `${message} (${installUrl})` : message, 1, error, { reason });
+}
+export const GITHUB_UNREADABLE_MESSAGE = "GitHub could not be read just now; try again.";
+function serverMessage(message) {
+    if (typeof message !== "string")
+        return null;
+    const plain = plainServerText(message).trim();
+    return plain ? plain : null;
+}
+const GITHUB_APP_INSTALL_URL = /https:\/\/github\.com\/apps\/[^\s)]+\/installations\/new/;
+function githubAppInstallUrl(value) {
+    if (typeof value !== "string")
+        return null;
+    const match = GITHUB_APP_INSTALL_URL.exec(plainServerText(value).trim());
+    return match && match.index === 0 ? match[0] : null;
+}
 /** Mint or reuse the PR3+ park freeze (Bearer POST /api/v1/stacks/:id/ensure-upper-park). */
 export async function ensureUpperPark(stackId, cfg) {
     const body = await stackMutation(stackId, "/ensure-upper-park", "POST", {}, "Failed to ensure upper-park freeze", cfg);
@@ -437,22 +478,25 @@ export async function ensureUpperPark(stackId, cfg) {
         created: body.created === true,
     };
 }
-export const CYCLONE_INSTALL_URL = "https://github.com/apps/mergestorm-cyclone/installations/new";
-export function cycloneNotInstalledMessage(owner, repo, installUrl = CYCLONE_INSTALL_URL) {
-    return (`Opening PRs needs either the GitHub CLI (gh auth login) or Cyclone installed on ` +
+export const SURGE_INSTALL_URL = "https://github.com/apps/mergestorm-surge/installations/new";
+export function surgeNotInstalledMessage(owner, repo, installUrl = SURGE_INSTALL_URL) {
+    return (`Opening PRs needs either the GitHub CLI (gh auth login) or Mergestorm Surge installed on ` +
         `${owner}/${repo} (${installUrl}).`);
 }
 function installUrlFrom(message) {
     if (typeof message !== "string")
-        return CYCLONE_INSTALL_URL;
-    return message.match(/https:\/\/github\.com\/apps\/[^\s)]+\/installations\/new/)?.[0] ?? CYCLONE_INSTALL_URL;
+        return SURGE_INSTALL_URL;
+    return message.match(GITHUB_APP_INSTALL_URL)?.[0] ?? SURGE_INSTALL_URL;
 }
 function stackPullFailure(status, body, owner, repo, failLabel) {
     const rejection = (body && typeof body === "object" ? body : {});
+    const surge = surgeRefusal(body);
+    if (surge)
+        return surge;
     const text = `${String(rejection.error ?? "")} ${String(rejection.message ?? "")}`;
     if (rejection.error === "cyclone_not_installed" ||
         /not installed|installation[^\n]*not found/i.test(text)) {
-        return new CommandError(cycloneNotInstalledMessage(owner, repo, installUrlFrom(rejection.message)), 1, "cyclone_not_installed");
+        return new CommandError(surgeNotInstalledMessage(owner, repo, installUrlFrom(rejection.message)), 1, "cyclone_not_installed");
     }
     if (status === 404) {
         return new CommandError("Stacks API cannot open PRs on this server yet. Install the GitHub CLI (gh auth login) and retry.");
@@ -500,6 +544,9 @@ async function stackMutation(stackId, pathSuffix, method, json, failLabel, cfg)
         throw new CommandError("Stacks API is not available on this server yet. Deploy the API update or use the dashboard.");
     }
     if (status !== 200) {
+        const surge = surgeRefusal(body);
+        if (surge)
+            throw surge;
         const rejection = body;
         if (method === "PATCH" && rejection?.error === "cyclone_not_connected") {
             throw new CommandError(typeof rejection.message === "string" ? rejection.message : rejection.error, 1, "cyclone_not_connected");
@@ -554,7 +601,7 @@ export async function listMergeQueueEntries(cfg, opts) {
     }
     return entries;
 }
-async function queueMutation(route, failLabel, cfg) {
+async function queueMutation(route, failLabel, cfg, opts = {}) {
     const resolved = cfg ?? (await loadConfig());
     const { status, body } = await apiFetch(resolved, route, {
         method: "POST",
@@ -572,18 +619,27 @@ async function queueMutation(route, failLabel, cfg) {
     }
     if (status === 409) {
         const refusal = body;
-        if (refusal?.error === "conflict_unchanged" && typeof refusal.message === "string") {
+        if ((refusal?.error === "conflict_unchanged" || refusal?.error === "ci_failed") &&
+            typeof refusal.message === "string") {
             throw new CommandError(refusal.message);
         }
     }
+    if (opts.githubUnreadableRefusal &&
+        status === 503 &&
+        body?.error === "github_unreadable") {
+        throw new CommandError(serverMessage(body.message) ?? GITHUB_UNREADABLE_MESSAGE, 1, "github_unreadable");
+    }
     if (status < 200 || status >= 300) {
+        const surge = surgeRefusal(body);
+        if (surge)
+            throw surge;
         throw new CommandError(`${failLabel} (HTTP ${status}): ${JSON.stringify(body)}`);
     }
     return body;
 }
 /** Enqueue a stack for verified landing. */
 export async function enqueueStack(stackId, cfg) {
-    return queueMutation(`/api/v1/stacks/${encodeURIComponent(stackId)}/enqueue`, "Failed to add stack to merge queue", cfg);
+    return queueMutation(`/api/v1/stacks/${encodeURIComponent(stackId)}/enqueue`, "Failed to add stack to merge queue", cfg, { githubUnreadableRefusal: true });
 }
 /** Cancel a live merge-queue entry by entry id. */
 export async function cancelMergeQueueEntry(entryId, cfg) {

package/dist/commands/browse.d.ts

@@ -28,6 +28,11 @@ export declare function buildStatusTabLines(input: StatusTabInput): string[];
 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" | "review_unit_land_prs_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";
+    readonly off: "not ready (install Mergestorm Surge)";
+};
 /** Config rows in a stable order: writable toggles, then connected flags. */
 export declare function buildConfigRows(settings: SettingsResponse): TabsConfigRow[];
 /**

package/dist/commands/browse.js

@@ -121,8 +121,14 @@ export function formatJobDetailLines(row) {
 }
 /** Human labels for the Config tab and the static `settings` printout. */
 export const SETTINGS_LABELS = BEARER_SETTINGS_LABELS;
+export const STACKS_READY_LABEL = "Stacks, merge queue, Auto land";
+export const STACKS_READY_WORDS = {
+    on: "ready",
+    off: "not ready (install Mergestorm Surge)",
+};
 /** Config rows in a stable order: writable toggles, then connected flags. */
 export function buildConfigRows(settings) {
+    const stacksReadyKnown = typeof settings.stacks_ready === "boolean";
     return [
         ...BEARER_BOOLEAN_SETTINGS_KEYS.map((key) => ({
             key,
@@ -130,9 +136,20 @@ export function buildConfigRows(settings) {
             value: settings[key] === true,
             writable: true,
         })),
+        ...(stacksReadyKnown
+            ? [
+                {
+                    key: "stacks_ready",
+                    label: STACKS_READY_LABEL,
+                    value: settings.stacks_ready === true,
+                    writable: false,
+                    readOnlyWords: STACKS_READY_WORDS,
+                },
+            ]
+            : []),
         {
             key: "cyclone_connected",
-            label: "Cyclone",
+            label: stacksReadyKnown ? "Cyclone (auto patch)" : "Cyclone",
             value: settings.cyclone_connected === true,
             writable: false,
         },

package/dist/commands/review.d.ts

@@ -1,4 +1,4 @@
-import { REVIEW_POLL_MAX_TRANSIENT_RETRIES, isTransientReviewPollError, isTransientReviewPollStatus } from "./review-client.js";
+import { REVIEW_POLL_MAX_TRANSIENT_RETRIES, isTransientReviewPollError, isTransientReviewPollStatus, type PollReviewOptions } from "./review-client.js";
 export { REVIEW_POLL_MAX_TRANSIENT_RETRIES, isTransientReviewPollError, isTransientReviewPollStatus, };
 /** Same public specialist allowlist as the API contract and migration 117. */
 export declare const VORTEX_ROUTER_MODES: readonly ["off", "standard", "max", "manual"];
@@ -43,6 +43,7 @@ export type ReviewOptions = {
     interactive?: boolean;
     /** Test seam; production uses the two-second poll interval. */
     pollIntervalMs?: number;
+    pollClock?: Pick<PollReviewOptions, "sleep" | "now" | "random">;
 };
 export declare function reviewStatusHint(jobId: string): string;
 /** Append recovery hint once a job id exists (idempotent). */

package/dist/commands/review.js

@@ -357,6 +357,7 @@ export async function cmdReview(args, opts = {}) {
             row = await pollReview(cfg, jobId, {
                 timeoutMs: parsed.timeoutMs,
                 intervalMs: opts.pollIntervalMs,
+                ...opts.pollClock,
                 signal: opts.signal,
                 propagateTimeout: interactive,
                 onTick(kind) {

package/dist/commands/settings.js

@@ -3,6 +3,7 @@ import { BEARER_SETTINGS, BEARER_SETTINGS_FLAGS } from "../automation-catalog.js
 import { loadConfig } from "../config.js";
 import { CommandError } from "../errors.js";
 import { present } from "../ui/present.js";
+import { readOnlyRowWords } from "../ui/tabs.js";
 import { buildConfigRows, canBrowse, openTabsBrowser } from "./browse.js";
 /**
  * CLI flag → Bearer settings key. Boolean flags take on|off. The connected flags are
@@ -91,9 +92,7 @@ export function formatSettingsLines(settings) {
                             ? row.value
                                 ? "on"
                                 : "off"
-                            : row.value
-                                ? "connected"
-                                : "not connected";
+                            : readOnlyRowWords(row);
         return `  ${row.label.padEnd(labelWidth + 2)}${value}`;
     });
 }

package/dist/commands/stack.js

@@ -37,7 +37,7 @@ export function stackWatchTextLines(watch) {
     const next = watch.next;
     return [
         ...(next ? [
-            `Next: ${next.background} as a background command (notify on ${STACK_WATCH_NOTIFY_PATTERN}, then end your turn)`,
+            `Only with a confirmed host notification that resumes this task: run ${next.background} as a background command (notify on ${STACK_WATCH_NOTIFY_PATTERN}), then end your turn`,
             `Or poll: ${next.command} (MCP: stack_wait ${JSON.stringify(next.args)})`,
         ] : []),
         STACK_WATCH_NOT_DONE_SENTENCE,
@@ -58,7 +58,7 @@ const STACK_USAGE = `usage:
   mergestorm stack watch <stack-id> [--until attention|landed] [--ignore <blocker-substring>] [--max <minutes>] [--head <sha>] [--json]
     Loops stack wait with the cursor and stays silent while the stack is waiting or in progress.
     Prints one MS-WATCH ATTENTION line and exits 3 on attention or a repeated failed read; prints
-    MS-WATCH LANDED and exits 0 once the watch is done. Run it as a background command.
+    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]
@@ -996,7 +996,9 @@ export async function cmdStackWatch(args, deps = {}) {
         ? `Stopped watching stack ${stackId} after --max; it is not landed.`
         : result.outcome === "aborted"
             ? `Stopped watching stack ${stackId}; it is not landed.`
-            : `Stack ${stackId} needs attention; it is not landed.`;
+            : result.envelope?.watch.reason === "not_found"
+                ? `Stack ${stackId} was not found; landing is unconfirmed. Verify each PR before reporting it landed.`
+                : `Stack ${stackId} needs attention; it is not landed.`;
     throw new CommandError(reason, result.exitCode, result.outcome === "timeout" ? "review_timeout" : "stack_attention");
 }
 export async function cmdStackStatus(args, deps = {}) {
@@ -1040,8 +1042,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.tempestStatus ? `  Tempest: ${layer.tempestStatus}` : ""));
+            (layer.cycloneStatus ? `  Cyclone: ${layer.cycloneStatus}` : ""));
     }
     if (queueWait && !attention)
         lines.push(`  Queue: #${queueWait.prNumber} ${queueWait.text}`);
@@ -1147,7 +1148,7 @@ async function cmdStackLand(args) {
         await present("Stack", [
             ansi.brightGreen(`  Promoted` +
                 (pr != null ? ` #${pr}` : "") +
-                ` into U${uNumber}` +
+                ` into IU ${uNumber}` +
                 (branch ? ` (${branch})` : "") +
                 ` on ${id}`),
         ]);

package/dist/errors.d.ts

@@ -2,7 +2,7 @@
  * Stable machine codes for CommandError control flow.
  * UX copy in `message` may change freely; match on `code`, never on message text.
  */
-export type CommandErrorCode = "auth_invalid" | "api_timeout" | "not_a_repo" | "not_found" | "missing_api_key" | "registered_parent" | "usage" | "review_quota" | "review_failed" | "review_timeout" | "rate_limited" | "cyclone_not_installed" | "pr_merged" | "pr_closed" | "not_stacked" | "draft" | "reserved_branch" | "supabase_unconfigured" | "cyclone_not_connected" | "busy" | "adopt_failed" | "stack_attention";
+export type CommandErrorCode = "auth_invalid" | "api_timeout" | "not_a_repo" | "not_found" | "missing_api_key" | "registered_parent" | "usage" | "review_quota" | "review_failed" | "review_timeout" | "rate_limited" | "cyclone_not_installed" | "pr_merged" | "pr_closed" | "not_stacked" | "draft" | "reserved_branch" | "supabase_unconfigured" | "cyclone_not_connected" | "cyclone_permission_missing" | "busy" | "adopt_failed" | "github_unreadable" | "stack_attention";
 /** Stable one-shot exit codes for machine callers of `mergestorm review`. */
 export declare const REVIEW_EXIT: {
     readonly success: 0;
@@ -15,14 +15,17 @@ export declare const REVIEW_EXIT: {
 };
 export type CommandErrorExtras = {
     retryAfterSeconds?: number;
+    reason?: string;
 };
 /** Thrown by command handlers; one-shot mode maps `exitCode` onto process.exitCode. */
 export declare class CommandError extends Error {
     readonly exitCode: number;
     readonly code?: CommandErrorCode;
     readonly retryAfterSeconds?: number;
+    readonly reason?: string;
     constructor(message: string, exitCode?: number, code?: CommandErrorCode, extras?: CommandErrorExtras);
 }
+export declare function plainServerText(text: string): string;
 export declare const RATE_LIMITED_HINT = "Rate limited. Wait for a running review or mergestorm jobs.";
 export declare function rateLimitedMessage(retryAfterSeconds?: number): string;
 export declare function isCommandErrorCode(err: unknown, code: CommandErrorCode): err is CommandError;

package/dist/errors.js

@@ -13,6 +13,7 @@ export class CommandError extends Error {
     exitCode;
     code;
     retryAfterSeconds;
+    reason;
     constructor(message, exitCode = 1, code, extras) {
         super(message);
         this.name = "CommandError";
@@ -21,8 +22,16 @@ export class CommandError extends Error {
         if (extras?.retryAfterSeconds !== undefined) {
             this.retryAfterSeconds = extras.retryAfterSeconds;
         }
+        if (extras?.reason !== undefined) {
+            this.reason = extras.reason;
+        }
     }
 }
+const ANSI_SEQUENCE = /\u001b\][^\u0007\u001b]*(?:\u0007|\u001b\\)|\u001b\[[0-?]*[ -/]*[@-~]/g;
+const CONTROL_CHARACTER = /[\u0000-\u0008\u000b-\u001f\u007f-\u009f]/g;
+export function plainServerText(text) {
+    return text.replace(ANSI_SEQUENCE, "").replace(CONTROL_CHARACTER, "");
+}
 export const RATE_LIMITED_HINT = "Rate limited. Wait for a running review or mergestorm jobs.";
 export function rateLimitedMessage(retryAfterSeconds) {
     if (retryAfterSeconds == null || !Number.isFinite(retryAfterSeconds)) {

package/dist/stack-blockers.d.ts

@@ -6,6 +6,10 @@ 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 ClassifiedStackBlocker = StackBlocker & {
+    reason: StackBlockerReason;
+};
 export type StackAgentBusy = {
     prNumber: number;
     headSha: string | null;
@@ -47,20 +51,6 @@ export type StackRepairHint = {
     branch: string;
     failingCheck: string | null;
     steps: string;
-} | {
-    kind: "tempest_findings";
-    prNumber: number;
-    headSha: string | null;
-    branch: string;
-    findings: string;
-    steps: string;
-} | {
-    kind: "tempest_rerun";
-    prNumber: number;
-    headSha: string | null;
-    branch: string;
-    stoppedByPerson: boolean;
-    steps: string;
 } | {
     kind: "vortex_findings";
     prNumber: number;
@@ -121,7 +111,7 @@ export type StackRepairHint = {
     waitReason: string | null;
     steps: string;
 } | {
-    kind: "members_remaining" | "vortex_failed" | "tempest_trigger_failed";
+    kind: "members_remaining" | "vortex_failed";
     prNumber: number;
     headSha: string | null;
     branch: string;
@@ -211,8 +201,8 @@ export declare function restackFailedRepairSteps(branch: string, liveParent: str
     kind: string;
     detail?: string | null;
 }): string;
-export declare function agentsCannotClear(blocker: string): boolean;
-export declare function stackRepair(stack: StackDto, attention: StackBlocker | null, layer: StackLayerDto | undefined, bounce: MergeQueueEntryDto | undefined, queueWait?: MergeQueueWait | null): StackRepairHint | null;
+export declare function agentsCannotClear(reason: StackBlockerReason): 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. */
 export declare function stackBlockers(stack: StackDto, entries?: MergeQueueEntryDto[], cursor?: Pick<StackWatchCursor, "bounceId" | "afterFinishedAt">, nowMs?: number): {