mergestorm 0.3.15 → 0.3.17

package/dist/commands/review-client.js

@@ -1,6 +1,6 @@
 import { readFile, realpath } from "node:fs/promises";
 import { join, relative, resolve, sep } from "node:path";
-import { apiFetch } from "../api.js";
+import { apiFetch, applyPrReviewQuery, isPositiveInteger, } from "../api.js";
 import { CommandError, REVIEW_EXIT, isCommandErrorCode, rateLimitedMessage } from "../errors.js";
 import { changedNamesInSandbox, collectChangedFiles, git, parseGithubOriginRepo, repoRoot, } from "../git.js";
 export const REVIEW_POLL_INTERVAL_MS = 2_000;
@@ -12,6 +12,8 @@ export const REVIEW_POLL_STRETCH_AFTER_MS = 60_000;
 export const REVIEW_POLL_STRETCH_SPAN_MS = 60_000;
 /** Same thread slug contract as POST /api/v1/reviews. */
 export const REVIEW_THREAD_SLUG_RE = /^[a-zA-Z0-9][a-zA-Z0-9._/-]{0,119}$/;
+/** Same product limit as `api/src/v1/reviews.ts` `MAX_DIFF_BYTES`. */
+export const MAX_REVIEW_DIFF_BYTES = 1_000_000;
 export const MAX_CONTEXT_TEXT_CHARS = 60_000;
 export const MAX_CONTEXT_FILES = 10;
 export const MAX_CONTEXT_FILE_CHARS = 16_000;
