mergestorm 0.3.18 → 0.3.20

package/README.md

@@ -45,12 +45,12 @@ On a TTY, bare `mergestorm` (or `mergestorm shell`) opens a branded REPL: a comp
 
 ```
 ╭──────────────────────────────────────────────────────────────────────────────╮
-│ ▟██▛  mergestorm v0.3.18                                                     │
+│ ▟██▛  mergestorm v0.3.20                                                     │
 │  ▜▙   ● msk_live_…  · maelstrom                                              │
 │       [████████░░░░░░░░░░░░░░░░░░░░░░] 25% used · Resets Sep 5, 10:53am (UTC)│
 │                                                                              │
 │       review a diff · usage for tabs · /help for all commands                │
-│       New in v0.3.18: pr --wait fences a stale same-head pass                │
+│       New in v0.3.20: stack watch pair-gate attention and upstack issues     │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 mergestorm
 ╭──────────────────────────────────────────────────────────────────────────────╮
@@ -86,7 +86,7 @@ mergestorm jobs [n] [--json]    Recent review jobs (default 10, max 50)
 mergestorm branches [n]         Recently reviewed branches (arrow-pick on TTY)
 mergestorm chain [slug]         Branch review-chain timeline (default: current branch)
 mergestorm whoami [--json]      Key prefix, plan, API base, config path
-mergestorm skill install --claude|--cursor  Copy the mergestorm-review and mergestorm-pr-loop skills into this repo
+mergestorm skill install --claude|--cursor|--agents  Copy the Mergestorm skills into this repo
 mergestorm thread <slug>        Jobs in a review thread
 mergestorm stack create [name]  New local stack layer (optional `--onto` / `--trunk` / `--extend`)
 mergestorm stack submit         Push layers, open PRs (`gh`), register via adopt (optional `--extend`)
@@ -94,6 +94,7 @@ mergestorm stack list [--json]  List registered stacks
 mergestorm stack adopt <owner/repo>#<pr>  Import an existing open PR chain
 mergestorm stack restack <stack-id>  Restack descendants
 mergestorm stack land <stack-id>     Land / promote (into review unit when present)
+mergestorm stack wait <stack-id> [--timeout <s>]  Wait for stack attention (default 45s, max 300s; 0 = one snapshot, no wait)
 mergestorm stack reset --force  Clear local authoring state (not branches/PRs)
 ```
 

package/dist/api.d.ts

@@ -159,9 +159,9 @@ export declare function applyPrReviewQuery(query: URLSearchParams, opts: PrRevie
  */
 export { SETTINGS_WRITABLE_KEYS };
 export type { SettingsWritableKey };
-export type SettingsPatch = Partial<Record<SettingsWritableKey, boolean>>;
+export type SettingsPatch = Partial<import("./automation-catalog.js").BearerSettingsValues>;
 /** GET and PATCH `/api/v1/settings` both answer with this shape. */
-export type SettingsResponse = Record<SettingsWritableKey, boolean> & {
+export type SettingsResponse = import("./automation-catalog.js").BearerSettingsValues & {
     cyclone_connected: boolean;
     github_connected: boolean;
 };

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, } 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. */
@@ -382,7 +382,43 @@ export async function adoptStack(owner, repo, prNumber, cfg, policy) {
         throw new CommandError(rateLimitedMessage(retryAfterSeconds), REVIEW_EXIT.rate_limited, "rate_limited", { retryAfterSeconds });
     }
     if (status !== 200) {
-        throw new CommandError(`Failed to import stack (HTTP ${status}): ${JSON.stringify(body)}`);
+        const error = body && typeof body === "object" && "error" in body && typeof body.error === "string"
+            ? body.error
+            : undefined;
+        const message = body && typeof body === "object" && "message" in body && typeof body.message === "string"
+            ? body.message
+            : undefined;
+        const code = error === "auth_invalid" ||
+            error === "api_timeout" ||
+            error === "not_a_repo" ||
+            error === "not_found" ||
+            error === "missing_api_key" ||
+            error === "registered_parent" ||
+            error === "usage" ||
+            error === "review_quota" ||
+            error === "review_failed" ||
+            error === "review_timeout" ||
+            error === "rate_limited" ||
+            error === "cyclone_not_installed" ||
+            error === "pr_merged" ||
+            error === "pr_closed" ||
+            error === "not_stacked" ||
+            error === "draft" ||
+            error === "reserved_branch" ||
+            error === "supabase_unconfigured" ||
+            error === "cyclone_not_connected" ||
+            error === "busy" ||
+            error === "adopt_failed"
+            ? error
+            : undefined;
+        const fallbackMessage = code === "not_stacked"
+            ? "This pull request is not part of a stack."
+            : code === "supabase_unconfigured"
+                ? "Stacks are not configured on this server."
+                : undefined;
+        throw new CommandError(message?.trim()
+            ? message
+            : fallbackMessage ?? `Failed to import stack (HTTP ${status}): ${JSON.stringify(body)}`, 1, code);
     }
     return body;
 }
