mergestorm 0.3.15 → 0.3.17

package/README.md

@@ -45,12 +45,12 @@ On a TTY, bare `mergestorm` (or `mergestorm shell`) opens a branded REPL: a comp
 
 ```
 ╭──────────────────────────────────────────────────────────────────────────────╮
-│ ▟██▛  mergestorm v0.3.15                                                     │
+│ ▟██▛  mergestorm v0.3.17                                                     │
 │  ▜▙   ● 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.15: PR wait + settings + both skills in the npm tarball    │
+│       New in v0.3.17: nginx 413 names the upload limit instead of Failed: {} │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 mergestorm
 ╭──────────────────────────────────────────────────────────────────────────────╮
@@ -99,7 +99,7 @@ mergestorm stack reset --force  Clear local authoring state (not branches/PRs)
 
 `mg` is a short alias for `mergestorm` (same binary), e.g. `mg stack create`. Happy path: **create → commit → submit → restack → land**. On review-unit stacks, `stack land` **promotes** the tip into the unit (same gates as the dashboard); otherwise it lands the bottom open PR. `stack adopt` is for importing a chain that already exists on GitHub (legacy / Graphite). Restack/land use the same login key (`/api/v1/stacks`). Unattended landing is `mg queue add`.
 
-`stack create` checks out a new branch from the current tip (or `--onto <branch>`), discovers trunk (`main` / `master` / `origin/HEAD`, overridable with `--trunk`), and records `{ branch, parentBranch }` in CLI-managed state under **`~/.mergestorm/stacks/<repo-id>/stack.json`**. The CLI updates this automatically; never edit it. Linked worktrees share state, while independent clones remain isolated. Creating onto trunk with a non-empty active stack starts a new one. `--trunk` only sets trunk metadata — it does **not** change the parent; use `--onto main` (etc.) for a fresh stack from trunk.
+`stack create` checks out a new branch from the current tip (or `--onto <branch>`), discovers trunk (`main` / `master` / `origin/HEAD`, overridable with `--trunk`), and records `{ branch, parentBranch }` in CLI-managed state under **`~/.mergestorm/stacks/<repo-id>/stack.json`**. The CLI updates this automatically; never edit it. Each worktree has its own authoring state; independent clones stay isolated too. Creating onto trunk with a non-empty active stack starts a new one. `--trunk` only sets trunk metadata — it does **not** change the parent; use `--onto main` (etc.) for a fresh stack from trunk.
 
 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`.
 
@@ -119,7 +119,7 @@ Removes `~/.mergestorm/config.json` so the stored key is no longer used.
 
 ### `review [base] [head]`
 
