mergestorm 0.3.66 → 0.3.67

package/README.md

@@ -45,12 +45,12 @@ On a TTY, bare `mergestorm` (or `mergestorm shell`) opens a branded REPL: a comp
 
 ```
 ╭──────────────────────────────────────────────────────────────────────────────╮
-│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.66                                             │
+│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.67                                             │
 │ ▀▀▀▀▀▀▀▀▀     ● msk_live_… · maelstrom                                       │
 │  ▀▀▀▀▀▀       [████████░░░░░░░░░░░░░░░░░░░░░░] 25% used                      │
 │   ▝▀▀▀▀▀      local reviews + stacked PRs · mergestorm.ai                    │
 │     ▝▀▀▘      review a diff · usage for tabs · /help for all commands        │
-│       ▀       New in v0.3.66: `issue wait`; submit needs an approved issue   │
+│       ▀       New in v0.3.67: Issue review: reply once, then one re-check    │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 mergestorm
 ╭──────────────────────────────────────────────────────────────────────────────╮
@@ -171,7 +171,7 @@ mg stack publish --status               # absent | pushed | opened | registered
 ```
 
 - **Issues too.** `mg issue create` opens the issue a PR needs through the same Surge App, with existing labels only. Running it again with the same title returns the issue it already opened. Put `Fixes #<n>` in the commit message; `stack submit` carries it into the PR body.
-- **Issue reviews first.** On a repository with Vortex issue reviews on, Vortex reviews each new issue before any PR. `mg issue wait <n>` (or `mg issue create --wait`) waits for that review: it exits 0 once the issue is approved, or exits 4 with the numbered points to answer. Answer them in a comment on the issue and wait again; Vortex re-reviews on each reply, up to four rounds, after which a person approves with an issue comment whose first line is `mergestorm-issue: approve`. `stack submit` refuses to open a PR whose tip commit links an issue that is not approved yet, or links no issue at all while issue reviews are on.
+- **Issue reviews first.** On a repository with Vortex issue reviews on, Vortex reviews each new issue before any PR. `mg issue wait <n>` (or `mg issue create --wait`) waits for that review: it exits 0 once the issue is approved, or exits 4 with the numbered points to answer. Reply once in a comment on the issue, accepting each blocking point's suggested fix or saying why not, and wait again; Vortex re-checks only the blocking points, once, and approves the issue. Notes never block; the PR review checks them against the code. A person can approve early with an issue comment whose first line is `mergestorm-issue: approve`. `stack submit` refuses to open a PR whose tip commit links an issue that is not approved yet, or links no issue at all while issue reviews are on.
 - **Exact contents.** Every commit travels with its Git tree SHA and the whole content of each changed file, so binaries, deletions, renames, executable bits and symlinks arrive unchanged. Mergestorm moves the branch only when GitHub builds the same tree, and `mg` checks the returned tree against your local branch.
 - **Never overwrites surprises.** `mg` looks at the branch on GitHub first. If its files match one of your local commits, only the commits after that one are appended. If they match none (someone else pushed, or you rebased), `mg` stops with `head_changed`; `--replace-head <sha>` replaces exactly that head and nothing else. Mergestorm refuses `main`, `master`, the default branch, protected branches and its own `mg-stack-*`, `mg-park-*` and `mq-batch-*` branches.
 - **Safe to run again.** After a timeout or an error, run the same command again. It finds the branch, pull request and stack it already made and finishes the missing step; it does not create duplicates.

package/dist/api.d.ts

@@ -188,8 +188,8 @@ export type SettingsResponse = import("./automation-catalog.js").BearerSettingsV
     github_connected: boolean;
     stacks_ready?: boolean;
 };