@@ -414,6 +450,10 @@ 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 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");
+        }
         throw new CommandError(`${failLabel} (HTTP ${status}): ${JSON.stringify(body)}`);
     }
     return body;

package/dist/automation-catalog.d.ts

@@ -26,6 +26,18 @@ export declare const BEARER_SETTINGS: readonly [{
     readonly key: "cyclone_skip_ci_enabled";
     readonly flag: "--cyclone-skip-ci";
     readonly label: "Skip CI on Cyclone commits";
+}, {
+    readonly key: "cyclone_patch_unverified_languages";
+    readonly flag: "--cyclone-patch-unverified";
+    readonly label: "Patch languages we cannot typecheck";
+}, {
+    readonly key: "vortex_auto_overflow_enabled";
+    readonly flag: "--vortex-auto-overflow";
+    readonly label: "Vortex auto overflow";
+}, {
+    readonly key: "vortex_skip_all_clear_comments";
+    readonly flag: "--vortex-skip-all-clear";
+    readonly label: "Vortex skip All-clear comments";
 }, {
     readonly key: "vortex_seam_specialist_enabled";
     readonly flag: "--vortex-seam";
@@ -34,8 +46,40 @@ export declare const BEARER_SETTINGS: readonly [{
     readonly key: "auto_land_default";
     readonly flag: "--auto-land";
     readonly label: "Auto land (new stacks)";
+}, {
+    readonly key: "ignored_bot_logins";
+    readonly flag: "--ignore-bot";
+    readonly label: "Ignored bot logins";
+    readonly kind: "logins";
+}, {
+    readonly key: "vortex_bot_skip_check";
+    readonly flag: "--vortex-skip-check";
+    readonly label: "Vortex bot skip check";
+    readonly kind: "enum";
+    readonly values: readonly ["none", "neutral"];
+}, {
+    readonly key: "vortex_findings_check";
+    readonly flag: "--vortex-findings";
+    readonly label: "Vortex findings check";
+    readonly kind: "enum";
+    readonly values: readonly ["failure", "neutral", "success"];
+}, {
+    readonly key: "cyclone_patch_failure_check";
+    readonly flag: "--cyclone-fail-check";
+    readonly label: "Cyclone patch failure check";
+    readonly kind: "enum";
+    readonly values: readonly ["failure", "neutral"];
 }];
 export type BearerSettingsKey = (typeof BEARER_SETTINGS)[number]["key"];
 export declare const BEARER_SETTINGS_KEYS: readonly BearerSettingsKey[];
 export declare const BEARER_SETTINGS_FLAGS: Record<string, BearerSettingsKey>;
 export declare const BEARER_SETTINGS_LABELS: Record<BearerSettingsKey, string>;
+/** Omitted kind means boolean for the original toggle rows. */
+export type BearerSettingsValues = {
+    [Row in (typeof BEARER_SETTINGS)[number] as Row["key"]]: Row extends {
+        kind: "logins";
+    } ? string[] : Row extends {
+        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" | "review_unit_land_prs_enabled" | "cyclone_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" | "ignored_bot_logins" | "vortex_bot_skip_check" | "vortex_findings_check" | "cyclone_patch_failure_check")[];

package/dist/automation-catalog.js

@@ -6,9 +6,19 @@ export const BEARER_SETTINGS = [
     { key: "review_unit_land_prs_enabled", flag: "--review-unit-land", label: "Review Unit land PRs" },
     { key: "cyclone_review_unit_land_prs_enabled", flag: "--cyclone-review-unit-land", label: "Cyclone Review Unit land PRs" },
     { key: "cyclone_skip_ci_enabled", flag: "--cyclone-skip-ci", label: "Skip CI on Cyclone commits" },
+    { key: "cyclone_patch_unverified_languages", flag: "--cyclone-patch-unverified", label: "Patch languages we cannot typecheck" },
+    { key: "vortex_auto_overflow_enabled", flag: "--vortex-auto-overflow", label: "Vortex auto overflow" },
+    { key: "vortex_skip_all_clear_comments", flag: "--vortex-skip-all-clear", label: "Vortex skip All-clear comments" },
     { key: "vortex_seam_specialist_enabled", flag: "--vortex-seam", label: "Vortex seam specialist" },
     { key: "auto_land_default", flag: "--auto-land", label: "Auto land (new stacks)" },
+    { key: "ignored_bot_logins", flag: "--ignore-bot", label: "Ignored bot logins", kind: "logins" },
+    { key: "vortex_bot_skip_check", flag: "--vortex-skip-check", label: "Vortex bot skip check", kind: "enum", values: ["none", "neutral"] },
+    { key: "vortex_findings_check", flag: "--vortex-findings", label: "Vortex findings check", kind: "enum", values: ["failure", "neutral", "success"] },
+    { key: "cyclone_patch_failure_check", flag: "--cyclone-fail-check", label: "Cyclone patch failure check", kind: "enum", values: ["failure", "neutral"] },
 ];
 export const BEARER_SETTINGS_KEYS = BEARER_SETTINGS.map((r) => r.key);
 export const BEARER_SETTINGS_FLAGS = Object.fromEntries(BEARER_SETTINGS.map((r) => [r.flag, r.key]));
 export const BEARER_SETTINGS_LABELS = Object.fromEntries(BEARER_SETTINGS.map((r) => [r.key, r.label]));
+export const BEARER_BOOLEAN_SETTINGS_KEYS = BEARER_SETTINGS
+    .filter((row) => !("kind" in row))
+    .map((row) => row.key);

package/dist/client/index.d.ts

@@ -1,7 +1,10 @@
 export { DEFAULT_API, apiBase, clearConfig, configPath, keyDisplay, loadConfig, mergestormHome, resolveApiKey, saveConfig, type Config, } from "../config.js";
-export { BEARER_SETTINGS, BEARER_SETTINGS_FLAGS, BEARER_SETTINGS_KEYS, BEARER_SETTINGS_LABELS, type BearerSettingsKey, } from "../automation-catalog.js";
+export { BEARER_SETTINGS, BEARER_BOOLEAN_SETTINGS_KEYS, BEARER_SETTINGS_FLAGS, BEARER_SETTINGS_KEYS, BEARER_SETTINGS_LABELS, type BearerSettingsKey, } from "../automation-catalog.js";
 export { API_TIMEOUT_PREFIX, DEFAULT_API_TIMEOUT_MS, SETTINGS_WRITABLE_KEYS, adoptStack, apiFetch, cancelMergeQueueEntry, devicePost, enqueueStack, ensureUpperPark, getEnrichedStack, getMe, getPrVortexReview, getReview, getSettings, landNextStack, listJobs, listMergeQueueEntries, listStacks, listThreads, parseRetryAfterSeconds, patchSettings, restackStack, setStackAutoLand, setStackPolicy, stackPolicyBody, type ApiFetchInit, type ApiFetchResult, type JobListItem, type MeResponse, type MergeQueueBounceDetail, type MergeQueueBounceKind, type MergeQueueEnqueuedBy, type MergeQueueEnqueuedVia, type MergeQueueEntryDto, type MergeQueueEntryState, type PrReviewFinding, type PrReviewFindings, type PrVortexReview, type SettingsPatch, type SettingsResponse, type SettingsWritableKey, type StackDto, type StackPolicyPatch, type ThreadDetail, type ThreadListItem, } from "../api.js";
 export { CommandError, DetachedError, RATE_LIMITED_HINT, REVIEW_EXIT, isCommandErrorCode, rateLimitedMessage, type CommandErrorCode, type CommandErrorExtras, } from "../errors.js";
 export { REVIEW_POLL_BACKOFF_MS, REVIEW_POLL_DEFAULT_TIMEOUT_MS, REVIEW_POLL_INTERVAL_MS, REVIEW_POLL_MAX_INTERVAL_MS, REVIEW_POLL_MAX_TRANSIENT_RETRIES, REVIEW_POLL_STRETCH_AFTER_MS, REVIEW_POLL_STRETCH_SPAN_MS, REVIEW_THREAD_SLUG_RE, PrReviewPollTimeoutError, ReviewPollTimeoutError, collectReviewInput, formatReviewSubmitError, isTransientReviewPollError, isTransientReviewPollStatus, loadReviewContext, pollPrVortexReview, pollReview, stretchedPollIntervalMs, submitReview, transientRetryWaitMs, type PollReviewOptions, type PollPrVortexReviewOptions, type ReviewInput, type SubmitReviewOptions, } from "../commands/review-client.js";
 export { REVIEW_JOB_ENVELOPE_SCHEMA, toReviewJobEnvelope, type ReviewEnvelopeFallbacks, type ReviewJobEnvelope, type ReviewJobRow, } from "../ui/job-envelope.js";
 export { discoverTrunk } from "../git-stack.js";
+export { BOUNCE_KIND_LABELS, mergeQueueBounceLabel } from "../stack-dto.js";
+export { STACK_WATCH_SCHEMA, STACK_WATCH_DEFAULT_TIMEOUT_MS, StackWatchError, StackWatchTimeoutError, pollStackWatch, type PollStackWatchOptions, type StackWatchCursor, type StackWatchEnvelope, } from "../stack-watch.js";
+export { stackBlockers, stackBlockersSummary, sameHead, type StackBlocker } from "../stack-blockers.js";

package/dist/client/index.js

@@ -1,7 +1,10 @@
 export { DEFAULT_API, apiBase, clearConfig, configPath, keyDisplay, loadConfig, mergestormHome, resolveApiKey, saveConfig, } from "../config.js";
-export { BEARER_SETTINGS, BEARER_SETTINGS_FLAGS, BEARER_SETTINGS_KEYS, BEARER_SETTINGS_LABELS, } from "../automation-catalog.js";
+export { BEARER_SETTINGS, BEARER_BOOLEAN_SETTINGS_KEYS, BEARER_SETTINGS_FLAGS, BEARER_SETTINGS_KEYS, BEARER_SETTINGS_LABELS, } from "../automation-catalog.js";
 export { API_TIMEOUT_PREFIX, DEFAULT_API_TIMEOUT_MS, SETTINGS_WRITABLE_KEYS, adoptStack, apiFetch, cancelMergeQueueEntry, devicePost, enqueueStack, ensureUpperPark, getEnrichedStack, getMe, getPrVortexReview, getReview, getSettings, landNextStack, listJobs, listMergeQueueEntries, listStacks, listThreads, parseRetryAfterSeconds, patchSettings, restackStack, setStackAutoLand, setStackPolicy, stackPolicyBody, } from "../api.js";
 export { CommandError, DetachedError, RATE_LIMITED_HINT, REVIEW_EXIT, isCommandErrorCode, rateLimitedMessage, } from "../errors.js";
 export { REVIEW_POLL_BACKOFF_MS, REVIEW_POLL_DEFAULT_TIMEOUT_MS, REVIEW_POLL_INTERVAL_MS, REVIEW_POLL_MAX_INTERVAL_MS, REVIEW_POLL_MAX_TRANSIENT_RETRIES, REVIEW_POLL_STRETCH_AFTER_MS, REVIEW_POLL_STRETCH_SPAN_MS, REVIEW_THREAD_SLUG_RE, PrReviewPollTimeoutError, ReviewPollTimeoutError, collectReviewInput, formatReviewSubmitError, isTransientReviewPollError, isTransientReviewPollStatus, loadReviewContext, pollPrVortexReview, pollReview, stretchedPollIntervalMs, submitReview, transientRetryWaitMs, } from "../commands/review-client.js";
 export { REVIEW_JOB_ENVELOPE_SCHEMA, toReviewJobEnvelope, } from "../ui/job-envelope.js";
 export { discoverTrunk } from "../git-stack.js";
+export { BOUNCE_KIND_LABELS, mergeQueueBounceLabel } from "../stack-dto.js";
+export { STACK_WATCH_SCHEMA, STACK_WATCH_DEFAULT_TIMEOUT_MS, StackWatchError, StackWatchTimeoutError, pollStackWatch, } from "../stack-watch.js";
+export { stackBlockers, stackBlockersSummary, sameHead } from "../stack-blockers.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" | "review_unit_land_prs_enabled" | "cyclone_review_unit_land_prs_enabled" | "cyclone_skip_ci_enabled" | "vortex_seam_specialist_enabled" | "auto_land_default", string>;
+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_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" | "ignored_bot_logins" | "vortex_bot_skip_check" | "vortex_findings_check" | "cyclone_patch_failure_check", string>;
 /** Config rows in a stable order: writable toggles, then connected flags. */
 export declare function buildConfigRows(settings: SettingsResponse): TabsConfigRow[];
 /**

package/dist/commands/browse.js

@@ -1,5 +1,5 @@
-import { getMe, getReview, getSettings, listJobs, patchSettings, SETTINGS_WRITABLE_KEYS, } from "../api.js";
-import { BEARER_SETTINGS_LABELS } from "../automation-catalog.js";
+import { getMe, getReview, getSettings, listJobs, patchSettings, } from "../api.js";
+import { BEARER_BOOLEAN_SETTINGS_KEYS, BEARER_SETTINGS_LABELS } from "../automation-catalog.js";
 import { apiBase, keyDisplay, loadConfig, resolveApiKey } from "../config.js";
 import { CommandError } from "../errors.js";
 import { ansi } from "../ui/ansi.js";
@@ -124,7 +124,7 @@ export const SETTINGS_LABELS = BEARER_SETTINGS_LABELS;
 /** Config rows in a stable order: writable toggles, then connected flags. */
 export function buildConfigRows(settings) {
     return [
-        ...SETTINGS_WRITABLE_KEYS.map((key) => ({
+        ...BEARER_BOOLEAN_SETTINGS_KEYS.map((key) => ({
             key,
             label: SETTINGS_LABELS[key],
             value: settings[key] === true,

package/dist/commands/help.js

@@ -58,7 +58,7 @@ export function buildHelpTabs() {
                 "",
                 rule("Single stack (from trunk)"),
                 cmd("stack create --onto main", "fresh stack, not on an existing one"),
-                cmd("stack list", "what's registered for this repo"),
+                cmd("stack list · wait <id>", "registered stacks · wait for attention"),
                 cmd("queue [add <stack-id>]", "list entries · queue verified landing"),
                 cmd("stack land <id>", "land now · skips queue verification"),
                 "",

package/dist/commands/queue.d.ts

@@ -5,7 +5,7 @@ export type QueueCmdDeps = {
     canBrowse?: () => boolean;
     runLineTabsBrowser?: typeof runLineTabsBrowser;
 };
-export declare const QUEUE_USAGE = "usage:\n  mergestorm queue [list] [--json]\n  mergestorm queue add <stack-id> [--json]\n  mergestorm queue rm <entry-id|stack-id> [--json]\n\n  queue lists your live merge-queue entries. rm prefers an entry id; a live\n  stack id is resolved to its queue entry before cancellation.";
+export declare const QUEUE_USAGE = "usage:\n  mergestorm queue [list] [--json]\n  mergestorm queue add <stack-id> [--json]\n  mergestorm queue rm <entry-id|stack-id> [--json]\n\n  queue lists live and recent bounced merge-queue entries. rm prefers an entry id; a live\n  stack id is resolved to its queue entry before cancellation.";
 /** Entry ids win; otherwise a live stack id resolves to its entry id. */
 export declare function resolveQueueEntryId(idOrStackId: string, entries: readonly MergeQueueEntryDto[]): string;
 export declare function buildQueueListLines(entries: readonly MergeQueueEntryDto[], fullStackId?: boolean): string[];

package/dist/commands/queue.js

@@ -1,6 +1,7 @@
 import { cancelMergeQueueEntry, enqueueStack, listMergeQueueEntries, } from "../api.js";
 import { loadConfig } from "../config.js";
 import { CommandError } from "../errors.js";
+import { mergeQueueBounceLabel } from "../stack-dto.js";
 import { ansi } from "../ui/ansi.js";
 import { runLineTabsBrowser } from "../ui/line-tabs.js";
 import { present } from "../ui/present.js";
@@ -31,7 +32,7 @@ export const QUEUE_USAGE = `usage:
   mergestorm queue add <stack-id> [--json]
   mergestorm queue rm <entry-id|stack-id> [--json]
 
-  queue lists your live merge-queue entries. rm prefers an entry id; a live
+  queue lists live and recent bounced merge-queue entries. rm prefers an entry id; a live
   stack id is resolved to its queue entry before cancellation.`;
 function positionalArgs(args) {
     const unknown = args.filter((arg) => arg.startsWith("-") &&
@@ -66,17 +67,31 @@ export function buildQueueListLines(entries, fullStackId = false) {
         ];
     }
     return entries.map((entry) => {
-        const reason = entry.waitReason ?? entry.bounceReason;
+        const reason = entry.bounceDetail
+            ? mergeQueueBounceLabel(entry)
+            : entry.waitReason ?? (entry.bounceReason ? mergeQueueBounceLabel(entry) : null);
+        const prNumber = entry.bounceDetail?.prNumber != null && entry.bounceDetail.prNumber > 0
+            ? entry.bounceDetail.prNumber
+            : entry.waitReason?.match(/#([1-9]\d*)\b/)?.[1];
+        const headSha = entry.bounceDetail?.headSha ?? entry.verifyHeadSha;
+        const pr = prNumber != null
+            ? `  #${prNumber}${headSha ? `@${headSha.slice(0, 7)}` : ""}`
+            : "";
         const glyph = colorQueueGlyph(entry.state, queueStateGlyph(entry.state));
         const id = fullStackId ? entry.stackId : entry.stackId.slice(0, 8);
-        const core = `  ${String(entry.position).padStart(2)}  ` +
-            `${glyph} ${entry.state.padEnd(8)}  ${entry.owner}/${entry.repo}  ${id}` +
-            (reason ? `  ${reason}` : "");
+        const coreWithoutReason = `  ${String(entry.position).padStart(2)}  ` +
+            `${glyph} ${entry.state.padEnd(8)}  ${entry.owner}/${entry.repo}  ${id}`;
+        const coreWithoutPr = coreWithoutReason + (reason ? `  ${reason}` : "");
+        const core = `${coreWithoutPr}${pr}`;
         const who = entry.enqueuedBy === "human" || entry.enqueuedBy === "agent"
             ? `  by ${entry.enqueuedBy}`
             : "";
         const withWho = `${core}${who}`;
-        return visibleWidth(withWho) <= 75 ? withWho : core;
+        if (visibleWidth(withWho) <= 80)
+            return withWho;
+        if (visibleWidth(core) <= 80)
+            return core;
+        return pr ? core : coreWithoutPr;
     });
 }
 async function listQueue(asJson, deps = {}) {

package/dist/commands/registry.js

@@ -166,7 +166,12 @@ export const COMMAND_REGISTRY = [
             "  [--auto-review on|off] [--auto-patch on|off] [--vortex-thinking on|off]",
             "  [--repo-overview on|off] [--review-unit-land on|off]",
             "  [--cyclone-review-unit-land on|off] [--cyclone-skip-ci on|off]",
-            "  [--vortex-seam on|off] [--auto-land on|off]  Auto land default for new stacks",
+            "  [--cyclone-patch-unverified on|off]  Patch languages we cannot typecheck",
+            "  [--vortex-seam on|off] [--vortex-skip-all-clear on|off]",
+            "  [--auto-land on|off]  Auto land default for new stacks",
+            "  [--ignore-bot add <login>|remove <login>|clear]",
+            "  [--vortex-skip-check none|neutral] [--vortex-findings failure|neutral|success]",
+            "  [--cyclone-fail-check failure|neutral]",
             "  With flags: PATCH those settings and print the stored result",
         ],
         async run(args, ctx) {
@@ -175,9 +180,9 @@ export const COMMAND_REGISTRY = [
     },
     {
         name: "skill",
-        summary: "Install mergestorm-review and mergestorm-pr-loop for Claude or Cursor",
+        summary: "Install Mergestorm skills for Claude, Cursor, or agents",
         usage: [
-            "mergestorm skill install --claude|--cursor  Copy the mergestorm-review and mergestorm-pr-loop skills into this repo",
+            "mergestorm skill install --claude|--cursor|--agents  Copy the Mergestorm skills into this repo",
             "  [--json]",
         ],
         async run(args) {
@@ -201,7 +206,7 @@ export const COMMAND_REGISTRY = [
         name: "queue",
         summary: "Merge queue: list, add a stack, or remove an entry",
         usage: [
-            "mergestorm queue [list] [--json]  List live merge-queue entries",
+            "mergestorm queue [list] [--json]  List live and recent bounced merge-queue entries",
             "mergestorm queue add <stack-id> [--json]  Queue a stack for verified landing",
             "mergestorm queue rm <entry-id|stack-id> [--json]  Remove a live queue entry",
         ],
@@ -217,13 +222,15 @@ export const COMMAND_REGISTRY = [
             "mergestorm stack submit         Push/open active stack ([--extend] [--auto-land on|off] [--auto-review on|off] [--auto-patch 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)",
             "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 restack <stack-id>   Restack stack descendants",
             "mergestorm stack land <stack-id>      Land bottom PR (or promote into unit)",
         ],
-        async run(args) {
-            await cmdStack(args);
+        async run(args, ctx) {
+            await cmdStack(args, { signal: ctx.signal });
         },
     },
     {

package/dist/commands/review-client.js

@@ -271,7 +271,6 @@ function shaMatches(actual, expected) {
 /** Poll the DB-only PR review endpoint until the requested pass is resting. */
 export async function pollPrVortexReview(cfg, owner, repo, prNumber, opts = {}) {
     const timeoutMs = opts.timeoutMs ?? REVIEW_POLL_DEFAULT_TIMEOUT_MS;
-    const intervalMs = opts.intervalMs ?? REVIEW_POLL_INTERVAL_MS;
     const now = opts.now ?? Date.now;
     const wait = opts.sleep ?? sleep;
     const startedAt = now();
@@ -296,17 +295,13 @@ export async function pollPrVortexReview(cfg, owner, repo, prNumber, opts = {})
         if (waitMs > 0)
             await wait(waitMs, opts.signal);
     };
-    const sleepBeforePoll = async () => {
-        const waitMs = Math.min(stretchedPollIntervalMs(now() - startedAt, intervalMs), Math.max(0, deadline - now()));
-        if (waitMs > 0)
-            await wait(waitMs, opts.signal);
-    };
     while (now() < deadline) {
+        query.set("wait", String(Math.min(45, Math.max(1, Math.ceil((deadline - now()) / 1000)))));
         let poll;
         try {
             poll = await apiFetch(cfg, `/api/v1/stacks/pr-review?${query.toString()}`, {
                 signal: opts.signal,
-                timeoutMs: Math.max(1, Math.min(30_000, deadline - now())),
+                timeoutMs: Number(query.get("wait")) * 1000 + 5_000,
             });
         }
         catch (err) {
@@ -331,7 +326,6 @@ export async function pollPrVortexReview(cfg, owner, repo, prNumber, opts = {})
         if (poll.status === 404) {
             transientFailures = 0;
             opts.onTick?.("progress");
-            await sleepBeforePoll();
             continue;
         }
         if (poll.status !== 200) {
@@ -358,7 +352,6 @@ export async function pollPrVortexReview(cfg, owner, repo, prNumber, opts = {})
             (!isPositiveInteger(envelope.pass) || (opts.pass !== undefined && envelope.pass !== opts.pass) ||
                 (opts.afterPass !== undefined && envelope.pass <= opts.afterPass))) {
             opts.onTick?.("progress");
-            await sleepBeforePoll();
             continue;
         }
         lastEnvelope = envelope;
@@ -370,7 +363,6 @@ export async function pollPrVortexReview(cfg, owner, repo, prNumber, opts = {})
         if (resting && matches && !stale)
             return lastEnvelope;
         opts.onTick?.("progress");
-        await sleepBeforePoll();
     }
     throw new PrReviewPollTimeoutError(owner, repo, prNumber, lastEnvelope);
 }

package/dist/commands/settings.d.ts

@@ -1,17 +1,25 @@
 import { type SettingsPatch, type SettingsResponse } from "../api.js";
 /**
- * CLI flag → Bearer settings key. on|off only. The connected flags are
+ * 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" | "review_unit_land_prs_enabled" | "cyclone_review_unit_land_prs_enabled" | "cyclone_skip_ci_enabled" | "vortex_seam_specialist_enabled" | "auto_land_default">;
+export declare const SETTINGS_FLAGS: Record<string, "auto_review_enabled" | "auto_patch_enabled" | "vortex_show_thinking_traces" | "repo_overview_enabled" | "review_unit_land_prs_enabled" | "cyclone_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" | "ignored_bot_logins" | "vortex_bot_skip_check" | "vortex_findings_check" | "cyclone_patch_failure_check">;
+type IgnoreBotOperation = {
+    action: "add" | "remove";
+    login: string;
+} | {
+    action: "clear";
+};
 export type SettingsArgs = {
     json: boolean;
     patch: SettingsPatch;
+    ignoreBots?: IgnoreBotOperation[];
 };
-/** Parse `settings` argv. Accepts `--flag on|off` and `--flag=on|off`. */
+/** Parse boolean and enum flags plus ordered ignore-list operations. */
 export declare function parseSettingsArgs(args: string[]): SettingsArgs;
-/** Static printout of the GET/PATCH response shape (rows match the Config tab). */
+/** Static printout includes the Config toggles plus enum and login settings. */
 export declare function formatSettingsLines(settings: SettingsResponse): string[];
 export declare function cmdSettings(args: string[], opts?: {
     mode?: "oneshot" | "shell";
 }): Promise<void>;
+export {};

package/dist/commands/settings.js

@@ -1,17 +1,25 @@
 import { getSettings, patchSettings, } from "../api.js";
-import { BEARER_SETTINGS_FLAGS } from "../automation-catalog.js";
+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 { buildConfigRows, canBrowse, openTabsBrowser } from "./browse.js";
 /**
- * CLI flag → Bearer settings key. on|off only. The connected flags are
+ * 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 const SETTINGS_FLAGS = BEARER_SETTINGS_FLAGS;
-/** Parse `settings` argv. Accepts `--flag on|off` and `--flag=on|off`. */
+function canonicalLogin(raw) {
+    const login = raw.trim().toLowerCase().replace(/\[bot\]$/, "");
+    if (!/^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(login)) {
+        throw new CommandError(`Invalid bot login: ${raw}.`, 2, "usage");
+    }
+    return login;
+}
+/** Parse boolean and enum flags plus ordered ignore-list operations. */
 export function parseSettingsArgs(args) {
     let json = false;
+    const ignoreBots = [];
     const patch = {};
     for (let i = 0; i < args.length; i++) {
         const arg = args[i];
@@ -26,37 +34,91 @@ export function parseSettingsArgs(args) {
             throw new CommandError(`Unknown settings flag: ${flag}. See \`mergestorm --help\`.`, 2, "usage");
         }
         const value = eq >= 0 ? arg.slice(eq + 1) : args[++i];
+        const row = BEARER_SETTINGS.find((row) => row.key === key);
+        if ("kind" in row && row.kind === "logins") {
+            if (value === "clear")
+                ignoreBots.push({ action: "clear" });
+            else if ((value === "add" || value === "remove") && args[i + 1] && !args[i + 1].startsWith("--")) {
+                ignoreBots.push({ action: value, login: canonicalLogin(args[++i]) });
+            }
+            else {
+                throw new CommandError(`${flag} takes add <login>, remove <login>, or clear.`, 2, "usage");
+            }
+            continue;
+        }
+        if ("kind" in row && row.kind === "enum") {
+            if (value === undefined || !row.values.includes(value)) {
+                throw new CommandError(`${flag} takes ${row.values.join(" or ")}.`, 2, "usage");
+            }
+            Object.assign(patch, { [key]: value });
+            continue;
+        }
         if (value !== "on" && value !== "off") {
             throw new CommandError(`${flag} takes on or off.`, 2, "usage");
         }
-        patch[key] = value === "on";
+        Object.assign(patch, { [key]: value === "on" });
     }
-    return { json, patch };
+    return { json, patch, ...(ignoreBots.length ? { ignoreBots } : {}) };
 }
-/** Static printout of the GET/PATCH response shape (rows match the Config tab). */
+/** Static printout includes the Config toggles plus enum and login settings. */
 export function formatSettingsLines(settings) {
-    const rows = buildConfigRows(settings);
+    const rows = [
+        ...buildConfigRows(settings),
+        ...BEARER_SETTINGS.filter((row) => "kind" in row).map((row) => ({
+            ...row, writable: true, value: settings[row.key],
+        })),
+    ];
     const labelWidth = Math.max(...rows.map((r) => r.label.length));
     return rows.map((row) => {
-        const value = row.writable
-            ? row.value
-                ? "on"
-                : "off"
-            : row.value
-                ? "connected"
-                : "not connected";
+        const value = "kind" in row && row.value === undefined
+            ? "(unavailable)"
+            : Array.isArray(row.value)
+                ? row.value.join(", ") || "(empty)"
+                : typeof row.value === "string"
+                    ? row.value
+                    : row.writable
+                        ? row.value
+                            ? "on"
+                            : "off"
+                        : row.value
+                            ? "connected"
+                            : "not connected";
         return `  ${row.label.padEnd(labelWidth + 2)}${value}`;
     });
 }
 export async function cmdSettings(args, opts = {}) {
-    const { json, patch } = parseSettingsArgs(args);
-    const hasPatch = Object.keys(patch).length > 0;
+    const { json, patch, ignoreBots } = parseSettingsArgs(args);
+    const hasPatch = Object.keys(patch).length > 0 || Boolean(ignoreBots?.length);
     // Bare `settings` on a TTY: the tabbed browser, opened on Config.
     if (!hasPatch && !json && canBrowse()) {
         await openTabsBrowser("config");
         return;
     }
     const cfg = await loadConfig();
+    if (ignoreBots?.length) {
+        // A leading clear needs no read. Otherwise fetch before writing the full list.
+        const current = ignoreBots[0].action === "clear" ? null : await getSettings(cfg);
+        if (ignoreBots[0].action !== "clear" && !current) {
+            throw new CommandError("Settings are not available; cannot update ignored bot logins.");
+        }
+        let logins = [...new Set((current?.ignored_bot_logins ?? []).flatMap((raw) => {
+                try {
+                    return [canonicalLogin(raw)];
+                }
+                catch {
+                    return [];
+                }
+            }))];
+        for (const op of ignoreBots) {
+            if (op.action === "clear")
+                logins = [];
+            else if (op.action === "remove")
+                logins = logins.filter((login) => login !== op.login);
+            else if (!logins.includes(op.login))
+                logins.push(op.login);
+        }
+        patch.ignored_bot_logins = logins;
+    }
     let settings;
     if (hasPatch) {
         settings = await patchSettings(patch, cfg);

package/dist/commands/skill.d.ts

@@ -1,9 +1,10 @@
 export declare const SKILL_NAME = "mergestorm-review";
 export declare const PR_LOOP_SKILL_NAME = "mergestorm-pr-loop";
-export declare const SKILL_NAMES: readonly ["mergestorm-review", "mergestorm-pr-loop"];
+export declare const BOUNCE_WATCH_SKILL_NAME = "mergestorm-bounce-watch";
+export declare const SKILL_NAMES: readonly ["mergestorm-review", "mergestorm-pr-loop", "mergestorm-bounce-watch"];
 export type SkillName = (typeof SKILL_NAMES)[number];
-export declare const SKILL_USAGE = "usage:\n  mergestorm skill install --claude|--cursor [--json]\n\n  Copies mergestorm-review and mergestorm-pr-loop into this repo (git toplevel, else cwd):\n    --claude  .claude/skills/<name>/SKILL.md\n    --cursor  .cursor/skills/<name>/SKILL.md\n  Pass both flags to write both trees. Overwrites existing copies.";
-export type SkillTarget = "claude" | "cursor";
+export declare const SKILL_USAGE: string;
+export type SkillTarget = "claude" | "cursor" | "agents";
 export type SkillInstallRequest = {
     help: boolean;
     json: boolean;