-Collects `git diff base...head` (default: discovered trunk — `origin/HEAD`, `main`, or `master`), attaches the changed file contents (up to 40 files, skipping files > 400 KB), submits the job, and polls until it finishes (~8 min max — Core plus a Max fleet can exceed 3 minutes). The thread slug defaults to the current branch (`local/<branch>`); pass `--thread` to override so follow-ups chain on a chosen slug. The CLI does not scan `.mergestorm/context/`.
+Collects `git diff base...head` (default: discovered trunk — `origin/HEAD`, `main`, or `master`), attaches the changed file contents (up to 40 files, skipping files > 400 KB), submits the job, and polls until it finishes (~8 min max — Core plus a Max fleet can exceed 3 minutes). The thread slug defaults to the current branch (`local/<branch>`); pass `--thread` to override so follow-ups chain on a chosen slug. The CLI still does not scan a repo folder for review context. GitHub Vortex will read house-rule files in a later PR (`AGENTS.md`, `CLAUDE.md`, alwaysApply Cursor rules). That ingest is not shipping yet.
 
 ```bash
 mergestorm review              # discovered trunk (origin/HEAD, main, or master)...HEAD

package/dist/api.d.ts

@@ -1,4 +1,5 @@
 import { type Config } from "./config.js";
+import { BEARER_SETTINGS_KEYS as SETTINGS_WRITABLE_KEYS, type BearerSettingsKey as SettingsWritableKey } from "./automation-catalog.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";
 /** Default per-request timeout so a hung API cannot stall the shell/CI forever. */
@@ -45,6 +46,10 @@ export type MeResponse = {
             limit: number | null;
             remaining: number | null;
         };
+        /** Non-expiring credits spent after the monthly standard pool. */
+        bonus?: {
+            remaining: number;
+        };
     };
 };
 export type JobListItem = {
@@ -121,6 +126,8 @@ export type PrVortexReview = {
     verdict: string | null;
     summary?: string | null;
     head_sha: string | null;
+    /** Attempt number on this head (#2027). Absent only from servers older than the pass column. */
+    pass?: number;
     review_count: number;
     skip_reason: string | null;
     reviewed_at: string | null;
@@ -128,12 +135,25 @@ export type PrVortexReview = {
     findings: PrReviewFindings | null;
     patch_policy: unknown | null;
 };
+/**
+ * Pass selection on the DB-only PR review read (#2027). `pass` names one row;
+ * `afterPass` asks for a later pass (`pass > afterPass`) on the SHA filter.
+ */
+export type PrReviewPassSelector = {
+    pass?: number;
+    afterPass?: number;
+};
+export declare function isPositiveInteger(value: unknown): value is number;
+/** Append pass selection and SHA filter to a PR review query. */
+export declare function applyPrReviewQuery(query: URLSearchParams, opts: PrReviewPassSelector & {
+    afterSha?: string;
+}): void;
 /**
  * Bearer-writable settings keys, mirroring the `/api/v1/settings` allowlist.
  * The connected flags are read-only there and deliberately absent here.
  */
-export declare const SETTINGS_WRITABLE_KEYS: readonly ["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"];
-export type SettingsWritableKey = (typeof SETTINGS_WRITABLE_KEYS)[number];
+export { SETTINGS_WRITABLE_KEYS };
+export type { SettingsWritableKey };
 export type SettingsPatch = Partial<Record<SettingsWritableKey, boolean>>;
 /** GET and PATCH `/api/v1/settings` both answer with this shape. */
 export type SettingsResponse = Record<SettingsWritableKey, boolean> & {
@@ -171,7 +191,8 @@ export declare function getReview(jobId: string, cfg?: Config, opts?: {
 export declare function getPrVortexReview(owner: string, repo: string, prNumber: number, cfg?: Config, opts?: {
     signal?: AbortSignal;
     timeoutMs?: number;
-}): Promise<PrVortexReview>;
+    afterSha?: string;
+} & PrReviewPassSelector): Promise<PrVortexReview>;
 /** List stacks (Bearer GET /api/v1/stacks). */
 export declare function listStacks(cfg?: Config, opts?: {
     timeoutMs?: number;
@@ -180,13 +201,32 @@ export declare function listStacks(cfg?: Config, opts?: {
 export declare function getEnrichedStack(stackId: string, cfg?: Config, opts?: {
     timeoutMs?: number;
 }): Promise<StackDto | null>;
+/**
+ * Per-stack automation policy. Auto land is a boolean; the review / patch
+ * overrides are tri-state (`null` clears back to the account flag). Absent
+ * keys are left untouched.
+ */
+export type StackPolicyPatch = {
+    autoEnqueueWhenReady?: boolean;
+    autoReviewOverride?: boolean | null;
+    autoPatchOverride?: boolean | null;
+};
+/** Drop undefined keys so the wire body only carries what was requested. */
+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): Promise<unknown>;
+export declare function adoptStack(owner: string, repo: string, prNumber: number, cfg?: Config, policy?: StackPolicyPatch): Promise<unknown>;
 /** 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;
 }>;
+/** Arm or disarm Auto land on one owned stack. */
+export declare function setStackAutoLand(stackId: string, enabled: boolean, cfg?: Config): Promise<unknown>;
+/**
+ * Patch any subset of one owned stack's automation policy
+ * (Bearer PATCH /api/v1/stacks/:id). `null` clears an override.
+ */
+export declare function setStackPolicy(stackId: string, policy: StackPolicyPatch, cfg?: Config): Promise<unknown>;
 /** Restack descendants (Bearer POST /api/v1/stacks/:id/restack). */
 export declare function restackStack(stackId: string, cfg?: Config): Promise<unknown>;
 /** Land the bottom open layer (Bearer POST /api/v1/stacks/:id/land-next). */

package/dist/api.js

@@ -1,4 +1,5 @@
 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";
 /** Default per-request timeout so a hung API cannot stall the shell/CI forever. */
 export const DEFAULT_API_TIMEOUT_MS = 30_000;
@@ -154,19 +155,23 @@ export async function devicePost(base, route, json, opts = {}) {
     }
     return { status: res.status, body: parsed };
 }
+export function isPositiveInteger(value) {
+    return typeof value === "number" && Number.isInteger(value) && value >= 1;
+}
+/** Append pass selection and SHA filter to a PR review query. */
+export function applyPrReviewQuery(query, opts) {
+    if (opts.afterSha)
+        query.set("after_sha", opts.afterSha);
+    if (opts.pass !== undefined)
+        query.set("pass", String(opts.pass));
+    if (opts.afterPass !== undefined)
+        query.set("after_pass", String(opts.afterPass));
+}
 /**
  * Bearer-writable settings keys, mirroring the `/api/v1/settings` allowlist.
  * The connected flags are read-only there and deliberately absent here.
  */
-export const SETTINGS_WRITABLE_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",
-    "vortex_seam_specialist_enabled",
-];
+export { SETTINGS_WRITABLE_KEYS };
 /**
  * Fetch Bearer /api/v1/settings; null on 404/network/timeouts so panels can
  * degrade (same contract as {@link getMe}), while 401 still surfaces.
@@ -290,6 +295,7 @@ export async function getPrVortexReview(owner, repo, prNumber, cfg, opts) {
         repo: cleanRepo,
         pr_number: String(prNumber),
     });
+    applyPrReviewQuery(query, opts ?? {});
     const { status, body, retryAfterSeconds } = await apiFetch(resolved, `/api/v1/stacks/pr-review?${query.toString()}`, { signal: opts?.signal, timeoutMs: opts?.timeoutMs });
     if (status === 404) {
         throw new CommandError(`Vortex review not found: ${cleanOwner}/${cleanRepo}#${prNumber}`, REVIEW_EXIT.failed, "not_found");
