mergestorm 0.3.17 → 0.3.18

package/README.md

@@ -45,12 +45,12 @@ On a TTY, bare `mergestorm` (or `mergestorm shell`) opens a branded REPL: a comp
 
 ```
 ╭──────────────────────────────────────────────────────────────────────────────╮
-│ ▟██▛  mergestorm v0.3.17                                                     │
+│ ▟██▛  mergestorm v0.3.18                                                     │
 │  ▜▙   ● 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.17: nginx 413 names the upload limit instead of Failed: {} │
+│       New in v0.3.18: pr --wait fences a stale same-head pass                │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 mergestorm
 ╭──────────────────────────────────────────────────────────────────────────────╮

package/dist/api.d.ts

@@ -134,6 +134,11 @@ export type PrVortexReview = {
     finding_count: number;
     findings: PrReviewFindings | null;
     patch_policy: unknown | null;
+    /**
+     * MS-01: True when the returned row is a resting completion but a newer
+     * attempt is in flight (active lease). The CLI must continue polling.
+     */
+    newer_pass_pending?: boolean;
 };
 /**
  * Pass selection on the DB-only PR review read (#2027). `pass` names one row;

package/dist/automation-catalog.d.ts

@@ -22,6 +22,10 @@ export declare const BEARER_SETTINGS: readonly [{
     readonly key: "cyclone_review_unit_land_prs_enabled";
     readonly flag: "--cyclone-review-unit-land";
     readonly label: "Cyclone Review Unit land PRs";
+}, {
+    readonly key: "cyclone_skip_ci_enabled";
+    readonly flag: "--cyclone-skip-ci";
+    readonly label: "Skip CI on Cyclone commits";
 }, {
     readonly key: "vortex_seam_specialist_enabled";
     readonly flag: "--vortex-seam";

package/dist/automation-catalog.js

@@ -5,6 +5,7 @@ export const BEARER_SETTINGS = [
     { key: "repo_overview_enabled", flag: "--repo-overview", label: "Repo overview" },
     { 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: "vortex_seam_specialist_enabled", flag: "--vortex-seam", label: "Vortex seam specialist" },
     { key: "auto_land_default", flag: "--auto-land", label: "Auto land (new stacks)" },
 ];

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" | "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" | "vortex_seam_specialist_enabled" | "auto_land_default", string>;
 /** Config rows in a stable order: writable toggles, then connected flags. */
 export declare function buildConfigRows(settings: SettingsResponse): TabsConfigRow[];
 /**

package/dist/commands/registry.js

@@ -52,6 +52,7 @@ export const COMMAND_REGISTRY = [
             "  [--context text] [--context-file path] [--thread slug]",
             "  [--idempotency-key k] [--webhook-url https://…]",
             "  HTTP 429 exits 7 (rate_limited) with retry_after_seconds",
+            "  Uploads over 1 MB / 1_000_000 are rejected with HTTP 413 and do not create a job",
         ],
         async run(args, ctx) {
             if (ctx.mode === "shell") {
@@ -164,8 +165,8 @@ export const COMMAND_REGISTRY = [
             "mergestorm settings [--json]    Read the automation toggles (Config tab on a TTY)",
             "  [--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] [--vortex-seam on|off]",
-            "  [--auto-land on|off]            Auto land default for stacks opened after this",
+            "  [--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",
             "  With flags: PATCH those settings and print the stored result",
         ],
         async run(args, ctx) {

package/dist/commands/review-client.js

@@ -364,7 +364,10 @@ export async function pollPrVortexReview(cfg, owner, repo, prNumber, opts = {})
         lastEnvelope = envelope;
         const resting = (lastEnvelope.raw_status ?? lastEnvelope.status) !== "in_progress";
         const matches = !opts.afterSha || shaMatches(lastEnvelope.head_sha, opts.afterSha);
-        if (resting && matches)
+        // MS-01: A resting completion with newer_pass_pending indicates a newer
+        // attempt is in flight. Do not satisfy the wait from this stale result.
+        const stale = lastEnvelope.newer_pass_pending === true;
+        if (resting && matches && !stale)
             return lastEnvelope;
         opts.onTick?.("progress");
         await sleepBeforePoll();

package/dist/commands/review.js

@@ -40,7 +40,8 @@ function normalizeVortexSpecialistIds(value) {
     const selected = new Set(value.filter((id) => typeof id === "string" && VORTEX_SPECIALIST_IDS.includes(id)));
     return VORTEX_SPECIALIST_IDS.filter((id) => selected.has(id));
 }
-const REVIEW_USAGE = "usage: mergestorm review [base] [head] [--json] [--wait|--no-wait] [--timeout seconds] [--router off|standard|max|manual] [--specialists id,id] [--context text] [--context-file path] [--idempotency-key k] [--webhook-url https://…] [--thread slug]";
+const REVIEW_USAGE = "usage: mergestorm review [base] [head] [--json] [--wait|--no-wait] [--timeout seconds] [--router off|standard|max|manual] [--specialists id,id] [--context text] [--context-file path] [--idempotency-key k] [--webhook-url https://…] [--thread slug]\n" +
+    "Uploads over 1 MB / 1_000_000 are rejected with HTTP 413 and do not create a job.";
 function usageError(message = REVIEW_USAGE) {
     return new CommandError(message, REVIEW_EXIT.usage, "usage");
 }
@@ -164,6 +165,9 @@ export function parseReviewArgs(args) {
             thread = slug;
             continue;
         }
+        if (a === "-h" || a === "--help") {
+            throw usageError();
+        }
         if (a.startsWith("-")) {
             throw usageError(`unknown flag: ${a}`);
         }
@@ -227,6 +231,10 @@ function asPollCommandError(err, jobId) {
     return new CommandError(withReviewJobRecovery(`Poll failed: ${detail}`, jobId));
 }
 export async function cmdReview(args, opts = {}) {
+    if (args.includes("-h") || args.includes("--help")) {
+        console.log(REVIEW_USAGE);
+        return;
+    }
     const parsed = parseReviewArgs(args);
     const base = resolveReviewBase(parsed.base);
     const head = parsed.head || "HEAD";

package/dist/commands/settings.d.ts

@@ -3,7 +3,7 @@ import { type SettingsPatch, type SettingsResponse } from "../api.js";
  * CLI flag → Bearer settings key. on|off only. 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" | "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" | "vortex_seam_specialist_enabled" | "auto_land_default">;
 export type SettingsArgs = {
     json: boolean;
     patch: SettingsPatch;

package/dist/stack-dto.d.ts

@@ -20,7 +20,7 @@ export type StackReviewStatus = "approved" | "changes_requested" | "reviewed" |
  * `incomplete` is a posted verdict whose head still has unreviewed files
  * (#1947): Work paints Incomplete, never Reviewed or all clear.
  */
-export type StackVortexStatus = "reviewing" | "seam_pending" | "all_clear" | "findings" | "throttled" | "failed" | "incomplete";
+export type StackVortexStatus = "queued" | "skipped" | "reviewing" | "seam_pending" | "all_clear" | "findings" | "throttled" | "failed" | "incomplete";
 export type StackCycloneStatus = "patching" | "awaiting_fix";
 export type StackTempestStatus = "reviewing" | "findings" | "clear" | "failed" | "stale";
 export type StackAgentName = "vortex" | "cyclone" | "tempest";
@@ -36,6 +36,8 @@ export type StackAgentRun = {
     status: string;
     /** Full SHA when known. UI shortens to 7. */
     sha: string | null;
+    pass?: number | null;
+    skipReason?: string | null;
     startedAt?: string | null;
     finishedAt?: string | null;
     /**

package/dist/ui/banner.js

@@ -87,6 +87,9 @@ const WHATS_NEW = {
     "0.3.17": [
         "nginx 413 names the upload limit instead of Failed: {}",
     ],
+    "0.3.18": [
+        "pr --wait fences a stale same-head pass",
+    ],
 };
 function densityFromVariant(variant) {
     if (variant === "mini" || variant === "nano")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mergestorm",
-  "version": "0.3.17",
+  "version": "0.3.18",
   "description": "Mergestorm CLI (mg) — local reviews & stacked PRs. MIT; build from source: https://github.com/marginsystems/mergestorm-cli",
   "license": "MIT",
   "type": "module",