@@ -25,9 +27,11 @@ export async function collectReviewInput(base, head, cwd = process.cwd(), sandbo
             diff = "";
         }
         else {
-            const root = repoRoot(cwd);
-            const specs = names.map((name) => `:(literal)${relative(cwd, join(root, name))}`);
-            diff = git(["diff", `${base}...${head}`, "--", ...specs], cwd);
+            const canonicalCwd = await realpath(cwd);
+            const root = repoRoot(canonicalCwd);
+            const specs = names.map((name) => `:(literal)${relative(canonicalCwd, join(root, name))}`);
+            // Collection must not execute configured diff or text conversion helpers.
+            diff = git(["diff", "--no-ext-diff", "--no-textconv", `${base}...${head}`, "--", ...specs], cwd);
         }
     }
     catch (err) {
@@ -83,26 +87,28 @@ export async function loadReviewContext(opts) {
     let total = 0;
     for (const rawPath of opts.contextFiles) {
         const abs = resolve(cwd, rawPath);
-        if (opts.sandboxCwd) {
-            let sandboxReal;
-            let targetReal;
-            try {
-                [sandboxReal, targetReal] = await Promise.all([
-                    realpath(resolve(opts.sandboxCwd)),
-                    realpath(abs),
-                ]);
-            }
-            catch {
-                throw contextUsage(`--context-file ${rawPath} must be inside the working directory`);
-            }
-            const relToSandbox = relative(sandboxReal, targetReal);
-            if (relToSandbox === ".." || relToSandbox.startsWith(`..${sep}`)) {
-                throw contextUsage(`--context-file ${rawPath} must be inside the working directory`);
-            }
+        const boundaryLabel = opts.sandboxCwd ? "working directory" : "repo root";
+        let targetReal;
+        let sandboxReal;
+        try {
+            sandboxReal = opts.sandboxCwd ? await realpath(resolve(opts.sandboxCwd)) : repoRoot(cwd);
+        }
+        catch {
+            throw contextUsage(`--context-file ${rawPath} must be inside the ${boundaryLabel}`);
+        }
+        try {
+            targetReal = await realpath(abs);
+        }
+        catch (err) {
+            const detail = err instanceof Error ? err.message : String(err);
+            throw contextUsage(`could not read --context-file ${rawPath}: ${detail}`);
+        }
+        if (targetReal !== sandboxReal && !targetReal.startsWith(`${sandboxReal}${sep}`)) {
+            throw contextUsage(`--context-file ${rawPath} must be inside the ${boundaryLabel}`);
         }
         let content;
         try {
-            content = await readFile(abs, "utf8");
+            content = await readFile(targetReal, "utf8");
         }
         catch (err) {
             const detail = err instanceof Error ? err.message : String(err);
@@ -148,6 +154,39 @@ export async function submitReview(cfg, input, opts = {}) {
         ...(retryAfterSeconds !== undefined ? { retryAfterSeconds } : {}),
     };
 }
+function reviewSubmitErrorText(body) {
+    if (body && typeof body === "object") {
+        const rec = body;
+        const message = typeof rec.message === "string" ? rec.message.trim() : "";
+        const error = typeof rec.error === "string" ? rec.error.trim() : "";
+        if (message)
+            return message;
+        if (error)
+            return error;
+    }
+    if (typeof body === "string") {
+        const trimmed = body.trim();
+        if (trimmed && !trimmed.startsWith("<"))
+            return trimmed.slice(0, 240);
+    }
+    return "";
+}
+/**
+ * Human copy for a failed POST /api/v1/reviews.
+ * nginx 413 is HTML, so `submitReview` stores `{}` and used to print `Failed: {}`.
+ */
+export function formatReviewSubmitError(status, body) {
+    const detail = reviewSubmitErrorText(body);
+    if (status === 413) {
+        if (detail)
+            return `${detail} No review job was created and no credits were charged.`;
+        return ("Upload rejected (HTTP 413). nginx stopped the body before a review job was created, " +
+            "so no credits were charged. Max diff size is 1 MB / 1_000_000 bytes.");
+    }
+    if (detail)
+        return `Failed (HTTP ${status}): ${detail}`;
+    return `Failed (HTTP ${status}). The API did not return a JSON error body.`;
+}
 /** Exponential backoff with jitter in `[0.5, 1.0]` of the base delay. */
 export function transientRetryWaitMs(input) {
     const exp = REVIEW_POLL_BACKOFF_MS * 2 ** Math.max(0, input.failureCount - 1);
@@ -242,8 +281,10 @@ export async function pollPrVortexReview(cfg, owner, repo, prNumber, opts = {})
         repo,
         pr_number: String(prNumber),
     });
-    if (opts.afterSha)
-        query.set("after_sha", opts.afterSha);
+    // #2027: the pass selector is fixed for the whole wait. after_pass stays
+    // what the caller handed in on every poll and every retry; it is never
+    // replaced by the pass of an in-progress envelope seen along the way.
+    applyPrReviewQuery(query, opts);
     let transientFailures = 0;
     let lastEnvelope = null;
     const sleepBeforeRetry = async (retryAfterSeconds) => {
@@ -310,7 +351,17 @@ export async function pollPrVortexReview(cfg, owner, repo, prNumber, opts = {})
         if (!poll.body || typeof poll.body !== "object") {
             throw new CommandError("Poll failed: invalid PR review response", REVIEW_EXIT.failed, "review_failed");
         }
-        lastEnvelope = poll.body;
+        const envelope = poll.body;
+        // The server filters by pass; re-check here so a server that ignores the
+        // selector can never satisfy the wait with the wrong pass.
+        if ((opts.pass !== undefined || opts.afterPass !== undefined) &&
+            (!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;
         const resting = (lastEnvelope.raw_status ?? lastEnvelope.status) !== "in_progress";
         const matches = !opts.afterSha || shaMatches(lastEnvelope.head_sha, opts.afterSha);
         if (resting && matches)

package/dist/commands/review.js

@@ -4,9 +4,10 @@ import { CommandError, DetachedError, REVIEW_EXIT, isCommandErrorCode, rateLimit
 import { discoverTrunk } from "../git-stack.js";
 import { ansi } from "../ui/ansi.js";
 import { formatFindingsLines } from "../ui/findings.js";
+import { humanSummary } from "../ui/human-summary.js";
 import { present } from "../ui/present.js";
 import { toReviewJobEnvelope, } from "../ui/job-envelope.js";
-import { MAX_IDEMPOTENCY_KEY_CHARS, REVIEW_POLL_DEFAULT_TIMEOUT_MS, REVIEW_POLL_MAX_TRANSIENT_RETRIES, REVIEW_THREAD_SLUG_RE, ReviewPollTimeoutError, collectReviewInput, isTransientReviewPollError, isTransientReviewPollStatus, loadReviewContext, pollReview, submitReview, } from "./review-client.js";
+import { MAX_IDEMPOTENCY_KEY_CHARS, REVIEW_POLL_DEFAULT_TIMEOUT_MS, REVIEW_POLL_MAX_TRANSIENT_RETRIES, REVIEW_THREAD_SLUG_RE, ReviewPollTimeoutError, collectReviewInput, isTransientReviewPollError, isTransientReviewPollStatus, loadReviewContext, pollReview, formatReviewSubmitError, submitReview, } from "./review-client.js";
 export { REVIEW_POLL_MAX_TRANSIENT_RETRIES, isTransientReviewPollError, isTransientReviewPollStatus, };
 /** Same public specialist allowlist as the API contract and migration 117. */
 export const VORTEX_ROUTER_MODES = ["off", "standard", "max", "manual"];
@@ -255,7 +256,6 @@ export async function cmdReview(args, opts = {}) {
     };
     try {
         const cfg = await loadConfig();
-        const meBefore = interactive ? await getMe(cfg) : null;
         progress(`Collecting diff ${base}...${head} …`);
         const input = await collectReviewInput(base, head);
         if (!input) {
@@ -320,7 +320,7 @@ export async function cmdReview(args, opts = {}) {
             });
         }
         if (submitted.status !== 202 && submitted.status !== 200) {
-            const message = `Failed: ${JSON.stringify(submitted.row, null, 2)}`;
+            const message = formatReviewSubmitError(submitted.status, submitted.row);
             if (json)
                 printJson(submitted.row, { status: "failed", error: message });
             throw new CommandError(message, REVIEW_EXIT.failed, "review_failed");
@@ -407,21 +407,24 @@ export async function cmdReview(args, opts = {}) {
         ];
         if (ran.length > 0)
             result.push(ansi.dim(`Specialists: ${ran.join(", ")}`));
-        if (row.summary)
-            result.push(row.summary);
+        const summary = row.summary ? humanSummary(row.summary) : null;
+        if (summary)
+            result.push(summary);
         result.push(...formatFindingsLines(row.findings, {
             emptyMessage: true,
         }));
-        if (interactive && meBefore) {
-            const meAfter = await getMe(cfg);
-            if (meAfter) {
-                const beforeLeft = meBefore.usage.standard.remaining ?? 0;
-                const afterLeft = meAfter.usage.standard.remaining ?? 0;
-                const used = Math.max(0, beforeLeft - afterLeft);
-                if (used > 0) {
-                    result.push(ansi.dim(`${used} credit${used === 1 ? "" : "s"} used · ${afterLeft} remaining`));
-                }
+        if (interactive) {
+            const me = await getMe(cfg);
+            const used = row.credits?.standard;
+            const remaining = me?.usage.standard.remaining;
+            const credits = [];
+            if (used != null) {
+                credits.push(`${used} credit${used === 1 ? "" : "s"} used`);
             }
+            if (remaining != null)
+                credits.push(`${remaining} remaining`);
+            if (credits.length > 0)
+                result.push(ansi.dim(credits.join(" · ")));
         }
         await present("Review", result);
     }

package/dist/commands/settings.d.ts

@@ -1,9 +1,9 @@
-import { type SettingsPatch, type SettingsResponse, type SettingsWritableKey } from "../api.js";
+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, SettingsWritableKey>;
+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 type SettingsArgs = {
     json: boolean;
     patch: SettingsPatch;

package/dist/commands/settings.js

@@ -1,4 +1,5 @@
 import { getSettings, patchSettings, } from "../api.js";
+import { BEARER_SETTINGS_FLAGS } from "../automation-catalog.js";
 import { loadConfig } from "../config.js";
 import { CommandError } from "../errors.js";
 import { present } from "../ui/present.js";
@@ -7,15 +8,7 @@ import { buildConfigRows, canBrowse, openTabsBrowser } from "./browse.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 const SETTINGS_FLAGS = {
-    "--auto-review": "auto_review_enabled",
-    "--auto-patch": "auto_patch_enabled",
-    "--vortex-thinking": "vortex_show_thinking_traces",
-    "--repo-overview": "repo_overview_enabled",
-    "--review-unit-land": "review_unit_land_prs_enabled",
-    "--cyclone-review-unit-land": "cyclone_review_unit_land_prs_enabled",
-    "--vortex-seam": "vortex_seam_specialist_enabled",
-};
+export const SETTINGS_FLAGS = BEARER_SETTINGS_FLAGS;
 /** Parse `settings` argv. Accepts `--flag on|off` and `--flag=on|off`. */
 export function parseSettingsArgs(args) {
     let json = false;

package/dist/commands/stack.d.ts

@@ -1,9 +1,10 @@
-import { adoptStack, ensureUpperPark, listStacks, type StackDto } from "../api.js";
+import { adoptStack, ensureUpperPark, listStacks, setStackPolicy, type StackDto, type StackPolicyPatch } from "../api.js";
 import { loadConfig } from "../config.js";
 import { createPr, findOpenPrNumber } from "../gh.js";
 import { parseGithubOriginRepo } from "../git.js";
-import { branchExists, commitsAheadOf, fetchRemoteBranch, pushBranch, tipCommitMessage, tipCommitSubject } from "../git-stack.js";
+import { branchExists, commitsAheadOf, createBranchFromHead, currentBranch, defaultLayerBranchName, deleteBranch, discoverTrunk, fetchRemoteBranch, pushBranch, tipCommitMessage, tipCommitSubject, worktreeDirty } from "../git-stack.js";
 import { buildPrBodyFromCommit } from "../pr-body.js";
+import { gitTopLevel } from "../repo-identity.js";
 import { loadStackMeta, saveStackMeta } from "../stack-meta.js";
 /** A registered stack layer that would become the parent of a new layer. */
 export type RegisteredParentHit = {
@@ -30,27 +31,72 @@ export declare function parseAdoptTarget(args: string[]): {
 };
 /** Empty + populated bodies for the TTY `stack list` panel. */
 export declare function buildStackListLines(stacks: StackDto[]): string[];
+/** Short per-stack policy suffixes: Auto land when on, overrides when pinned. */
+export declare function stackPolicyLabels(s: Pick<StackDto, "autoEnqueueWhenReady" | "autoReviewOverride" | "autoPatchOverride">): string[];
+/** Per-open policy flags shared by create, submit, and adopt (`on|off` only). */
+export type StackOpenPolicyFlags = {
+    autoLand?: boolean;
+    autoReview?: boolean;
+    autoPatch?: boolean;
+};
+/** Wire policy for adopt from the parsed `on|off` flags; absent keys stay off the body. */
+export declare function openPolicyPatch(flags: StackOpenPolicyFlags): StackPolicyPatch | undefined;
 /** Parse `stack create` argv into options. Exported for tests. */
 export declare function parseStackCreateArgs(args: string[]): {
     name?: string;
     onto?: string;
     trunk?: string;
     extend: boolean;
+    autoLand?: boolean;
+    autoReview?: boolean;
+    autoPatch?: boolean;
     asJson: boolean;
 };
 /** Parse `stack submit` argv. Exported for tests. */
 export declare function parseStackSubmitArgs(args: string[]): {
     extend: boolean;
+    autoLand?: boolean;
+    autoReview?: boolean;
+    autoPatch?: boolean;
+    asJson: boolean;
+};
+export declare function parseStackAdoptArgs(args: string[]): {
+    owner: string;
+    repo: string;
+    prNumber: number;
+    autoLand?: boolean;
+    autoReview?: boolean;
+    autoPatch?: boolean;
+    asJson: boolean;
+};
+export type StackSetArgs = {
+    stackId: string;
+    /** At least one of these is present. */
+    autoLand?: boolean;
+    autoReview?: boolean | null;
+    autoPatch?: boolean | null;
     asJson: boolean;
 };
+export declare function parseStackSetArgs(args: string[]): StackSetArgs;
 export declare function parseStackResetArgs(args: string[]): void;
 /** Injectable seams for unit tests. Production callers omit deps. */
 export type StackCreateDeps = {
     cwd?: string;
+    gitTopLevel?: typeof gitTopLevel;
+    worktreeDirty?: typeof worktreeDirty;
+    currentBranch?: typeof currentBranch;
+    branchExists?: typeof branchExists;
+    createBranchFromHead?: typeof createBranchFromHead;
+    deleteBranch?: typeof deleteBranch;
+    discoverTrunk?: typeof discoverTrunk;
+    defaultLayerBranchName?: typeof defaultLayerBranchName;
+    loadStackMeta?: typeof loadStackMeta;
+    saveStackMeta?: typeof saveStackMeta;
     listStacks?: typeof listStacks;
     loadConfig?: typeof loadConfig;
     parseGithubOriginRepo?: typeof parseGithubOriginRepo;
 };
+export declare function cmdStackCreate(args: string[], deps?: StackCreateDeps): Promise<void>;
 /** Injectable seams for unit tests (STRUCT-04). Production callers omit deps. */
 export type StackSubmitDeps = {
     cwd?: string;
@@ -74,4 +120,11 @@ export type StackSubmitDeps = {
     ensureUpperPark?: typeof ensureUpperPark;
 };
 export declare function cmdStackSubmit(args: string[], deps?: StackSubmitDeps): Promise<void>;
+export type StackSetDeps = {
+    loadConfig?: typeof loadConfig;
+    setStackPolicy?: typeof setStackPolicy;
+};
+/** Human summary lines for a `stack set` write, one per flag. */
+export declare function stackSetSummary(parsed: StackSetArgs): string[];
+export declare function cmdStackSet(args: string[], deps?: StackSetDeps): Promise<void>;
 export declare function cmdStack(args: string[]): Promise<void>;