-export declare const REPO_SETTINGS_SWITCH_KEYS: readonly ["auto_patch_enabled", "auto_review_enabled", "auto_land_default", "merge_queue_batch_enabled", "merge_queue_overdrive", "issue_review_enabled"];
-export declare const REPO_SETTINGS_KEYS: readonly ["auto_patch_enabled", "auto_review_enabled", "auto_land_default", "merge_queue_batch_enabled", "merge_queue_overdrive", "issue_review_enabled", "merge_queue_batch_size", "merge_queue_lands_alone_paths"];
+export declare const REPO_SETTINGS_SWITCH_KEYS: readonly ["auto_patch_enabled", "auto_review_enabled", "auto_land_default", "merge_queue_batch_enabled", "merge_queue_overdrive", "issue_review_enabled", "issue_auto_review_enabled"];
+export declare const REPO_SETTINGS_KEYS: readonly ["auto_patch_enabled", "auto_review_enabled", "auto_land_default", "merge_queue_batch_enabled", "merge_queue_overdrive", "issue_review_enabled", "issue_auto_review_enabled", "merge_queue_batch_size", "merge_queue_lands_alone_paths"];
 export type RepoSettingsKey = (typeof REPO_SETTINGS_KEYS)[number];
 type RepoSettingsValues = Record<(typeof REPO_SETTINGS_SWITCH_KEYS)[number], boolean | null> & {
     merge_queue_batch_size: number | null;
@@ -409,12 +409,17 @@ export type IssueReviewState = (typeof ISSUE_REVIEW_STATES)[number];
 export type IssueReviewPoint = {
     kind: string;
     text: string;
+    blocking?: boolean;
 };
+export declare const ISSUE_REVIEW_MODES: readonly ["off", "mention", "auto"];
+export type IssueReviewMode = (typeof ISSUE_REVIEW_MODES)[number];
+export declare const ISSUE_REVIEW_TAG = "@mergestorm-vortex";
 export type IssueReviewStatus = {
     owner: string;
     repo: string;
     number: number;
     enabled: boolean;
+    mode: IssueReviewMode;
     state: IssueReviewState;
     approvedBy: "vortex" | "human" | null;
     round: number | null;
@@ -437,6 +442,14 @@ export declare function getIssueReview(cfg: Config, target: IssueReviewTarget, o
     timeoutMs?: number;
     signal?: AbortSignal;
 }): Promise<IssueReviewStatus | null>;
+export declare function getIssueReviewMode(cfg: Config, target: {
+    owner: string;
+    repo: string;
+}, opts?: {
+    timeoutMs?: number;
+}): Promise<IssueReviewMode | null>;
+export declare function issueReviewSettled(status: IssueReviewStatus): boolean;
+export declare function issueReviewBlocksPr(status: IssueReviewStatus): boolean;
 export declare class IssueReviewTimeoutError extends CommandError {
     readonly lastStatus: IssueReviewStatus;
     constructor(lastStatus: IssueReviewStatus);
@@ -452,6 +465,7 @@ export type PollIssueReviewOptions = {
 export declare function pollIssueReview(cfg: Config, target: IssueReviewTarget, opts?: PollIssueReviewOptions): Promise<IssueReviewStatus | null>;
 export declare function issueReviewLines(status: IssueReviewStatus): string[];
 export declare function issueNotApprovedError(issues: IssueReviewStatus[], message?: string | null): CommandError;
+export declare const NO_LINKED_ISSUE = "no_linked_issue";
 export declare function issueNotApprovedRefusal(status: number, body: unknown, owner: string, repo: string): CommandError | null;
 /**
  * Patch any subset of one owned stack's automation policy

package/dist/api.js

@@ -188,6 +188,7 @@ export const REPO_SETTINGS_SWITCH_KEYS = [
     "merge_queue_batch_enabled",
     "merge_queue_overdrive",
     "issue_review_enabled",
+    "issue_auto_review_enabled",
 ];
 export const REPO_SETTINGS_KEYS = [...REPO_SETTINGS_SWITCH_KEYS, "merge_queue_batch_size", "merge_queue_lands_alone_paths"];
 function repoSettingsFailure(status, body, retryAfterSeconds, action) {
@@ -691,10 +692,12 @@ export async function openStackIssue(input, cfg) {
     return { number: row.number, url: typeof row.url === "string" ? row.url : "", created: row.created === true };
 }
 export const ISSUE_REVIEW_STATES = ["approved", "needs_answers", "pending", "unreviewed", "capped", "off"];
+export const ISSUE_REVIEW_MODES = ["off", "mention", "auto"];
+export const ISSUE_REVIEW_TAG = "@mergestorm-vortex";
 export const ISSUE_REVIEW_POLL_INTERVAL_MS = 10_000;
 export const ISSUE_REVIEW_DEFAULT_TIMEOUT_MS = 900_000;
 const ISSUE_REVIEW_MAX_POINTS = 8;
-const ISSUE_REVIEW_DEFAULT_MAX_ROUNDS = 4;
+const ISSUE_REVIEW_DEFAULT_MAX_ROUNDS = 2;
 function issueReviewText(value) {
     if (typeof value !== "string")
         return null;
@@ -714,7 +717,7 @@ export function parseIssueReviewStatus(body, target) {
             const text = issueReviewText(point?.text);
             if (!text)
                 return [];
-            return [{ kind: issueReviewText(point.kind) ?? "note", text }];
+            return [{ kind: issueReviewText(point.kind) ?? "note", text, blocking: point.blocking !== false }];
         })
             .slice(0, ISSUE_REVIEW_MAX_POINTS)
         : [];
@@ -724,6 +727,7 @@ export function parseIssueReviewStatus(body, target) {
         repo: typeof row.repo === "string" && row.repo ? row.repo : target.repo,
         number: isPositiveInteger(row.number) ? row.number : target.number,
         enabled: row.enabled === true,
+        mode: ISSUE_REVIEW_MODES.find((known) => known === row.mode) ?? (row.enabled === true ? "auto" : "off"),
         state,
         approvedBy: row.approvedBy === "vortex" || row.approvedBy === "human" ? row.approvedBy : null,
         round: isPositiveInteger(row.round) ? row.round : null,
@@ -738,8 +742,12 @@ export function parseIssueReviewStatus(body, target) {
 export async function getIssueReview(cfg, target, opts = {}) {
     const query = new URLSearchParams({ owner: target.owner, repo: target.repo }).toString();
     const { status, body, retryAfterSeconds } = await apiFetch(cfg, `/api/v1/stacks/issues/${encodeURIComponent(String(target.number))}/review?${query}`, opts);
-    if (status === 404)
-        return null;
+    if (status === 404) {
+        const message = serverMessage(body?.message);
+        if (!message)
+            return null;
+        throw new CommandError(`${message} Connect it in Mergestorm, then try again.`, 1, "not_found");
+    }
     if (status === 429) {
         throw new CommandError(rateLimitedMessage(retryAfterSeconds), REVIEW_EXIT.rate_limited, "rate_limited", retryAfterSeconds !== undefined ? { retryAfterSeconds } : undefined);
     }
@@ -750,6 +758,29 @@ export async function getIssueReview(cfg, target, opts = {}) {
     }
     return parsed;
 }
+export async function getIssueReviewMode(cfg, target, opts = {}) {
+    const query = new URLSearchParams({ owner: target.owner, repo: target.repo }).toString();
+    const { status, body, retryAfterSeconds } = await apiFetch(cfg, `/api/v1/stacks/issues/review-mode?${query}`, opts);
+    if (status === 404)
+        return null;
+    if (status === 429) {
+        throw new CommandError(rateLimitedMessage(retryAfterSeconds), REVIEW_EXIT.rate_limited, "rate_limited", retryAfterSeconds !== undefined ? { retryAfterSeconds } : undefined);
+    }
+    const mode = status === 200 ? ISSUE_REVIEW_MODES.find((known) => known === body?.mode) : undefined;
+    if (!mode) {
+        const message = serverMessage(body?.message);
+        throw new CommandError(message ?? `Failed to read the issue review mode of ${target.owner}/${target.repo} (HTTP ${status})`);
+    }
+    return mode;
+}
+export function issueReviewSettled(status) {
+    if (status.state === "pending")
+        return false;
+    return !(status.state === "unreviewed" && status.mode === "auto");
+}
+export function issueReviewBlocksPr(status) {
+    return status.mode === "auto" && status.state !== "approved" && status.state !== "off";
+}
 export class IssueReviewTimeoutError extends CommandError {
     lastStatus;
     constructor(lastStatus) {
@@ -795,7 +826,7 @@ export async function pollIssueReview(cfg, target, opts = {}) {
     for (;;) {
         try {
             const status = await getIssueReview(cfg, target, { signal: opts.signal });
-            if (!status || status.state !== "pending")
+            if (!status || issueReviewSettled(status))
                 return status;
             last = status;
             opts.onTick?.(status);
@@ -820,7 +851,7 @@ export function issueReviewLines(status) {
     const lines = [`${status.owner}/${status.repo}#${status.number}: ${status.state}${round}`];
     if (status.summary)
         lines.push(`  ${status.summary}`);
-    status.points.forEach((point, i) => lines.push(`  ${i + 1}. [${point.kind}] ${point.text}`));
+    status.points.forEach((point, i) => lines.push(`  ${i + 1}. [${point.blocking === false ? "note: " : ""}${point.kind}] ${point.text}`));
     if (status.commentUrl)
         lines.push(`  Review: ${status.commentUrl}`);
     if (status.next)
@@ -831,10 +862,12 @@ export function issueNotApprovedError(issues, message) {
     const lines = [message?.trim() || "Vortex has not approved the linked issue yet; refusing to open the pull request."];
     for (const issue of issues) {
         lines.push(...issueReviewLines(issue));
-        lines.push(`  Reply in a comment on #${issue.number}, then run \`mergestorm issue wait ${issue.number}\`.`);
+        const reply = issue.state === "needs_answers" ? `Reply once in a comment on #${issue.number}, accepting each blocking point's suggested fix or saying why not; then run` : "Run";
+        lines.push(`  ${reply} \`mergestorm issue wait ${issue.number}\`.`);
     }
-    return new CommandError(lines.join("\n"), REVIEW_EXIT.failed, "issue_not_approved");
+    return new CommandError(lines.join("\n"), REVIEW_EXIT.failed, "issue_not_approved", issues.length === 0 ? { reason: NO_LINKED_ISSUE } : undefined);
 }
+export const NO_LINKED_ISSUE = "no_linked_issue";
 export function issueNotApprovedRefusal(status, body, owner, repo) {
     if (status !== 409 || !body || typeof body !== "object")
         return null;

package/dist/automation-catalog.d.ts

@@ -46,6 +46,10 @@ export declare const BEARER_SETTINGS: readonly [{
     readonly key: "issue_review_enabled";
     readonly flag: "--issue-review";
     readonly label: "Vortex issue reviews";
+}, {
+    readonly key: "issue_auto_review_enabled";
+    readonly flag: "--issue-auto-review";
+    readonly label: "Vortex issue auto review";
 }, {
     readonly key: "auto_land_default";
     readonly flag: "--auto-land";
@@ -116,4 +120,4 @@ export type BearerSettingsValues = {
         values: readonly (infer Value)[];
     } ? Value : boolean;
 };
-export declare const BEARER_BOOLEAN_SETTINGS_KEYS: ("auto_review_enabled" | "auto_patch_enabled" | "auto_resolve_conflicts_enabled" | "auto_fix_ci_enabled" | "vortex_show_thinking_traces" | "repo_overview_enabled" | "cyclone_skip_ci_enabled" | "cyclone_patch_unverified_languages" | "vortex_auto_overflow_enabled" | "vortex_skip_all_clear_comments" | "vortex_seam_specialist_enabled" | "issue_review_enabled" | "auto_land_default" | "auto_land_settle_seconds" | "merge_queue_batch_enabled" | "merge_queue_batch_size" | "merge_queue_lands_alone_paths" | "merge_queue_overdrive" | "ignored_bot_logins" | "vortex_bot_skip_check" | "vortex_findings_check" | "cyclone_patch_failure_check")[];
+export declare const BEARER_BOOLEAN_SETTINGS_KEYS: ("auto_review_enabled" | "auto_patch_enabled" | "auto_resolve_conflicts_enabled" | "auto_fix_ci_enabled" | "vortex_show_thinking_traces" | "repo_overview_enabled" | "cyclone_skip_ci_enabled" | "cyclone_patch_unverified_languages" | "vortex_auto_overflow_enabled" | "vortex_skip_all_clear_comments" | "vortex_seam_specialist_enabled" | "issue_review_enabled" | "issue_auto_review_enabled" | "auto_land_default" | "auto_land_settle_seconds" | "merge_queue_batch_enabled" | "merge_queue_batch_size" | "merge_queue_lands_alone_paths" | "merge_queue_overdrive" | "ignored_bot_logins" | "vortex_bot_skip_check" | "vortex_findings_check" | "cyclone_patch_failure_check")[];

package/dist/automation-catalog.js

@@ -11,6 +11,7 @@ export const BEARER_SETTINGS = [
     { 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: "issue_review_enabled", flag: "--issue-review", label: "Vortex issue reviews" },
+    { key: "issue_auto_review_enabled", flag: "--issue-auto-review", label: "Vortex issue auto review" },
     { key: "auto_land_default", flag: "--auto-land", label: "Auto land (new stacks)" },
     { key: "auto_land_settle_seconds", flag: "--auto-land-settle", label: "Auto land settle (seconds)", kind: "seconds", min: 15, max: 300 },
     { key: "merge_queue_batch_enabled", flag: "--merge-queue-batch", label: "Merge queue batching" },

package/dist/client/index.d.ts

@@ -1,6 +1,6 @@
 export { ACCOUNT_LIMIT, DEFAULT_API, accountNameFromMe, apiBase, configPath, keyDisplay, listAccounts, loadConfig, mergestormHome, removeAccount, resolveApiKey, saveAccount, settleAccountName, splitAccountFlag, useAccount, withAccount, type AccountSummary, type Config, type StoredAccount, } from "../config.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, accountLabel, apiFetch, cancelMergeQueueEntry, devicePost, dismissPrFindings, dismissThreadsLine, enqueueStack, ensureUpperPark, getEnrichedStack, getIssueReview, ISSUE_REVIEW_DEFAULT_TIMEOUT_MS, ISSUE_REVIEW_POLL_INTERVAL_MS, ISSUE_REVIEW_STATES, IssueReviewTimeoutError, issueNotApprovedError, issueNotApprovedRefusal, issueReviewLines, parseIssueReviewStatus, pollIssueReview, type IssueReviewPoint, type IssueReviewState, type IssueReviewStatus, type IssueReviewTarget, type PollIssueReviewOptions, getMe, getPrVortexReview, revokeOwnKey, getReview, getSettings, listRepoSettings, patchRepoSettings, REPO_SETTINGS_KEYS, getStackPublication, landNextStack, listJobs, listMergeQueueEntries, listStacks, listThreads, openStackIssue, parseRetryAfterSeconds, patchSettings, restackStack, setStackPolicy, stackPolicyBody, submitStackPublication, type ApiFetchInit, type ApiFetchResult, type JobListItem, type AccountIdentity, type MeResponse, type MergeQueueBounceDetail, type MergeQueueBounceKind, type MergeQueueEnqueuedBy, type MergeQueueEnqueuedVia, type MergeQueueEntryDto, type MergeQueueEntryState, type PrDismissedFinding, type PrFindingDismissInput, type PrFindingDismissOutcome, type PrFindingDismissResult, type PrReviewFinding, type PrReviewFindings, type PrVortexReview, type SettingsPatch, type RepoSettings, type RepoSettingsKey, type RepoSettingsPatch, type SettingsResponse, type StackDto, type StackPolicyPatch, type StackPublication, type StackPublicationRequest, type StackPublicationStatus, type ThreadDetail, type ThreadListItem, } from "../api.js";
+export { API_TIMEOUT_PREFIX, DEFAULT_API_TIMEOUT_MS, SETTINGS_WRITABLE_KEYS, adoptStack, accountLabel, apiFetch, cancelMergeQueueEntry, devicePost, dismissPrFindings, dismissThreadsLine, enqueueStack, ensureUpperPark, getEnrichedStack, getIssueReview, ISSUE_REVIEW_DEFAULT_TIMEOUT_MS, ISSUE_REVIEW_POLL_INTERVAL_MS, ISSUE_REVIEW_STATES, IssueReviewTimeoutError, NO_LINKED_ISSUE, issueNotApprovedError, issueNotApprovedRefusal, issueReviewLines, parseIssueReviewStatus, pollIssueReview, type IssueReviewPoint, type IssueReviewState, type IssueReviewStatus, type IssueReviewTarget, type PollIssueReviewOptions, getMe, getPrVortexReview, revokeOwnKey, getReview, getSettings, listRepoSettings, patchRepoSettings, REPO_SETTINGS_KEYS, getStackPublication, landNextStack, listJobs, listMergeQueueEntries, listStacks, listThreads, openStackIssue, parseRetryAfterSeconds, patchSettings, restackStack, setStackPolicy, stackPolicyBody, submitStackPublication, type ApiFetchInit, type ApiFetchResult, type JobListItem, type AccountIdentity, type MeResponse, type MergeQueueBounceDetail, type MergeQueueBounceKind, type MergeQueueEnqueuedBy, type MergeQueueEnqueuedVia, type MergeQueueEntryDto, type MergeQueueEntryState, type PrDismissedFinding, type PrFindingDismissInput, type PrFindingDismissOutcome, type PrFindingDismissResult, type PrReviewFinding, type PrReviewFindings, type PrVortexReview, type SettingsPatch, type RepoSettings, type RepoSettingsKey, type RepoSettingsPatch, type SettingsResponse, type StackDto, type StackPolicyPatch, type StackPublication, type StackPublicationRequest, type StackPublicationStatus, 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, noPrReviewYetMessage, 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";

package/dist/client/index.js

@@ -1,6 +1,6 @@
 export { ACCOUNT_LIMIT, DEFAULT_API, accountNameFromMe, apiBase, configPath, keyDisplay, listAccounts, loadConfig, mergestormHome, removeAccount, resolveApiKey, saveAccount, settleAccountName, splitAccountFlag, useAccount, withAccount, } from "../config.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, accountLabel, apiFetch, cancelMergeQueueEntry, devicePost, dismissPrFindings, dismissThreadsLine, enqueueStack, ensureUpperPark, getEnrichedStack, getIssueReview, ISSUE_REVIEW_DEFAULT_TIMEOUT_MS, ISSUE_REVIEW_POLL_INTERVAL_MS, ISSUE_REVIEW_STATES, IssueReviewTimeoutError, issueNotApprovedError, issueNotApprovedRefusal, issueReviewLines, parseIssueReviewStatus, pollIssueReview, getMe, getPrVortexReview, revokeOwnKey, getReview, getSettings, listRepoSettings, patchRepoSettings, REPO_SETTINGS_KEYS, getStackPublication, landNextStack, listJobs, listMergeQueueEntries, listStacks, listThreads, openStackIssue, parseRetryAfterSeconds, patchSettings, restackStack, setStackPolicy, stackPolicyBody, submitStackPublication, } from "../api.js";
+export { API_TIMEOUT_PREFIX, DEFAULT_API_TIMEOUT_MS, SETTINGS_WRITABLE_KEYS, adoptStack, accountLabel, apiFetch, cancelMergeQueueEntry, devicePost, dismissPrFindings, dismissThreadsLine, enqueueStack, ensureUpperPark, getEnrichedStack, getIssueReview, ISSUE_REVIEW_DEFAULT_TIMEOUT_MS, ISSUE_REVIEW_POLL_INTERVAL_MS, ISSUE_REVIEW_STATES, IssueReviewTimeoutError, NO_LINKED_ISSUE, issueNotApprovedError, issueNotApprovedRefusal, issueReviewLines, parseIssueReviewStatus, pollIssueReview, getMe, getPrVortexReview, revokeOwnKey, getReview, getSettings, listRepoSettings, patchRepoSettings, REPO_SETTINGS_KEYS, getStackPublication, landNextStack, listJobs, listMergeQueueEntries, listStacks, listThreads, openStackIssue, parseRetryAfterSeconds, patchSettings, restackStack, setStackPolicy, stackPolicyBody, submitStackPublication, } 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, noPrReviewYetMessage, 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";

package/dist/commands/issue.js

@@ -135,6 +135,10 @@ function asAuthExit(err) {
 function approvedLine(status) {
     if (status.state === "off")
         return `Issue reviews are off for ${status.owner}/${status.repo}; #${status.number} needs no approval.`;
+    if (status.state === "unreviewed")
+        return `Issue reviews for ${status.owner}/${status.repo} run on mention; #${status.number} needs no approval.`;
+    if (status.approvedBy === null)
+        return `The Vortex review of ${status.owner}/${status.repo}#${status.number} failed, so it does not hold the pull request back.`;
     const by = status.approvedBy === "human" ? "a person" : "Vortex";
     return `${status.owner}/${status.repo}#${status.number} is approved by ${by}.`;
 }
@@ -161,7 +165,7 @@ export async function waitForIssueReview(target, opts, deps = {}) {
     }
     if (opts.json)
         printJson(status);
-    if (status.state === "approved" || status.state === "off") {
+    if (status.state === "approved" || status.state === "off" || (status.mode === "mention" && status.state === "unreviewed")) {
         if (!opts.json) {
             console.log(approvedLine(status));
             if (status.next)

package/dist/commands/login.d.ts

@@ -1,11 +1,10 @@
 import { type Config } from "../config.js";
-import { type AccountIdentity, type MeResponse } from "../api.js";
+import { type MeResponse } from "../api.js";
 /**
  * Probe /api/v1/me with an in-memory config. Does not write disk.
  * Throws CommandError when the key must not be saved.
  */
 export declare function validateApiKey(cfg: Config): Promise<MeResponse>;
-export declare function loggedInLine(account: AccountIdentity | null | undefined): string;
 export declare function pendingLoginPath(): string;
 export interface LoginDeps {
     openBrowser: (url: string) => void;

package/dist/commands/login.js

@@ -44,10 +44,6 @@ async function loginConfig() {
     const store = await readStore();
     return configFor(store, store.activeAccount);
 }
-export function loggedInLine(account) {
-    const label = accountLabel(account);
-    return label ? `Logged in as ${label}.` : "Logged in.";
-}
 async function storeLogin(cfg, me, opts) {
     const apiKey = cfg.apiKey ?? "";
     const name = accountNameFromMe(me) ?? provisionalAccountName(apiKey);

package/dist/commands/settings.d.ts

@@ -3,7 +3,7 @@ import { type RepoSettingsPatch, type SettingsPatch, type SettingsResponse } fro
  * 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" | "auto_resolve_conflicts_enabled" | "auto_fix_ci_enabled" | "vortex_show_thinking_traces" | "repo_overview_enabled" | "cyclone_skip_ci_enabled" | "cyclone_patch_unverified_languages" | "vortex_auto_overflow_enabled" | "vortex_skip_all_clear_comments" | "vortex_seam_specialist_enabled" | "issue_review_enabled" | "auto_land_default" | "auto_land_settle_seconds" | "merge_queue_batch_enabled" | "merge_queue_batch_size" | "merge_queue_lands_alone_paths" | "merge_queue_overdrive" | "ignored_bot_logins" | "vortex_bot_skip_check" | "vortex_findings_check" | "cyclone_patch_failure_check">;
+export declare const SETTINGS_FLAGS: Record<string, "auto_review_enabled" | "auto_patch_enabled" | "auto_resolve_conflicts_enabled" | "auto_fix_ci_enabled" | "vortex_show_thinking_traces" | "repo_overview_enabled" | "cyclone_skip_ci_enabled" | "cyclone_patch_unverified_languages" | "vortex_auto_overflow_enabled" | "vortex_skip_all_clear_comments" | "vortex_seam_specialist_enabled" | "issue_review_enabled" | "issue_auto_review_enabled" | "auto_land_default" | "auto_land_settle_seconds" | "merge_queue_batch_enabled" | "merge_queue_batch_size" | "merge_queue_lands_alone_paths" | "merge_queue_overdrive" | "ignored_bot_logins" | "vortex_bot_skip_check" | "vortex_findings_check" | "cyclone_patch_failure_check">;
 type IgnoreBotOperation = {
     action: "add" | "remove";
     login: string;

package/dist/commands/settings.js

@@ -19,6 +19,7 @@ const REPO_FLAG_LABELS = {
     merge_queue_lands_alone_paths: "Merge queue lands-alone paths",
     merge_queue_overdrive: "Merge queue overdrive",
     issue_review_enabled: "Vortex issue reviews",
+    issue_auto_review_enabled: "Vortex issue auto review",
 };
 function parsePathsFlagValue(flag, value, defaults) {
     if (value === undefined || value === "" || value.startsWith("--")) {
@@ -80,7 +81,7 @@ function parseRepoSettingsArgs(slug, args) {
             throw new CommandError(`Unknown settings flag: ${flag}. See \`mergestorm --help\`.`, 2, "usage");
         }
         if (!REPO_SETTINGS_KEYS.includes(key)) {
-            throw new CommandError(`${flag} is an account setting. With --repo only --auto-patch, --auto-review, --auto-land, --merge-queue-batch, --merge-queue-batch-size, --merge-queue-lands-alone, --merge-queue-overdrive and --issue-review can be set.`, 2, "usage");
+            throw new CommandError(`${flag} is an account setting. With --repo only --auto-patch, --auto-review, --auto-land, --merge-queue-batch, --merge-queue-batch-size, --merge-queue-lands-alone, --merge-queue-overdrive, --issue-review and --issue-auto-review can be set.`, 2, "usage");
         }
         const value = eq >= 0 ? arg.slice(eq + 1) : args[++i];
         const row = BEARER_SETTINGS.find((row) => row.key === key);

package/dist/commands/stack.d.ts

@@ -1,6 +1,6 @@
 import { type StackRepairHint } from "../stack-blockers.js";
 import { type StackWatchObligation } from "../stack-watch-obligation.js";
-import { adoptStack, ensureUpperPark, findStackPull, getEnrichedStack, getIssueReview, getStackPublication, listMergeQueueEntries, listStacks, openStackPull, claimStackPulls, setStackPolicy, type StackDto, type StackPolicyPatch } from "../api.js";
+import { adoptStack, ensureUpperPark, findStackPull, getEnrichedStack, getIssueReview, type IssueReviewMode, getStackPublication, listMergeQueueEntries, listStacks, openStackPull, claimStackPulls, setStackPolicy, type StackDto, type StackPolicyPatch } from "../api.js";
 import { loadConfig } from "../config.js";
 import { createPrs, findOpenPrNumber } from "../gh.js";
 import { parseGithubOriginRepo } from "../git.js";
@@ -126,14 +126,14 @@ export type StackCreateDeps = {
 };
 export declare function cmdStackCreate(args: string[], deps?: StackCreateDeps): Promise<void>;
 /** Injectable seams for unit tests (STRUCT-04). Production callers omit deps. */
-export declare function issueReviewsEnabledFor(cfg: Awaited<ReturnType<typeof loadConfig>>, owner: string, repo: string): Promise<boolean>;
+export declare function issueReviewModeFor(cfg: Awaited<ReturnType<typeof loadConfig>>, owner: string, repo: string): Promise<IssueReviewMode>;
 export type IssueGateLayer = {
     branch: string;
     texts: string[];
 };
 export type IssueGateDeps = {
     getIssueReview?: typeof getIssueReview;
-    issueReviewsEnabled?: typeof issueReviewsEnabledFor;
+    issueReviewMode?: typeof issueReviewModeFor;
 };
 export declare function assertLinkedIssuesApproved(input: {
     cfg: Awaited<ReturnType<typeof loadConfig>>;

package/dist/commands/stack.js

@@ -1,6 +1,6 @@
 import { cycloneStatusWords, stackBlockers, stackBlockersSummary } from "../stack-blockers.js";
 import { STACK_WATCH_NOT_DONE_SENTENCE, STACK_WATCH_NOTIFY_PATTERN, stackTerminalReason, stackWatchObligation, } from "../stack-watch-obligation.js";
-import { adoptStack, ensureUpperPark, findStackPull, getEnrichedStack, getIssueReview, getSettings, getStackPublication, issueNotApprovedError, landNextStack, listRepoSettings, listMergeQueueEntries, listStacks, openStackPull, claimStackPulls, restackStack, setStackPolicy, } from "../api.js";
+import { adoptStack, ensureUpperPark, findStackPull, getEnrichedStack, getIssueReview, getIssueReviewMode, issueReviewBlocksPr, getSettings, getStackPublication, issueNotApprovedError, NO_LINKED_ISSUE, landNextStack, listRepoSettings, listMergeQueueEntries, listStacks, openStackPull, claimStackPulls, restackStack, setStackPolicy, } from "../api.js";
 import { loadConfig } from "../config.js";
 import { rateLimitedMessage, REVIEW_EXIT, CommandError } from "../errors.js";
 import { createPrs, findOpenPrNumber, ghReady, githubApiFromEnv, } from "../gh.js";
@@ -681,15 +681,21 @@ export async function cmdStackCreate(args, deps = {}) {
     await present("Stack", created);
 }
 /** Injectable seams for unit tests (STRUCT-04). Production callers omit deps. */
-export async function issueReviewsEnabledFor(cfg, owner, repo) {
+export async function issueReviewModeFor(cfg, owner, repo) {
+    const served = await getIssueReviewMode(cfg, { owner, repo }, { timeoutMs: STACK_GUARD_TIMEOUT_MS });
+    if (served)
+        return served;
     const repos = await listRepoSettings(cfg, { timeoutMs: STACK_GUARD_TIMEOUT_MS });
     const row = repos.find((r) => r.owner.toLowerCase() === owner.toLowerCase() && r.repo.toLowerCase() === repo.toLowerCase());
-    if (typeof row?.issue_review_enabled === "boolean")
-        return row.issue_review_enabled;
     const settings = await getSettings(cfg, { timeoutMs: STACK_GUARD_TIMEOUT_MS });
     if (!settings)
         throw new CommandError("Could not read the account settings");
-    return settings.issue_review_enabled === true;
+    const account = settings;
+    const on = typeof row?.issue_review_enabled === "boolean" ? row.issue_review_enabled : account.issue_review_enabled === true;
+    if (!on)
+        return "off";
+    const auto = typeof row?.issue_auto_review_enabled === "boolean" ? row.issue_auto_review_enabled : account.issue_auto_review_enabled !== false;
+    return auto ? "auto" : "mention";
 }
 export async function assertLinkedIssuesApproved(input, deps = {}) {
     const { cfg, owner, repo, layers, warn } = input;
@@ -720,22 +726,22 @@ export async function assertLinkedIssuesApproved(input, deps = {}) {
     }
     const unlinked = linked.filter((layer) => layer.numbers.length === 0);
     if (unlinked.length > 0) {
-        let enabled;
+        let mode;
         try {
-            enabled = await (deps.issueReviewsEnabled ?? issueReviewsEnabledFor)(cfg, owner, repo);
+            mode = await (deps.issueReviewMode ?? issueReviewModeFor)(cfg, owner, repo);
         }
         catch (err) {
             throw unverified(err);
         }
-        if (enabled) {
+        if (mode === "auto") {
             throw new CommandError([
                 `Issue reviews are on for ${owner}/${repo}, and ${unlinked.map((layer) => layer.branch).join(", ")} links no issue.`,
-                "Open one with `mergestorm issue create --title <problem> --wait`, answer the Vortex review until it is approved,",
+                "Open one with `mergestorm issue create --title <problem> --wait`, reply once to any blocking points in the Vortex review,",
                 "then add `Fixes #N` to the tip commit message and submit again.",
-            ].join("\n"), REVIEW_EXIT.failed, "issue_not_approved");
+            ].join("\n"), REVIEW_EXIT.failed, "issue_not_approved", { reason: NO_LINKED_ISSUE });
         }
     }
-    const blocking = statuses.filter((status) => status.state !== "approved" && status.state !== "off");
+    const blocking = statuses.filter(issueReviewBlocksPr);
     if (blocking.length > 0)
         throw issueNotApprovedError(blocking);
 }
@@ -1561,11 +1567,15 @@ async function cmdStackLand(args) {
         ]);
         return;
     }
+    const cascadeFailed = body.cascadeFailed;
     await present("Stack", [
         ansi.brightGreen(`  Landed` +
             (pr != null ? ` #${pr}` : "") +
             (branch ? ` (${branch})` : "") +
             ` on ${id}`),
+        ...(cascadeFailed
+            ? [ansi.yellow(`  The layers above it were not updated: ${cascadeFailed}`)]
+            : []),
     ]);
 }
 export async function cmdStack(args, options = {}) {

package/dist/stack-blockers.js

@@ -487,6 +487,8 @@ const AUTO_LAND_WAIT_WORDS = {
     missing_head: "GitHub returned no head commit for this PR",
     pr_draft: "this PR is a draft",
     trunk_in_land_target_without_land_pr: "the stack's commits are already in the land target, but no merged land PR was found",
+    land_pr_push_unreviewed: "someone other than Stacks pushed to the stack trunk, and the land PR has no clean Vortex review at that push or at its head",
+    land_pr_head_unexplained: "GitHub's activity list for the stack trunk does not show the push that made the land PR head",
     conflict_unchanged: "the merge queue bounced this PR for a conflict, and neither the PR nor its base has changed since",
     land_pr_unavailable: "the land PR cannot be opened or found",
     github_unreadable: "Mergestorm cannot read this PR from GitHub",

package/dist/ui/banner.js

@@ -236,6 +236,9 @@ const WHATS_NEW = {
     "0.3.66": [
         "`issue wait`; submit needs an approved issue",
     ],
+    "0.3.67": [
+        "Issue review: reply once, then one re-check",
+    ],
 };
 function densityFromVariant(variant) {
     if (variant === "mini" || variant === "nano")

package/package.json

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

package/skill/SKILL.md

@@ -15,7 +15,7 @@ Not for merging, landing, or pushing. For a PR that is already open on GitHub, u
 
 ## Before the PR: the issue review
 
-Vortex reviews the issue against the repository before any code. Wait for its verdict with `mg issue wait <n>`, which reads the verdict from Vortex itself; never judge it from comment text. The issue is approved when the latest verdict is Ready, or Ready with notes after you have answered once, or a person has approved it. If the verdict lists points, answer them in one comment on the issue, or update the issue; Vortex reviews it again with your answer in a new comment, and you wait again. Answer points; do not dismiss them. Start the PR only once the issue is approved: `mg stack submit` refuses each PR whose linked issue (`Fixes #N`) is not, so every layer of a stack needs its own approved issue. On a repository with issue reviews off the wait returns at once. If the wait times out, tell the person. After the last round only a person approves, with a comment whose first line is `mergestorm-issue: approve`; never post that command yourself.
+Vortex reviews the issue against the repository before any code. Wait for its verdict with `mg issue wait N`, which reads the verdict from Vortex itself; never judge it from comment text. Ready or Ready with notes approves the issue; notes do not block, and the PR review checks them against the code. If the verdict is Needs answers, reply once in a comment on the issue: for each blocking point, accept the suggested fix or say why not, and update the issue to match. Vortex then re-checks only those points, once, and approves the issue; a point still open goes to the PR review. Wait again after your reply. Start the PR only once the issue is approved: `mg stack submit` refuses each PR whose linked issue (`Fixes #N`) is not, so every layer of a stack needs its own approved issue. On a repository with issue reviews off the wait returns at once. If the wait times out, tell the person. A person can approve early with a comment whose first line is `mergestorm-issue: approve`; never post that command yourself.
 
 ## Install (Claude Code / Cursor / Agents)