@@ -343,16 +349,38 @@ export async function getEnrichedStack(stackId, cfg, opts) {
     }
     return stacks.find((stack) => stack?.id === id) ?? null;
 }
+/** Drop undefined keys so the wire body only carries what was requested. */
+export function stackPolicyBody(policy) {
+    const body = {};
+    if (typeof policy?.autoEnqueueWhenReady === "boolean") {
+        body.autoEnqueueWhenReady = policy.autoEnqueueWhenReady;
+    }
+    if (policy?.autoReviewOverride !== undefined) {
+        body.autoReviewOverride = policy.autoReviewOverride;
+    }
+    if (policy?.autoPatchOverride !== undefined) {
+        body.autoPatchOverride = policy.autoPatchOverride;
+    }
+    return body;
+}
 /** Adopt an open PR chain (Bearer POST /api/v1/stacks/adopt). */
-export async function adoptStack(owner, repo, prNumber, cfg) {
+export async function adoptStack(owner, repo, prNumber, cfg, policy) {
     const resolved = cfg ?? (await loadConfig());
-    const { status, body } = await apiFetch(resolved, "/api/v1/stacks/adopt", {
+    const { status, body, retryAfterSeconds } = await apiFetch(resolved, "/api/v1/stacks/adopt", {
         method: "POST",
-        json: { owner, repo, prNumber },
+        json: {
+            owner,
+            repo,
+            prNumber,
+            ...stackPolicyBody(policy),
+        },
     });
     if (status === 404) {
         throw new CommandError("Stacks API is not available on this server yet. Deploy the API update or use the dashboard.");
     }
+    if (status === 429) {
+        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)}`);
     }
@@ -390,6 +418,21 @@ async function stackMutation(stackId, pathSuffix, method, json, failLabel, cfg)
     }
     return body;
 }
+/** Arm or disarm Auto land on one owned stack. */
+export async function setStackAutoLand(stackId, enabled, cfg) {
+    return setStackPolicy(stackId, { autoEnqueueWhenReady: enabled }, cfg);
+}
+/**
+ * Patch any subset of one owned stack's automation policy
+ * (Bearer PATCH /api/v1/stacks/:id). `null` clears an override.
+ */
+export async function setStackPolicy(stackId, policy, cfg) {
+    const json = stackPolicyBody(policy);
+    if (Object.keys(json).length === 0) {
+        throw new CommandError("setStackPolicy needs at least one policy key");
+    }
+    return stackMutation(stackId, "", "PATCH", json, "Failed to set stack policy", cfg);
+}
 /** Restack descendants (Bearer POST /api/v1/stacks/:id/restack). */
 export async function restackStack(stackId, cfg) {
     return stackMutation(stackId, "/restack", "POST", {}, "Failed to restack", cfg);

package/dist/automation-catalog.d.ts

@@ -0,0 +1,37 @@
+export declare const BEARER_SETTINGS: readonly [{
+    readonly key: "auto_review_enabled";
+    readonly flag: "--auto-review";
+    readonly label: "Auto review";
+}, {
+    readonly key: "auto_patch_enabled";
+    readonly flag: "--auto-patch";
+    readonly label: "Auto patch";
+}, {
+    readonly key: "vortex_show_thinking_traces";
+    readonly flag: "--vortex-thinking";
+    readonly label: "Vortex thinking traces";
+}, {
+    readonly key: "repo_overview_enabled";
+    readonly flag: "--repo-overview";
+    readonly label: "Repo overview";
+}, {
+    readonly key: "review_unit_land_prs_enabled";
+    readonly flag: "--review-unit-land";
+    readonly label: "Review Unit land PRs";
+}, {
+    readonly key: "cyclone_review_unit_land_prs_enabled";
+    readonly flag: "--cyclone-review-unit-land";
+    readonly label: "Cyclone Review Unit land PRs";
+}, {
+    readonly key: "vortex_seam_specialist_enabled";
+    readonly flag: "--vortex-seam";
+    readonly label: "Vortex seam specialist";
+}, {
+    readonly key: "auto_land_default";
+    readonly flag: "--auto-land";
+    readonly label: "Auto land (new stacks)";
+}];
+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>;

package/dist/automation-catalog.js

@@ -0,0 +1,13 @@
+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: "vortex_show_thinking_traces", flag: "--vortex-thinking", label: "Vortex thinking traces" },
+    { 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: "vortex_seam_specialist_enabled", flag: "--vortex-seam", label: "Vortex seam specialist" },
+    { key: "auto_land_default", flag: "--auto-land", label: "Auto land (new stacks)" },
+];
+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]));

package/dist/client/index.d.ts

@@ -1,5 +1,7 @@
 export { DEFAULT_API, apiBase, clearConfig, configPath, keyDisplay, loadConfig, mergestormHome, resolveApiKey, saveConfig, type Config, } from "../config.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, 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 ThreadDetail, type ThreadListItem, } from "../api.js";
+export { BEARER_SETTINGS, 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, isTransientReviewPollError, isTransientReviewPollStatus, loadReviewContext, pollPrVortexReview, pollReview, stretchedPollIntervalMs, submitReview, transientRetryWaitMs, type PollReviewOptions, type PollPrVortexReviewOptions, type ReviewInput, type SubmitReviewOptions, } from "../commands/review-client.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";

package/dist/client/index.js

@@ -1,5 +1,7 @@
 export { DEFAULT_API, apiBase, clearConfig, configPath, keyDisplay, loadConfig, mergestormHome, resolveApiKey, saveConfig, } from "../config.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, } from "../api.js";
+export { BEARER_SETTINGS, 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, isTransientReviewPollError, isTransientReviewPollStatus, loadReviewContext, pollPrVortexReview, pollReview, stretchedPollIntervalMs, submitReview, transientRetryWaitMs, } from "../commands/review-client.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";

package/dist/commands/browse.d.ts

@@ -1,4 +1,4 @@
-import { type JobListItem, type SettingsResponse, type SettingsWritableKey } from "../api.js";
+import { type JobListItem, type SettingsResponse } from "../api.js";
 import { type ReviewJobRow } from "../ui/job-envelope.js";
 import { type TabId, type TabsConfigRow } from "../ui/tabs.js";
 import { type UsagePanelJob } from "../ui/usage.js";
@@ -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<SettingsWritableKey, 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" | "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/browse.js

@@ -1,7 +1,9 @@
 import { getMe, getReview, getSettings, listJobs, patchSettings, SETTINGS_WRITABLE_KEYS, } from "../api.js";
+import { 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";
+import { humanSummary } from "../ui/human-summary.js";
 import { toReviewJobEnvelope, } from "../ui/job-envelope.js";
 import { runTabsBrowser, } from "../ui/tabs.js";
 import { formatDaysLeft, formatResetLabel } from "../ui/usage.js";
@@ -89,9 +91,10 @@ export function formatJobDetailLines(row) {
         lines.push(`  Credits  ${e.credits.standard} standard`);
     if (e.error)
         lines.push(ansi.red(`  Error    ${e.error}`));
-    if (e.summary) {
+    const summary = e.summary ? humanSummary(e.summary) : null;
+    if (summary) {
         lines.push("");
-        for (const l of e.summary.split("\n"))
+        for (const l of summary.split("\n"))
             lines.push(`  ${l}`);
     }
     const inline = e.findings?.inline ?? [];
@@ -117,15 +120,7 @@ export function formatJobDetailLines(row) {
     return lines;
 }
 /** Human labels for the Config tab and the static `settings` printout. */
-export const SETTINGS_LABELS = {
-    auto_review_enabled: "Auto review",
-    auto_patch_enabled: "Auto patch",
-    vortex_show_thinking_traces: "Vortex thinking traces",
-    repo_overview_enabled: "Repo overview",
-    review_unit_land_prs_enabled: "Review Unit land PRs",
-    cyclone_review_unit_land_prs_enabled: "Cyclone Review Unit land PRs",
-    vortex_seam_specialist_enabled: "Vortex seam specialist",
-};
+export const SETTINGS_LABELS = BEARER_SETTINGS_LABELS;
 /** Config rows in a stable order: writable toggles, then connected flags. */
 export function buildConfigRows(settings) {
     return [
@@ -225,6 +220,7 @@ export async function openTabsBrowser(initial) {
                 plan: me.plan_label_key ?? me.plan_key,
                 used: me.usage.standard.used,
                 limit: me.usage.standard.limit,
+                bonusRemaining: me.usage.bonus?.remaining,
                 resetsAt: me.resets_at,
                 jobs: jobs.slice(0, 5).map(toPanelJob),
                 jobsError: jobsError ?? undefined,

package/dist/commands/credits.js

@@ -36,6 +36,7 @@ export async function cmdCredits(args) {
         plan: me.plan_label_key ?? me.plan_key,
         used: s.used,
         limit: s.limit,
+        bonusRemaining: me.usage.bonus?.remaining,
         resetsAt: me.resets_at,
         jobs: recentJobs.map(toPanelJob),
         columns,

package/dist/commands/pr.d.ts

@@ -6,6 +6,10 @@ export type ParsedPrArgs = {
     format: "json" | "pretty";
     wait: boolean;
     afterSha?: string;
+    /** Exact pass on the head (#2027). */
+    pass?: number;
+    /** Only a pass later than this one on the head (#2027). */
+    afterPass?: number;
     timeoutMs: number;
 };
 export type PrOptions = {

package/dist/commands/pr.js

@@ -3,9 +3,17 @@ import { loadConfig } from "../config.js";
 import { CommandError, REVIEW_EXIT } from "../errors.js";
 import { ansi } from "../ui/ansi.js";
 import { renderFindings } from "../ui/findings.js";
+import { humanSummary } from "../ui/human-summary.js";
 import { PrReviewPollTimeoutError, REVIEW_POLL_DEFAULT_TIMEOUT_MS, pollPrVortexReview, } from "./review-client.js";
 import { parseAdoptTarget } from "./stack.js";
-const PR_USAGE = "usage: mergestorm pr <owner/repo>#<n> [--json] [--wait] [--after-sha <sha>] [--timeout <s>]";
+const PR_USAGE = "usage: mergestorm pr <owner/repo>#<n> [--json] [--wait] [--after-sha <sha>] [--pass <n>] [--after-pass <n>] [--timeout <s>]";
+function parsePassFlag(flag, value) {
+    const parsed = Number(value);
+    if (!value?.trim() || !/^[0-9]+$/.test(value.trim()) || !Number.isSafeInteger(parsed) || parsed < 1) {
+        throw usageError(`${flag} requires a positive integer`);
+    }
+    return parsed;
+}
 function usageError(message = PR_USAGE) {
     return new CommandError(message, REVIEW_EXIT.usage, "usage");
 }
@@ -14,6 +22,8 @@ export function parsePrArgs(args, defaults = { format: "json" }) {
     let format = defaults.format;
     let wait = false;
     let afterSha;
+    let pass;
+    let afterPass;
     let timeoutMs = REVIEW_POLL_DEFAULT_TIMEOUT_MS;
     for (let i = 0; i < args.length; i += 1) {
         const arg = args[i];
@@ -42,6 +52,14 @@ export function parsePrArgs(args, defaults = { format: "json" }) {
             }
             continue;
         }
+        if (arg === "--pass" || arg.startsWith("--pass=")) {
+            pass = parsePassFlag("--pass", arg === "--pass" ? args[++i] : arg.slice("--pass=".length));
+            continue;
+        }
+        if (arg === "--after-pass" || arg.startsWith("--after-pass=")) {
+            afterPass = parsePassFlag("--after-pass", arg === "--after-pass" ? args[++i] : arg.slice("--after-pass=".length));
+            continue;
+        }
         if (arg === "--timeout" || arg.startsWith("--timeout=")) {
             const value = arg === "--timeout" ? args[++i] : arg.slice("--timeout=".length);
             const seconds = Number(value);
@@ -58,6 +76,12 @@ export function parsePrArgs(args, defaults = { format: "json" }) {
     }
     if (afterSha && !wait)
         throw usageError("--after-sha requires --wait");
+    if (pass !== undefined && afterPass !== undefined) {
+        throw usageError("--pass and --after-pass are exclusive");
+    }
+    if ((pass !== undefined || afterPass !== undefined) && (!wait || !afterSha)) {
+        throw usageError("--pass and --after-pass require --wait --after-sha");
+    }
     if (target.length < 1 || target.length > 2)
         throw usageError();
     let parsed;
@@ -67,7 +91,7 @@ export function parsePrArgs(args, defaults = { format: "json" }) {
     catch {
         throw usageError();
     }
-    return { ...parsed, format, wait, afterSha, timeoutMs };
+    return { ...parsed, format, wait, afterSha, pass, afterPass, timeoutMs };
 }
 function printPretty(envelope) {
     console.log(`Status:        ${envelope.status}`);
@@ -78,8 +102,9 @@ function printPretty(envelope) {
     console.log(`Finding count: ${envelope.finding_count}`);
     if (envelope.skip_reason)
         console.log(`Skip reason:   ${envelope.skip_reason}`);
-    if (envelope.summary)
-        console.log(envelope.summary);
+    const summary = envelope.summary ? humanSummary(envelope.summary) : null;
+    if (summary)
+        console.log(summary);
     renderFindings(envelope.findings, {
         emptyMessage: envelope.status === "completed",
     });
@@ -96,6 +121,8 @@ export async function cmdPr(args, opts = {}) {
                 timeoutMs: parsed.timeoutMs,
                 intervalMs: opts.pollIntervalMs,
                 afterSha: parsed.afterSha,
+                pass: parsed.pass,
+                afterPass: parsed.afterPass,
                 signal: opts.signal,
                 ...opts.poll,
                 onTick(kind) {
@@ -116,7 +143,7 @@ export async function cmdPr(args, opts = {}) {
             console.log("");
     }
     else {
-        envelope = await getPrVortexReview(parsed.owner, parsed.repo, parsed.prNumber, cfg, { signal: opts.signal });
+        envelope = await getPrVortexReview(parsed.owner, parsed.repo, parsed.prNumber, cfg, { signal: opts.signal, pass: parsed.pass, afterPass: parsed.afterPass });
     }
     if (parsed.format === "json") {
         console.log(JSON.stringify(envelope, null, opts.mode === "shell" ? 2 : undefined));

package/dist/commands/registry.js

@@ -66,7 +66,8 @@ export const COMMAND_REGISTRY = [
         summary: "Latest Vortex review for a GitHub PR",
         usage: [
             "mergestorm pr <owner/repo>#<n>  Fetch the latest Vortex PR review",
-            "  [--json] [--wait] [--after-sha <sha>] [--timeout <s>]",
+            "  [--json] [--wait] [--after-sha <sha>] [--pass <n>] [--after-pass <n>] [--timeout <s>]",
+            "  --pass reads one attempt on the head; --after-pass waits for a later one (#2027)",
             "  Also accepts: mergestorm pr <owner/repo> <n>",
         ],
         async run(args, ctx) {
@@ -164,6 +165,7 @@ 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] [--vortex-seam on|off]",
+            "  [--auto-land on|off]            Auto land default for stacks opened after this",
             "  With flags: PATCH those settings and print the stored result",
         ],
         async run(args, ctx) {
@@ -210,11 +212,12 @@ export const COMMAND_REGISTRY = [
         name: "stack",
         summary: "Stacks: /stack how-to, list yours, create → submit",
         usage: [
-            "mergestorm stack create [name]  New local stack layer ([--onto] [--trunk] [--extend])",
-            "mergestorm stack submit         Push active local stack, open PRs ([--extend])",
+            "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 reset --force  Clear this repo's pre-submit authoring state",
             "mergestorm stack list [--json]  List registered stacks",
-            "mergestorm stack adopt <owner/repo>#<pr>  Import an existing open PR chain",
+            "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)",
         ],

package/dist/commands/review-client.d.ts

@@ -1,4 +1,4 @@
-import { type PrVortexReview } from "../api.js";
+import { type PrReviewPassSelector, type PrVortexReview } from "../api.js";
 import type { Config } from "../config.js";
 import type { ReviewJobRow } from "../ui/job-envelope.js";
 export declare const REVIEW_POLL_INTERVAL_MS = 2000;
@@ -10,6 +10,8 @@ export declare const REVIEW_POLL_STRETCH_AFTER_MS = 60000;
 export declare const REVIEW_POLL_STRETCH_SPAN_MS = 60000;
 /** Same thread slug contract as POST /api/v1/reviews. */
 export declare const REVIEW_THREAD_SLUG_RE: RegExp;
+/** Same product limit as `api/src/v1/reviews.ts` `MAX_DIFF_BYTES`. */
+export declare const MAX_REVIEW_DIFF_BYTES = 1000000;
 export declare const MAX_CONTEXT_TEXT_CHARS = 60000;
 export declare const MAX_CONTEXT_FILES = 10;
 export declare const MAX_CONTEXT_FILE_CHARS = 16000;
@@ -52,7 +54,7 @@ export type LoadReviewContextOptions = {
     contextFiles: string[];
     cwd?: string;
     readStdin?: () => Promise<string>;
-    /** Reject contextFiles that resolve outside this directory (agent-driven callers). */
+    /** Bound contextFiles to this directory; defaults to the canonical repo root. */
     sandboxCwd?: string;
 };
 /** Load --context / --context-file and enforce the API caps client-side. */
@@ -62,6 +64,11 @@ export declare function submitReview(cfg: Config, input: ReviewInput, opts?: Sub
     row: ReviewJobRow;
     retryAfterSeconds?: number;
 }>;
+/**
+ * Human copy for a failed POST /api/v1/reviews.
+ * nginx 413 is HTML, so `submitReview` stores `{}` and used to print `Failed: {}`.
+ */
+export declare function formatReviewSubmitError(status: number, body: unknown): string;
 /** Exponential backoff with jitter in `[0.5, 1.0]` of the base delay. */
 export declare function transientRetryWaitMs(input: {
     retryAfterSeconds?: number;
@@ -98,7 +105,7 @@ export type PollReviewOptions = {
     /** Test seam for backoff jitter; production uses `Math.random`. */
     random?: () => number;
 };
-export type PollPrVortexReviewOptions = PollReviewOptions & {
+export type PollPrVortexReviewOptions = PollReviewOptions & PrReviewPassSelector & {
     afterSha?: string;
 };
 /** Poll the DB-only PR review endpoint until the requested pass is resting. */