mergestorm 0.3.61 → 0.3.62

package/README.md

@@ -45,12 +45,12 @@ On a TTY, bare `mergestorm` (or `mergestorm shell`) opens a branded REPL: a comp
 
 ```
 ╭──────────────────────────────────────────────────────────────────────────────╮
-│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.61                                             │
+│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.62                                             │
 │ ▀▀▀▀▀▀▀▀▀     ● 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.61: Watch names a job Cyclone's push skips         │
+│       ▀       New in v0.3.62: Watch wakes for a blocker on any layer         │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 mergestorm
 ╭──────────────────────────────────────────────────────────────────────────────╮
@@ -111,7 +111,7 @@ mergestorm dismiss <owner/repo>#<n> --head <sha> --review <id> --finding <id> --
 
 - It calls `stack wait` in slices of at most 300s and carries the cursor (`enrolled_head_sha`, `after_finished_at`, `bounce_id`) from one slice to the next.
 - It prints nothing while the stack is `waiting` or `in_progress`, including while Cyclone or Vortex holds the blocked PR (`busy[]`, `actAfter: "agents_idle"`).
-- On attention it prints `MS-WATCH ATTENTION pr=<n> head=<sha> blocker="<blocker>" repair=<kind>` and exits 3.
+- On attention it prints `MS-WATCH ATTENTION pr=<n> head=<sha> blocker="<blocker>" repair=<kind>` and exits 3. Attention names the lowest layer with a blocker an agent must fix, on any layer of the stack, not only the current candidate.
 - A confirmed landing prints `MS-WATCH LANDED stack=<id> reason=landed` and exits 0. `closed`, `archived` and `not_found` end the watch with `MS-WATCH ATTENTION stack=<id> reason=<reason>` and exit 3. A missing stack does not prove a landing; verify each PR before reporting it merged.
 - A failed read is retried once. If the retry fails too, it prints `MS-WATCH ATTENTION failed stack=<id> error="<message>"` and exits 3. A rate limit is waited out.
 - `--head <sha>` enrolls the SHA you just pushed. After fixing a blocker, restart the watcher with it.
@@ -148,7 +148,7 @@ If the parent branch is already a layer of a **registered** (submitted) stack, `
 
 `mg stack submit --server-side` and `mg stack publish` are for a machine that can reach Mergestorm but cannot authenticate to GitHub, such as a cloud coding sandbox. They never run `gh`, `git push` or `git fetch`. `mg` reads your commits from the local repository and sends them to Mergestorm with your API key; Mergestorm writes those exact commits and the branch on GitHub as the Surge App, opens a ready pull request, and registers the stack. Surge must be installed on the repository and your linked GitHub account needs write access to it.
 
-These are your own changes, not Cyclone's: the stack is registered with **Auto patch pinned off**, Auto land on for a new stack (`--auto-land off` to keep it off), and Auto review left to your account setting. `--auto-patch on` is refused in this mode. Fix review findings yourself and send the new commits with `mg stack publish`.
+The stack is registered with Auto land on for a new stack (`--auto-land off` to keep it off). Auto patch and Auto review follow the stack, repository and account settings like any other stack; `--auto-patch` and `--auto-review` pin them on the stack after it is registered. Send later commits with `mg stack publish`.
 
 ```bash
 mg issue create --title "The thing is broken" --body-file issue.md --label bug --json   # no gh
@@ -167,7 +167,7 @@ mg stack publish --status               # absent | pushed | opened | registered
 - **Read-only home directory.** `mg` keeps the saved login and the local stack state of `stack create` / `stack submit` under `~/.mergestorm`. Where the home directory cannot be written, set `MERGESTORM_HOME` to a writable directory (outside the repository) and every command uses that instead. `MERGESTORM_API_KEY` supplies the key without `mg login`.
 - **Limits.** 20 commits, 500 changed paths, 2 MiB a file and 8 MiB in total per publication. Submodules and merge commits are refused with the path or the reason. `stack submit --server-side` publishes the first two layers of a stack; a third layer needs a park freeze, which this mode does not create, so add it once the first two are registered.
 
-Legacy repo-local `.mergestorm/stack.json` state migrates automatically on the next stack command. If local authoring state is stale or malformed, use `mg stack reset --force`; this clears only pre-submit CLI state and never deletes branches, PRs, or registered stacks.
+If local authoring state is stale or malformed, use `mg stack reset --force`; this clears only pre-submit CLI state and never deletes branches, PRs, or registered stacks.
 
 ### `login`
 

package/dist/api.d.ts

@@ -1,8 +1,8 @@
 import { type Config } from "./config.js";
-import { BEARER_SETTINGS_KEYS as SETTINGS_WRITABLE_KEYS, type BearerSettingsKey as SettingsWritableKey } from "./automation-catalog.js";
+import { BEARER_SETTINGS_KEYS as SETTINGS_WRITABLE_KEYS } from "./automation-catalog.js";
 import { CommandError } from "./errors.js";
 import type { MergeQueueEntryDto, StackDto } from "./stack-dto.js";
-export type { MergeQueueBounceDetail, MergeQueueBounceKind, MergeQueueEnqueuedBy, MergeQueueEnqueuedVia, MergeQueueEntryDto, MergeQueueEntryState, StackBranchState, StackCiStatus, StackDto, StackLayerChecks, StackLayerDto, StackReviewStatus, StackUnitDto, StackUnitMemberDto, } from "./stack-dto.js";
+export type { MergeQueueBounceDetail, MergeQueueBounceKind, MergeQueueEnqueuedBy, MergeQueueEnqueuedVia, MergeQueueEntryDto, MergeQueueEntryState, StackDto, StackLayerDto, } from "./stack-dto.js";
 /** Default per-request timeout so a hung API cannot stall the shell/CI forever. */
 export declare const DEFAULT_API_TIMEOUT_MS = 30000;
 /** Message prefix of the CommandError thrown when a request exceeds its timeout. */
@@ -167,7 +167,6 @@ export declare function applyPrReviewQuery(query: URLSearchParams, opts: PrRevie
  * The connected flags are read-only there and deliberately absent here.
  */
 export { SETTINGS_WRITABLE_KEYS };
-export type { SettingsWritableKey };
 export type SettingsPatch = Partial<import("./automation-catalog.js").BearerSettingsValues>;
 /** GET and PATCH `/api/v1/settings` both answer with this shape. */
 export type SettingsResponse = import("./automation-catalog.js").BearerSettingsValues & {
@@ -389,8 +388,6 @@ export declare function openStackIssue(input: {
     url: 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.
@@ -399,9 +396,7 @@ export declare function setStackPolicy(stackId: string, policy: StackPolicyPatch
 /** 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). */
-export declare function landNextStack(stackId: string, cfg?: Config, opts?: {
-    prNumber?: number;
-}): Promise<unknown>;
+export declare function landNextStack(stackId: string, cfg?: Config): Promise<unknown>;
 /** List the authenticated user's live merge-queue entries. */
 export declare function listMergeQueueEntries(cfg?: Config, opts?: {
     stackId?: string;

package/dist/api.js

@@ -269,8 +269,6 @@ export async function getMe(cfg, opts) {
         const { status, body } = await apiFetch(resolved, "/api/v1/me", {
             timeoutMs: opts?.timeoutMs,
         });
-        if (status === 404)
-            return null;
         if (status !== 200)
             return null;
         return body;
@@ -432,18 +430,7 @@ export async function adoptStack(owner, repo, prNumber, cfg, policy) {
         const message = body && typeof body === "object" && "message" in body && typeof body.message === "string"
             ? body.message
             : undefined;
-        const code = error === "auth_invalid" ||
-            error === "api_timeout" ||
-            error === "not_a_repo" ||
-            error === "not_found" ||
-            error === "missing_api_key" ||
-            error === "registered_parent" ||
-            error === "usage" ||
-            error === "review_quota" ||
-            error === "review_failed" ||
-            error === "review_timeout" ||
-            error === "rate_limited" ||
-            error === "cyclone_not_installed" ||
+        const code = error === "cyclone_not_installed" ||
             error === "pr_merged" ||
             error === "pr_closed" ||
             error === "not_stacked" ||
@@ -689,10 +676,6 @@ 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.
@@ -709,11 +692,8 @@ export async function restackStack(stackId, cfg) {
     return stackMutation(stackId, "/restack", "POST", {}, "Failed to restack", cfg);
 }
 /** Land the bottom open layer (Bearer POST /api/v1/stacks/:id/land-next). */
-export async function landNextStack(stackId, cfg, opts) {
-    const json = opts?.prNumber != null && Number.isInteger(opts.prNumber) && opts.prNumber > 0
-        ? { prNumber: opts.prNumber }
-        : {};
-    return stackMutation(stackId, "/land-next", "POST", json, "Failed to land next", cfg);
+export async function landNextStack(stackId, cfg) {
+    return stackMutation(stackId, "/land-next", "POST", {}, "Failed to land next", cfg);
 }
 /** List the authenticated user's live merge-queue entries. */
 export async function listMergeQueueEntries(cfg, opts) {

package/dist/client/index.d.ts

@@ -1,6 +1,6 @@
 export { DEFAULT_API, apiBase, clearConfig, configPath, keyDisplay, loadConfig, mergestormHome, resolveApiKey, saveConfig, type Config, } 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, apiFetch, cancelMergeQueueEntry, devicePost, dismissPrFindings, enqueueStack, ensureUpperPark, getEnrichedStack, getMe, getPrVortexReview, getReview, getSettings, listRepoSettings, patchRepoSettings, REPO_SETTINGS_KEYS, getStackPublication, landNextStack, listJobs, listMergeQueueEntries, listStacks, listThreads, openStackIssue, parseRetryAfterSeconds, patchSettings, restackStack, setStackAutoLand, setStackPolicy, stackPolicyBody, submitStackPublication, type ApiFetchInit, type ApiFetchResult, type JobListItem, 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 SettingsWritableKey, 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, apiFetch, cancelMergeQueueEntry, devicePost, dismissPrFindings, enqueueStack, ensureUpperPark, getEnrichedStack, getMe, getPrVortexReview, 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 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 { DEFAULT_API, apiBase, clearConfig, configPath, keyDisplay, loadConfig, mergestormHome, resolveApiKey, saveConfig, } 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, apiFetch, cancelMergeQueueEntry, devicePost, dismissPrFindings, enqueueStack, ensureUpperPark, getEnrichedStack, getMe, getPrVortexReview, getReview, getSettings, listRepoSettings, patchRepoSettings, REPO_SETTINGS_KEYS, getStackPublication, landNextStack, listJobs, listMergeQueueEntries, listStacks, listThreads, openStackIssue, parseRetryAfterSeconds, patchSettings, restackStack, setStackAutoLand, setStackPolicy, stackPolicyBody, submitStackPublication, } from "../api.js";
+export { API_TIMEOUT_PREFIX, DEFAULT_API_TIMEOUT_MS, SETTINGS_WRITABLE_KEYS, adoptStack, apiFetch, cancelMergeQueueEntry, devicePost, dismissPrFindings, enqueueStack, ensureUpperPark, getEnrichedStack, getMe, getPrVortexReview, 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/login.d.ts

@@ -6,4 +6,7 @@ import { type MeResponse } from "../api.js";
  */
 export declare function validateApiKey(cfg: Config): Promise<MeResponse>;
 export declare function pendingLoginPath(): string;
-export declare function cmdLogin(args: string[]): Promise<void>;
+export interface LoginDeps {
+    openBrowser: (url: string) => void;
+}
+export declare function cmdLogin(args: string[], deps?: LoginDeps): Promise<void>;

package/dist/commands/login.js

@@ -200,7 +200,7 @@ async function loginFinish() {
     console.log(`Waiting for approval of code ${pending.userCode} at ${pending.openUrl}`);
     await pollDeviceLogin(pending, "mergestorm login --finish", "Run `mergestorm login --start`, then `mergestorm login --finish`.");
 }
-export async function cmdLogin(args) {
+export async function cmdLogin(args, deps = { openBrowser }) {
     if (args.includes("--key")) {
         await loginWithKey();
         return;
@@ -219,8 +219,10 @@ export async function cmdLogin(args) {
     console.log("To sign in, open this URL and confirm the code:\n");
     console.log(`  ${ansi.brightGreen(pending.openUrl)}`);
     console.log(`\n  Code: ${ansi.bold(pending.userCode)}\n`);
-    openBrowser(pending.openUrl);
-    if (!process.stdout.isTTY) {
+    if (process.stdout.isTTY) {
+        deps.openBrowser(pending.openUrl);
+    }
+    else {
         console.log("No terminal here. If this command may be cut off before the approval, use `mergestorm login --start`, then `mergestorm login --finish`.");
     }
     console.log("Waiting for approval…");

package/dist/commands/registry.js

@@ -264,7 +264,7 @@ export const COMMAND_REGISTRY = [
             "mergestorm stack list [--json]  List registered stacks",
             "mergestorm stack status <stack-id> [--json]  Enriched stack status",
             "mergestorm stack wait <stack-id> [--json] [--timeout <s>]  Wait for stack attention (default 45s, max 300s; 0 = one snapshot, no wait). --json: one document on stdout; timeout notice on stderr, exit 5",
-            "mergestorm stack watch <stack-id> [--until attention|landed] [--ignore <blocker-substring>] [--max <minutes>] [--head <sha>] [--json]  Background watcher: silent while waiting; MS-WATCH ATTENTION exits 3, MS-WATCH LANDED exits 0",
+            "mergestorm stack watch <stack-id> [--until attention|landed] [--ignore <blocker-substring>] [--max <minutes>] [--head <sha>] [--bounce-id <id>] [--after-finished-at <iso>] [--json]  Background watcher: silent while waiting; MS-WATCH ATTENTION exits 3, MS-WATCH LANDED exits 0",
             "mergestorm stack set <stack-id> [--auto-land on|off] [--auto-review on|off|default] [--auto-patch on|off|default] [--auto-resolve-conflicts on|off|default] [--auto-fix-ci 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] [--auto-resolve-conflicts on|off] [--auto-fix-ci on|off]  Import an open PR chain",
             "mergestorm stack restack <stack-id>   Restack stack descendants",

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

@@ -10,8 +10,6 @@ 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;
@@ -59,6 +57,7 @@ export type LoadReviewContextOptions = {
 };
 /** Load --context / --context-file and enforce the API caps client-side. */
 export declare function loadReviewContext(opts: LoadReviewContextOptions): Promise<ReviewContextPayload>;
+export declare function reviewIdempotencyKey(input: ReviewInput, opts?: SubmitReviewOptions, afterJobId?: string | null): string;
 export declare function submitReview(cfg: Config, input: ReviewInput, opts?: SubmitReviewOptions): Promise<{
     status: number;
     row: ReviewJobRow;

package/dist/commands/review-client.js

@@ -1,3 +1,4 @@
+import { createHash } from "node:crypto";
 import { readFile, realpath } from "node:fs/promises";
 import { join, relative, resolve, sep } from "node:path";
 import { apiFetch, applyPrReviewQuery, isPositiveInteger, } from "../api.js";
@@ -12,8 +13,6 @@ 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;
@@ -128,7 +127,29 @@ export async function loadReviewContext(opts) {
         ...(contextFiles.length > 0 ? { contextFiles } : {}),
     };
 }
+const REPLAYED_JOB_RESUBMIT_STATUSES = ["failed", "quota_exceeded"];
+const MAX_REPLAYED_JOB_RESUBMITS = 5;
+export function reviewIdempotencyKey(input, opts = {}, afterJobId = null) {
+    const request = [
+        input.thread, input.branch, input.repo ?? null, input.baseLabel, input.headLabel, input.diff, input.files,
+        opts.routerMode ?? null, [...new Set(opts.specialists ?? [])].sort(), opts.context ?? null, opts.contextFiles ?? [], opts.webhookUrl ?? null,
+        afterJobId,
+    ];
+    return `mg-auto-${createHash("sha256").update(JSON.stringify(request)).digest("hex")}`;
+}
 export async function submitReview(cfg, input, opts = {}) {
+    const explicitKey = opts.idempotencyKey?.trim() || undefined;
+    let idempotencyKey = explicitKey ?? reviewIdempotencyKey(input, opts);
+    for (let resubmits = 0;; resubmits++) {
+        const submitted = await postReview(cfg, input, opts, idempotencyKey);
+        const replayedJobId = submitted.row.job_id ?? submitted.row.id ?? null;
+        if (explicitKey || submitted.status !== 200 || !replayedJobId || resubmits >= MAX_REPLAYED_JOB_RESUBMITS ||
+            !REPLAYED_JOB_RESUBMIT_STATUSES.includes(submitted.row.status ?? ""))
+            return submitted;
+        idempotencyKey = reviewIdempotencyKey(input, opts, replayedJobId);
+    }
+}
+async function postReview(cfg, input, opts, idempotencyKey) {
     const { status, body, retryAfterSeconds } = await apiFetch(cfg, "/api/v1/reviews", {
         method: "POST",
         json: {
@@ -143,7 +164,7 @@ export async function submitReview(cfg, input, opts = {}) {
             ...(opts.specialists?.length ? { specialists: opts.specialists } : {}),
             ...(opts.context ? { context: opts.context } : {}),
             ...(opts.contextFiles?.length ? { context_files: opts.contextFiles } : {}),
-            ...(opts.idempotencyKey ? { idempotency_key: opts.idempotencyKey } : {}),
+            idempotency_key: idempotencyKey,
             ...(opts.webhookUrl ? { webhook_url: opts.webhookUrl } : {}),
         },
         signal: opts.signal,

package/dist/commands/stack.js

@@ -59,11 +59,13 @@ const STACK_USAGE = `usage:
   mergestorm stack wait <stack-id> [--json] [--timeout <s>]
     --json writes exactly one JSON document to stdout. The timeout or error notice goes to stderr
     (exit 5 on timeout), so do not merge the streams (2>&1) before parsing stdout.
-  mergestorm stack watch <stack-id> [--until attention|landed] [--ignore <blocker-substring>] [--max <minutes>] [--head <sha>] [--json]
+  mergestorm stack watch <stack-id> [--until attention|landed] [--ignore <blocker-substring>] [--max <minutes>] [--head <sha>] [--bounce-id <id>] [--after-finished-at <iso>] [--json]
     Loops stack wait with the cursor and stays silent while the stack is waiting or in progress.
     Prints one MS-WATCH ATTENTION line and exits 3 on attention or on reads that keep failing (a permanent
     error twice, or 15 minutes of timeouts and 5xx, which it retries with backoff); prints MS-WATCH LANDED
     and exits 0 only for a confirmed landing, including a stack Mergestorm deleted after its queue entry landed. Other terminal reasons exit 3 with ATTENTION. Run it as a background command.
+    An ATTENTION line for a merge queue bounce ends with restart="mg stack watch <id> --bounce-id <id> --after-finished-at <iso>":
+    restart with that command (plus --head <sha> after a push) so a bounce you already handled is not reported again.
     --json writes exactly one JSON document to stdout and sends the MS-WATCH lines to stderr.
   mergestorm stack set <stack-id> [--auto-land on|off] [--auto-review on|off|default] [--auto-patch on|off|default] [--auto-resolve-conflicts on|off|default] [--auto-fix-ci on|off|default] [--json]
   mergestorm stack adopt <owner/repo>#<pr> [--auto-land on|off] [--auto-review on|off] [--auto-patch on|off] [--auto-resolve-conflicts on|off] [--auto-fix-ci on|off] [--json]
@@ -85,7 +87,8 @@ const STACK_USAGE = `usage:
   stack submit --server-side and stack publish need no GitHub credentials: mg
   reads your commits from the local repository and sends them to Mergestorm,
   which writes the commits and the branch on GitHub as the Surge App, opens the
-  pull request, and registers the stack with Auto patch pinned off. They never
+  pull request, and registers the stack. Auto patch follows the stack, the
+  repository and your account, like any other stack. They never
   run gh, git push or git fetch. stack publish does this for one branch and is
   how you send later commits to a branch that is already published. Mergestorm
   refuses to move a branch whose head on GitHub matches no local commit unless
@@ -782,9 +785,6 @@ export async function cmdStackSubmit(args, deps = {}) {
         }
     }
     if (serverSide) {
-        if (autoPatch === true) {
-            throw new CommandError("--server-side publishes your own commits and keeps Auto patch off for the stack. Drop --auto-patch on, or submit without --server-side.", REVIEW_EXIT.usage, "usage");
-        }
         const parked = plans.find((plan) => plan.githubBase == null);
         if (parked) {
             throw new CommandError(`Layer ${parked.branch} opens onto a park freeze, which --server-side does not mint. ` +
@@ -796,6 +796,7 @@ export async function cmdStackSubmit(args, deps = {}) {
         const remoteHeads = new Map();
         const published = [];
         let publishedStackId = null;
+        let publishedAutoPatch = null;
         for (const plan of plans) {
             if (!branchExistsFn(plan.branch, cwd)) {
                 throw new CommandError(`Stack layer branch missing locally: ${plan.branch}`);
@@ -825,6 +826,7 @@ export async function cmdStackSubmit(args, deps = {}) {
             });
             remoteHeads.set(plan.branch, result.head.sha);
             publishedStackId = result.stack.id;
+            publishedAutoPatch = result.stack.autoPatchOverride;
             published.push({
                 branch: plan.branch,
                 base: result.baseBranch,
@@ -834,19 +836,19 @@ export async function cmdStackSubmit(args, deps = {}) {
                 tree: result.head.tree,
             });
         }
-        const { autoEnqueueWhenReady: _autoLand, autoPatchOverride: _autoPatch, ...otherOverrides } = policy ?? {};
+        const { autoEnqueueWhenReady: _autoLand, ...otherOverrides } = policy ?? {};
         if (publishedStackId && Object.keys(otherOverrides).length > 0) {
             await (deps.setStackPolicy ?? setStackPolicy)(publishedStackId, otherOverrides, config);
         }
         await saveStackMetaFn(removeActiveStack(meta), cwd);
         const watch = publishedStackId ? openStackWatch(publishedStackId) : null;
         if (asJson) {
-            console.log(JSON.stringify({ owner, repo, layers: published, stackId: publishedStackId, trunk: meta.trunk, chain: null, serverSide: true, autoPatchOverride: false, watch }, null, 2));
+            console.log(JSON.stringify({ owner, repo, layers: published, stackId: publishedStackId, trunk: meta.trunk, chain: null, serverSide: true, autoPatchOverride: otherOverrides.autoPatchOverride ?? publishedAutoPatch, watch }, null, 2));
             return;
         }
         const lines = published.map((row) => ansi.brightGreen(`  #${row.prNumber}  ${row.branch} → ${row.base}  (${row.created ? "opened" : "exists"}, head ${row.head.slice(0, 12)})`));
         if (publishedStackId)
-            lines.push(ansi.brightGreen(`  Registered stack ${publishedStackId} with Auto patch off`));
+            lines.push(ansi.brightGreen(`  Registered stack ${publishedStackId}`));
         lines.push(ansi.dim("  Dashboard: https://mergestorm.ai/dashboard"));
         if (watch)
             lines.push(...stackWatchTextLines(watch).map((line) => `  ${line}`));
@@ -963,9 +965,6 @@ export async function cmdStackSubmit(args, deps = {}) {
         await registerPr(opened[opened.length - 1].prNumber);
     }
     else {
-        if (opened.length === 0) {
-            throw new CommandError("No pull requests to register after submit.");
-        }
         await registerPr(opened[0].prNumber);
     }
     const data = adoptData;
@@ -1057,7 +1056,7 @@ export async function cmdStackPublish(args, deps = {}) {
             ...(status.head ? [ansi.dim(`  head ${status.head.sha} (tree ${status.head.tree ?? "unknown"})`)] : []),
             ...(status.pr ? [ansi.dim(`  #${status.pr.number} → ${status.pr.base}  ${status.pr.url}`)] : []),
             ...(status.stack
-                ? [ansi.dim(`  stack ${status.stack.id}  auto-patch ${status.stack.autoPatchOverride === false ? "off" : "not pinned off"}  auto-land ${status.stack.autoLand ? "on" : "off"}`)]
+                ? [ansi.dim(`  stack ${status.stack.id}  auto-patch ${status.stack.autoPatchOverride === null ? "default" : status.stack.autoPatchOverride ? "on" : "off"}  auto-land ${status.stack.autoLand ? "on" : "off"}`)]
                 : []),
         ]);
         return;
@@ -1077,7 +1076,7 @@ export async function cmdStackPublish(args, deps = {}) {
     await present("Stack", [
         ansi.brightGreen(`  ${result.branch} ${moved} at ${result.head.sha.slice(0, 12)} (tree ${result.head.tree.slice(0, 12)})`),
         ansi.brightGreen(`  #${result.pr.number}  ${result.branch} → ${result.baseBranch}  (${result.pr.created ? "opened" : "exists"})  ${result.pr.url}`),
-        ansi.brightGreen(`  Registered stack ${result.stack.id} with Auto patch off`),
+        ansi.brightGreen(`  Registered stack ${result.stack.id}`),
         ...stackWatchTextLines(watch).map((line) => `  ${line}`),
     ]);
 }
@@ -1175,13 +1174,15 @@ export async function cmdStackWait(args, deps = {}) {
     }
 }
 export async function cmdStackWatch(args, deps = {}) {
-    const usage = "usage: mergestorm stack watch <stack-id> [--until attention|landed] [--ignore <blocker-substring>] [--max <minutes>] [--head <sha>] [--json]";
+    const usage = "usage: mergestorm stack watch <stack-id> [--until attention|landed] [--ignore <blocker-substring>] [--max <minutes>] [--head <sha>] [--bounce-id <id>] [--after-finished-at <iso>] [--json]";
     const fail = (detail) => new CommandError(detail ? `${usage}\n${detail}` : usage, REVIEW_EXIT.usage, "usage");
     const positional = [];
     const ignore = [];
     let until = "attention";
     let maxMinutes;
     let head;
+    let bounceId;
+    let afterFinishedAt;
     let json = false;
     for (let i = 0; i < args.length; i++) {
         const arg = args[i];
@@ -1212,6 +1213,17 @@ export async function cmdStackWatch(args, deps = {}) {
             if (!/^[0-9a-f]{7,40}$/i.test(head))
                 throw fail("--head must be a commit SHA");
         }
+        else if (flag === "--bounce-id") {
+            bounceId = value();
+            if (!/^[0-9a-z-]{1,64}$/i.test(bounceId))
+                throw fail("--bounce-id must be a merge queue entry id");
+        }
+        else if (flag === "--after-finished-at") {
+            const raw = value();
+            if (Number.isNaN(Date.parse(raw)))
+                throw fail("--after-finished-at must be an ISO timestamp");
+            afterFinishedAt = new Date(raw).toISOString();
+        }
         else if (arg.startsWith("-"))
             throw fail();
         else
@@ -1227,7 +1239,12 @@ export async function cmdStackWatch(args, deps = {}) {
         json,
         signal: deps.signal,
         ...(maxMinutes !== undefined ? { maxMs: maxMinutes * 60_000 } : {}),
-        ...(head ? { cursor: { stackId: stackId.trim().toLowerCase(), enrolledHeadSha: head.toLowerCase() } } : {}),
+        ...(head || bounceId || afterFinishedAt ? { cursor: {
+                stackId: stackId.trim().toLowerCase(),
+                enrolledHeadSha: head ? head.toLowerCase() : null,
+                ...(bounceId ? { bounceId } : {}),
+                ...(afterFinishedAt ? { afterFinishedAt } : {}),
+            } } : {}),
     });
     if (result.exitCode === STACK_WATCH_EXIT.landed)
         return;
@@ -1273,7 +1290,7 @@ export async function cmdStackStatus(args, deps = {}) {
         freshCursor: true,
     });
     if (asJson) {
-        console.log(JSON.stringify({ ...stack, held, repair, queueWait, watch }, null, 2));
+        console.log(JSON.stringify({ ...stack, attention, held, repair, queueWait, watch }, null, 2));
         return;
     }
     const lines = formatStackHuman(stack, false);
@@ -1287,7 +1304,7 @@ export async function cmdStackStatus(args, deps = {}) {
     }
     if (queueWait && !attention)
         lines.push(`  Queue: #${queueWait.prNumber} ${queueWait.text}`);
-    lines.push(...[...stackHeldLine(held), ...stackRepairLine(repair), ...stackWatchTextLines(watch)].map((line) => `  ${line}`));
+    lines.push(...[...stackHeldLine(attention ? null : held), ...stackRepairLine(repair), ...stackWatchTextLines(watch)].map((line) => `  ${line}`));
     await present("Stack status", lines);
 }
 /** Human summary lines for a `stack set` write, one per flag. */
@@ -1446,7 +1463,7 @@ export async function cmdStack(args, options = {}) {
         return cmdStackAdopt(rest);
     if (sub === "restack")
         return cmdStackRestack(rest);
-    if (sub === "land" || sub === "land-next")
+    if (sub === "land")
         return cmdStackLand(rest);
     throw new CommandError(`${STACK_USAGE}\nunknown stack subcommand: ${sub}`);
 }

package/dist/repo-identity.d.ts

@@ -1,6 +1,4 @@
-export declare const LEGACY_STACK_META_REL: string;
 export declare function gitTopLevel(cwd?: string): string;
-export declare function gitCommonDir(cwd?: string): string;
 /**
  * Each worktree has its own authoring state.
  * Independent clones remain isolated even when they point at the same remote.
@@ -9,4 +7,3 @@ export declare function stableRepoId(cwd?: string): string;
 export declare function cliStacksRoot(): string;
 export declare function repoStateDir(cwd?: string, stacksRoot?: string): string;
 export declare function stackMetaPath(cwd?: string, stacksRoot?: string): string;
-export declare function legacyStackMetaPath(cwd?: string): string;

package/dist/repo-identity.js

@@ -4,7 +4,6 @@ import path from "node:path";
 import { mergestormHome } from "./config.js";
 import { CommandError } from "./errors.js";
 import { git } from "./git.js";
-export const LEGACY_STACK_META_REL = path.join(".mergestorm", "stack.json");
 /** Classify git "not a repo" failures once at the boundary; callers match on code. */
 function rethrowIfNotARepo(err) {
     const detail = err instanceof Error ? err.message : String(err);
@@ -21,25 +20,6 @@ export function gitTopLevel(cwd = process.cwd()) {
         rethrowIfNotARepo(err);
     }
 }
-export function gitCommonDir(cwd = process.cwd()) {
-    let raw;
-    try {
-        raw = git(["rev-parse", "--git-common-dir"], cwd).trim();
-    }
-    catch (err) {
-        rethrowIfNotARepo(err);
-    }
-    const absolute = path.isAbsolute(raw) ? raw : path.resolve(cwd, raw);
-    try {
-        return realpathSync(absolute);
-    }
-    catch (err) {
-        if (err?.code === "ENOENT") {
-            throw new CommandError(`git common directory is missing (${absolute}); this is often a linked worktree whose main repository was deleted. Run \`mg stack reset --force\` to clear local pre-submit state.`, 1, "not_a_repo");
-        }
-        throw err;
-    }
-}
 /**
  * Each worktree has its own authoring state.
  * Independent clones remain isolated even when they point at the same remote.
@@ -67,6 +47,3 @@ export function repoStateDir(cwd = process.cwd(), stacksRoot = cliStacksRoot())
 export function stackMetaPath(cwd = process.cwd(), stacksRoot = cliStacksRoot()) {
     return path.join(repoStateDir(cwd, stacksRoot), "stack.json");
 }
-export function legacyStackMetaPath(cwd = process.cwd()) {
-    return path.join(gitTopLevel(cwd), LEGACY_STACK_META_REL);
-}

package/dist/stack-blockers.d.ts

@@ -190,7 +190,6 @@ export declare const AUTO_LAND_CI_FAILED_BLOCKER = "CI failed \u2014 Auto land r
 export declare const AUTO_LAND_WAIT_ATTENTION_MS: number;
 export declare const AUTO_LAND_CI_UNREADABLE_ATTENTION_MS: number;
 export declare function autoLandWaitLayer(stack: StackDto): StackLayerDto | undefined;
-export declare function autoLandWaitBlocker(stack: StackDto, layer: StackLayerDto, nowMs: number): string | null;
 export declare const MERGE_QUEUE_STALL_ATTENTION_MS: number;
 export type StackQueueWait = {
     prNumber: number;
@@ -221,22 +220,8 @@ export declare function stackRepair(stack: StackDto, attention: ClassifiedStackB
 export declare const LAND_PR_MISSING_PREFIX = "No open land PR for ";
 /** Pair-gate attention plus live hard blocks on every other open layer. */
 export declare function stackBlockers(stack: StackDto, entries?: MergeQueueEntryDto[], cursor?: Pick<StackWatchCursor, "bounceId" | "afterFinishedAt">, nowMs?: number): {
-    attention: null;
-    held: StackHeldBlocker;
-    issues: StackBlocker[];
-    currentCandidate: {
-        prNumber: number;
-        headSha: string | null;
-    } | null;
-    bounce: undefined;
-    busy: StackAgentBusy[];
-    agents: StackLayerAgents | null;
-    repair: StackRepairHint | null;
-    landGatePending: StackLandGatePending | null;
-    queueWait: StackQueueWait | null;
-} | {
     attention: StackBlocker | null;
-    held: null;
+    held: StackHeldBlocker | null;
     issues: StackBlocker[];
     currentCandidate: {
         prNumber: number;

package/dist/stack-blockers.js

@@ -185,9 +185,15 @@ function vortexImportantFindingsHeldAtHead(layer) {
         sameHead(layer.cycloneHandoff?.headSha, layer.headSha) &&
         CYCLONE_HELD_FINDINGS_REASONS.includes(layer.cycloneHandoff.reason);
 }
+function seamApprovedAtHead(stack, layer) {
+    const member = (stack.unit?.members ?? []).find((entry) => entry.prNumber === layer.prNumber);
+    return member?.seamState?.trim().toLowerCase() === "approved" && sameHead(member.seamReviewedSha, layer.headSha);
+}
 function vortexFindingsLeftForPerson(stack, layer) {
     if (layerAgentsBusy(layer).cyclone)
         return false;
+    if (seamApprovedAtHead(stack, layer))
+        return false;
     return vortexImportantFindingsHeldAtHead(layer) ||
         (vortexChangesRequestedAtHead(layer) && cycloneHandoffAtHead(stack, layer) !== null);
 }
@@ -494,9 +500,6 @@ export function autoLandWaitLayer(stack) {
 function autoLandWaitOn(stack, layer) {
     return autoLandWaitLayer(stack)?.prNumber === layer.prNumber ? armedAutoLandWait(stack) : null;
 }
-export function autoLandWaitBlocker(stack, layer, nowMs) {
-    return autoLandWaitNamed(stack, layer, nowMs)?.blocker ?? null;
-}
 function autoLandWaitNamed(stack, layer, nowMs) {
     const wait = autoLandWaitOn(stack, layer);
     if (!wait)
@@ -929,6 +932,15 @@ function landPrMissing(stack, candidate) {
         },
     };
 }
+function layerBusy(layer) {
+    if (!layer)
+        return false;
+    const busy = layerAgentsBusy(layer);
+    return busy.cyclone || busy.vortex;
+}
+function sameBlocker(a, b) {
+    return a.prNumber === b.prNumber && a.blocker === b.blocker;
+}
 /** Pair-gate attention plus live hard blocks on every other open layer. */
 export function stackBlockers(stack, entries = [], cursor = {}, nowMs = Date.now()) {
     const candidate = currentLayer(stack);
@@ -946,10 +958,12 @@ export function stackBlockers(stack, entries = [], cursor = {}, nowMs = Date.now
     let attentionLayer;
     let bounce;
     const issues = [];
+    const found = [];
     const mergeStateUnknownPrs = new Set();
     const queueWait = stack.archivedAt ? null : mergeQueueWait(queue, nowMs);
     for (const layer of open) {
         const selected = layer.prNumber === candidate?.prNumber;
+        const inScope = selected || !candidate || layer.position > candidate.position;
         let result = layerAttention(stack, layer, selected ? queue : [], cursor);
         let disarmed;
         if (!result.blocker && selected) {
@@ -978,10 +992,10 @@ export function stackBlockers(stack, entries = [], cursor = {}, nowMs = Date.now
             result = { blocker: `${MERGE_QUEUE_STALLED_PREFIX}${queueWait.text}`, reason: "queue_stalled", bounceKind: null };
         }
         if (!result.blocker) {
-            if (vortexRetryScheduled(layer) && (selected || !candidate || layer.position > candidate.position)) {
+            if (vortexRetryScheduled(layer) && inScope) {
                 issues.push({ prNumber: layer.prNumber, headSha: layer.headSha ?? null, blocker: VORTEX_RETRY_SCHEDULED, bounceKind: null });
             }
-            if (mergeabilityPending(layer) && (selected || !candidate || layer.position > candidate.position)) {
+            if (mergeabilityPending(layer) && inScope) {
                 mergeStateUnknownPrs.add(layer.prNumber);
                 issues.push({ prNumber: layer.prNumber, headSha: layer.headSha ?? null,
                     blocker: `Merge state unknown${layer.parentBranch ? ` vs ${layer.parentBranch}` : ""}`, bounceKind: null });
@@ -990,6 +1004,9 @@ export function stackBlockers(stack, entries = [], cursor = {}, nowMs = Date.now
         }
         const issue = { prNumber: layer.prNumber, headSha: layer.headSha ?? null,
             blocker: result.blocker, bounceKind: result.bounceKind };
+        if (inScope || result.reason === "unit_abandoned" || layer === child || waitNamed) {
+            found.push({ issue, reason: result.reason, layer, bounce: result.bounce });
+        }
         if (selected ||
             result.reason === "unit_abandoned" ||
             (!attention && (layer === child || waitNamed))) {
@@ -1001,7 +1018,7 @@ export function stackBlockers(stack, entries = [], cursor = {}, nowMs = Date.now
                 issues.push({ prNumber: disarmed.bounceDetail?.prNumber ?? layer.prNumber,
                     headSha: disarmed.bounceDetail?.headSha ?? null, blocker: mergeQueueBounceLabel(disarmed), bounceKind: result.bounceKind });
         }
-        else if (!candidate || layer.position > candidate.position)
+        else if (inScope)
             issues.push(issue);
     }
     if (!attention) {
@@ -1011,6 +1028,7 @@ export function stackBlockers(stack, entries = [], cursor = {}, nowMs = Date.now
             attention = { prNumber: unlisted.prNumber, headSha: unlisted.headSha ?? null, blocker: waiting.blocker, bounceKind: null };
             attentionReason = waiting.reason;
             attentionLayer = unlisted;
+            found.push({ issue: attention, reason: waiting.reason, layer: unlisted, bounce: undefined });
         }
     }
     const queued = queueWait && candidate && !queueWait.stalled
@@ -1025,13 +1043,15 @@ export function stackBlockers(stack, entries = [], cursor = {}, nowMs = Date.now
         attention = landMissing.attention;
         attentionReason = landMissing.reason;
         attentionLayer = undefined;
+        found.unshift({ issue: landMissing.attention, reason: landMissing.reason, layer: undefined, bounce: undefined,
+            repair: landMissing.repair });
     }
     const classified = attention && attentionReason
         ? { ...attention, reason: attentionReason }
         : null;
     const focus = attentionLayer ?? candidate;
-    const agents = focus ? layerAgents(focus) : null;
-    const busy = [];
+    let agents = focus ? layerAgents(focus) : null;
+    let busy = [];
     if (attention && agents) {
         for (const agent of ["cyclone", "vortex"]) {
             if (agents.busy[agent])
@@ -1045,17 +1065,39 @@ export function stackBlockers(stack, entries = [], cursor = {}, nowMs = Date.now
     const landGatePending = landLayer && landing && landGateIsPending(landing)
         ? { prNumber: landLayer.prNumber, headSha: landLayer.headSha ?? null, reason: landing }
         : null;
+    let held = null;
+    let shownIssues = issues;
+    let repair;
     if (busy.length && attention && classified && agentsCannotClear(classified.reason, stack, attentionLayer)) {
-        const held = { ...attention, actAfter: "agents_idle", waitingOn: busy.map((entry) => entry.agent) };
-        return { attention: null, held, issues: [attention, ...issues], currentCandidate, bounce: undefined, busy, agents,
-            repair: stackRepair(stack, classified, attentionLayer, undefined, queueWait), landGatePending, queueWait: queued };
+        held = { ...attention, actAfter: "agents_idle", waitingOn: busy.map((entry) => entry.agent) };
+        shownIssues = [attention, ...issues];
+        repair = stackRepair(stack, classified, attentionLayer, undefined, queueWait);
+        attention = null;
+        bounce = undefined;
+    }
+    else if (busy.length) {
+        repair = null;
+        attention = null;
+        bounce = undefined;
     }
-    if (busy.length) {
-        return { attention: null, held: null, issues, currentCandidate, bounce: undefined, busy, agents, repair: null, landGatePending,
-            queueWait: queued };
+    else {
+        repair = landMissing?.repair ?? stackRepair(stack, classified, attentionLayer, bounce, queueWait);
+    }
+    if (!attention) {
+        const next = found.find((item) => !layerBusy(item.layer));
+        if (next) {
+            attention = next.issue;
+            repair = next.repair !== undefined
+                ? next.repair
+                : stackRepair(stack, { ...next.issue, reason: next.reason }, next.layer, next.bounce, queueWait);
+            bounce = next.bounce;
+            if (next.layer)
+                agents = layerAgents(next.layer);
+            busy = [];
+            shownIssues = shownIssues.filter((issue) => !sameBlocker(issue, next.issue));
+        }
     }
-    return { attention, held: null, issues, currentCandidate, bounce, busy, agents,
-        repair: landMissing?.repair ?? stackRepair(stack, classified, attentionLayer, bounce, queueWait), landGatePending,
+    return { attention, held, issues: shownIssues, currentCandidate, bounce, busy, agents, repair, landGatePending,
         queueWait: queued };
 }
 function mergeabilitySettleIssue(stack, open, mergeStateUnknownPrs, attention) {

package/dist/stack-meta.d.ts

@@ -19,8 +19,6 @@ export type StackMeta = {
     /** Index into `stacks` for create/submit. */
     active: number;
 };
-/** Exported only for legacy migration/tests. New state never uses this path. */
-export declare const STACK_META_REL: string;
 export declare function stackMetaPath(cwd?: string, stacksRoot?: string): string;
 export declare function loadStackMeta(cwd?: string, stacksRoot?: string): Promise<StackMeta | null>;
 export declare function emptyStackMeta(trunk: string): StackMeta;

package/dist/stack-meta.js

@@ -3,11 +3,10 @@
  * Stored outside repositories under ~/.mergestorm/stacks/<repo-id>/.
  */
 import { randomUUID } from "node:crypto";
-import { chmod, copyFile, mkdir, readFile, readdir, rename, rm, rmdir, unlink, writeFile, } from "node:fs/promises";
+import { chmod, mkdir, readFile, readdir, rename, rm, writeFile, } from "node:fs/promises";
 import path from "node:path";
 import { CommandError, isCommandErrorCode } from "./errors.js";
-import { git } from "./git.js";
-import { cliStacksRoot, gitTopLevel, LEGACY_STACK_META_REL, legacyStackMetaPath, repoStateDir, stackMetaPath as resolveStackMetaPath, } from "./repo-identity.js";
+import { cliStacksRoot, stackMetaPath as resolveStackMetaPath, } from "./repo-identity.js";
 const LOCAL_STACK_FLAGS = [
     "autoEnqueueWhenReady",
     "autoReviewOverride",
@@ -15,8 +14,6 @@ const LOCAL_STACK_FLAGS = [
     "autoResolveConflictsOverride",
     "autoFixCiOverride",
 ];
-/** Exported only for legacy migration/tests. New state never uses this path. */
-export const STACK_META_REL = LEGACY_STACK_META_REL;
 export function stackMetaPath(cwd = process.cwd(), stacksRoot = cliStacksRoot()) {
     return resolveStackMetaPath(cwd, stacksRoot);
 }
@@ -64,17 +61,6 @@ function normalizeMeta(raw) {
         }
         return { version: 2, trunk: obj.trunk, stacks, active };
     }
-    if (obj.version === 1) {
-        if (!Array.isArray(obj.layers) || !obj.layers.every(isLayer)) {
-            throw new Error("Stack authoring state has malformed legacy layers; run `mg stack reset --force` to clear it.");
-        }
-        return {
-            version: 2,
-            trunk: obj.trunk,
-            stacks: [{ layers: obj.layers }],
-            active: 0,
-        };
-    }
     throw new Error("Stack authoring state has an unknown version; run `mg stack reset --force` to clear it.");
 }
 function parseStateJson(raw) {
@@ -96,71 +82,17 @@ async function readIfExists(file) {
         throw err;
     }
 }
-async function removeLegacyFile(file, cwd = process.cwd(), force = false) {
-    const top = gitTopLevel(cwd);
-    const rel = path.relative(top, file);
-    try {
-        git(["rm", "-f", "--", rel], top);
-    }
-    catch (err) {
-        // Fall back to a plain unlink only for untracked files; otherwise the
-        // index entry would remain after the worktree copy is gone.
-        if (git(["ls-files", "--", rel], top).trim() !== "") {
-            if (!force) {
-                throw new Error(`git rm failed for tracked ${rel}: ${err instanceof Error ? err.message : String(err)}`);
-            }
-            git(["update-index", "--force-remove", "--", rel], top);
-        }
-        await unlink(file);
-    }
-    try {
-        await rmdir(path.dirname(file));
-    }
-    catch {
-        // Leave a non-empty .mergestorm directory untouched.
-    }
-}
 export async function loadStackMeta(cwd = process.cwd(), stacksRoot = cliStacksRoot()) {
     const file = stackMetaPath(cwd, stacksRoot);
-    const legacyFile = legacyStackMetaPath(cwd);
     const raw = await readIfExists(file);
-    const legacyRaw = await readIfExists(legacyFile);
     if (raw !== null) {
         const meta = normalizeMeta(parseStateJson(raw));
         if (meta === null) {
             throw new CommandError("Stack authoring state is not an object; run `mg stack reset --force` to clear it.");
         }
-        if (legacyRaw !== null) {
-            const stateDir = repoStateDir(cwd, stacksRoot);
-            const stamp = new Date().toISOString().replace(/[:.]/g, "-");
-            const backup = path.join(stateDir, `legacy-conflict-${stamp}.json`);
-            try {
-                await mkdir(stateDir, { recursive: true, mode: 0o700 });
-                await chmod(stateDir, 0o700);
-                await copyFile(legacyFile, backup);
-                await chmod(backup, 0o600);
-                await removeLegacyFile(legacyFile, cwd);
-            }
-            catch (err) {
-                throw new CommandError(`Failed to preserve legacy stack state${err instanceof Error ? `: ${err.message}` : ""}; run \`mg stack reset --force\` to clear it.`);
-            }
-            console.warn(`Warning: global stack state already existed; preserved legacy state at ${backup}.`);
-        }
         return meta;
     }
-    if (legacyRaw === null)
-        return null;
-    const migrated = normalizeMeta(parseStateJson(legacyRaw));
-    if (!migrated)
-        return null;
-    try {
-        await saveStackMeta(migrated, cwd, stacksRoot);
-        await removeLegacyFile(legacyFile, cwd);
-    }
-    catch (err) {
-        throw new CommandError(`Failed to migrate legacy stack state${err instanceof Error ? `: ${err.message}` : ""}; run \`mg stack reset --force\` to clear it.`);
-    }
-    return migrated;
+    return null;
 }
 export function emptyStackMeta(trunk) {
     return {
@@ -225,10 +157,8 @@ export async function saveStackMeta(meta, cwd = process.cwd(), stacksRoot = cliS
 /** Explicit recovery. Does not touch branches, PRs, or registered server stacks. */
 export async function resetStackMeta(cwd = process.cwd(), stacksRoot = cliStacksRoot()) {
     let stateFile;
-    let legacyFile;
     try {
         stateFile = stackMetaPath(cwd, stacksRoot);
-        legacyFile = legacyStackMetaPath(cwd);
     }
     catch (err) {
         // Outside a worktree / deleted main repo: reset is a no-op (nothing to clear).
@@ -238,14 +168,6 @@ export async function resetStackMeta(cwd = process.cwd(), stacksRoot = cliStacks
         throw err;
     }
     await rm(stateFile, { force: true });
-    try {
-        await removeLegacyFile(legacyFile, cwd, true);
-    }
-    catch (err) {
-        const code = err?.code;
-        if (code !== "ENOENT")
-            throw err;
-    }
 }
 export function appendLayer(meta, layer) {
     const current = activeLayers(meta);

package/dist/stack-watch-loop.js

@@ -1,6 +1,7 @@
 import { setTimeout as sleep } from "node:timers/promises";
 import { API_TIMEOUT_PREFIX, DEFAULT_API_TIMEOUT_MS, LandedQueueReadError, readLandedQueueEntry } from "./api.js";
 import { isTransientReviewPollError } from "./commands/review-client.js";
+import { stackWatchBackgroundCommand } from "./stack-watch-obligation.js";
 import { pollStackWatch, StackWatchError, StackWatchTimeoutError, } from "./stack-watch.js";
 export const STACK_WATCH_MARKER = "MS-WATCH";
 export const STACK_WATCH_EXIT = { landed: 0, attention: 3, timeout: 5 };
@@ -30,7 +31,9 @@ export function stackWatchAttentionKey(envelope) {
     return `${envelope.prNumber ?? ""}|${envelope.headSha ?? ""}|${blockerWithoutElapsedMinutes(envelope.blocker)}`;
 }
 export function stackWatchAttentionLine(envelope) {
-    return `${STACK_WATCH_MARKER} ATTENTION pr=${envelope.prNumber ?? "none"} head=${envelope.headSha ?? "none"} blocker=${JSON.stringify(envelope.blocker ?? "")} repair=${envelope.repair?.kind ?? "none"}`;
+    const restart = envelope.cursor.bounceId
+        ? ` restart=${JSON.stringify(stackWatchBackgroundCommand(envelope.stackId, envelope.cursor))}` : "";
+    return `${STACK_WATCH_MARKER} ATTENTION pr=${envelope.prNumber ?? "none"} head=${envelope.headSha ?? "none"} blocker=${JSON.stringify(envelope.blocker ?? "")} repair=${envelope.repair?.kind ?? "none"}${restart}`;
 }
 export function stackWatchLandedLine(envelope) {
     return `${STACK_WATCH_MARKER} LANDED stack=${envelope.stackId} reason=${envelope.watch.reason}`;

package/dist/stack-watch-obligation.d.ts

@@ -1,7 +1,10 @@
 import type { StackDto } from "./stack-dto.js";
 export declare const STACK_WATCH_NOT_DONE_SENTENCE = "This stack is not landed. Your task is not done. Call stack_wait again with this cursor.";
 export declare const STACK_WATCH_NOTIFY_PATTERN = "MS-WATCH (ATTENTION|LANDED)";
-export declare function stackWatchBackgroundCommand(stackId: string): string;
+export declare function stackWatchBackgroundCommand(stackId: string, cursor?: {
+    afterFinishedAt?: string | null;
+    bounceId?: string | null;
+} | null): string;
 export type StackWatchDoneReason = "landed" | "closed" | "archived" | "not_found";
 export type StackWatchReason = StackWatchDoneReason | "open" | "attention" | "unread" | "rate_limited" | "failed" | "landing_unconfirmed";
 export type StackWatchNextArgs = {

package/dist/stack-watch-obligation.js

@@ -1,7 +1,10 @@
 export const STACK_WATCH_NOT_DONE_SENTENCE = "This stack is not landed. Your task is not done. Call stack_wait again with this cursor.";
 export const STACK_WATCH_NOTIFY_PATTERN = "MS-WATCH (ATTENTION|LANDED)";
-export function stackWatchBackgroundCommand(stackId) {
-    return `mg stack watch ${stackId}`;
+function shellArg(value) {
+    return /^[A-Za-z0-9_./:@%+=,-]+$/.test(value) ? value : `'${value.replace(/'/g, `'\\''`)}'`;
+}
+export function stackWatchBackgroundCommand(stackId, cursor) {
+    return `mg stack watch ${shellArg(stackId)}${cursor?.bounceId ? ` --bounce-id ${shellArg(cursor.bounceId)}` : ""}${cursor?.afterFinishedAt ? ` --after-finished-at ${shellArg(cursor.afterFinishedAt)}` : ""}`;
 }
 const DONE_MESSAGES = {
     landed: "This stack is landed. The watch is done; stop calling stack_wait for it.",
@@ -53,7 +56,7 @@ export function stackWatchObligation(input) {
         : input.status === "failed"
             ? "failed"
             : input.attention ? "attention" : input.unread ? "unread" : "open";
-    const background = stackWatchBackgroundCommand(input.stackId);
+    const background = stackWatchBackgroundCommand(input.stackId, input.cursor);
     const parts = [
         STACK_WATCH_NOT_DONE_SENTENCE,
         `If your host has a confirmed notification that resumes this task, run \`${background}\` as a background command, notify on output matching ${STACK_WATCH_NOTIFY_PATTERN}, and end your turn. The command monitors the stack; it cannot wake an agent by itself, and a process left running is not a notification. Without a confirmed notification, keep using stack_wait with the returned cursor, or report that automatic follow-up is unavailable before ending the turn.`,
@@ -66,7 +69,7 @@ export function stackWatchObligation(input) {
         parts.push(`This read failed, which does not end the task. Call stack_wait once more with the same cursor; if that fails too, tell the human that stack ${input.stackId} is not landed and is no longer being watched.`);
     }
     else if (reason === "attention" && input.attention) {
-        parts.push(`First fix #${input.attention.prNumber} (${input.attention.blocker}); repair, when present, names the fix. Calling stack_wait again before fixing it returns the same attention. After your push, call stack_wait with this cursor and enrolled_head_sha set to the SHA you pushed, or start \`${background} --head <pushed-sha>\` in the background.`);
+        parts.push(`First fix #${input.attention.prNumber} (${input.attention.blocker}); repair, when present, names the fix. Calling stack_wait again before fixing it returns the same attention. After your push, call stack_wait with this cursor and enrolled_head_sha set to the SHA you pushed, or start \`${background} --head <pushed-sha>\` in the background.${input.cursor?.bounceId ? ` If you handle it without a push (for example by turning Auto land back on), start \`${background}\` so this bounce is not reported again.` : ""}`);
     }
     else if (reason === "unread") {
         parts.push("This tool did not read the stack's state; stack_wait will.");

package/dist/stack-watch.js

@@ -154,8 +154,9 @@ export async function pollStackWatch(cfg, stackId, opts = {}) {
                 ...(bounce.finishedAt !== undefined ? { afterFinishedAt: bounce.finishedAt } : {}) });
         const held = busy[0];
         const shown = attention ?? named;
+        const waitingNamed = attention ? null : named;
         lastEnvelope = { ...lastEnvelope, cursor, issues, currentCandidate, assessment: "available", busy, agents, repair, landGatePending, queueWait,
-            actAfter: named?.actAfter ?? null, waitingOn: named?.waitingOn ?? [],
+            actAfter: waitingNamed?.actAfter ?? null, waitingOn: waitingNamed?.waitingOn ?? [],
             blocker: shown?.blocker ?? null, bounceKind: shown?.bounceKind ?? null,
             prNumber: shown?.prNumber ?? held?.prNumber ?? currentCandidate?.prNumber ?? null,
             headSha: shown ? shown.headSha : held ? held.headSha : currentCandidate?.headSha ?? null,

package/dist/ui/banner.js

@@ -221,6 +221,9 @@ const WHATS_NEW = {
     "0.3.61": [
         "Watch names a job Cyclone's push skips",
     ],
+    "0.3.62": [
+        "Watch wakes for a blocker on any layer",
+    ],
 };
 function densityFromVariant(variant) {
     if (variant === "mini" || variant === "nano")

package/package.json

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

package/skill/mergestorm-bounce-watch/SKILL.md

@@ -25,10 +25,14 @@ The CLI watcher monitors the stack but cannot wake an agent by itself. Use the b
    - `MS-WATCH ATTENTION failed stack=<id> error="<message>"` (exit 3): a read failed and its one retry failed too.
    - `MS-WATCH LANDED stack=<id> reason=landed` (exit 0): the stack is confirmed landed. `closed`, `archived`, and `not_found` instead emit `MS-WATCH ATTENTION stack=<id> reason=<reason>` (exit 3); follow "Not done until landed".
    With `--max <minutes>` it can also stop with `MS-WATCH TIMEOUT` (exit 5). The stack is not landed then; start the watcher again. `--json` writes exactly one JSON document to stdout: the final `mergestorm.stack_watch/v1` envelope, or `{ stackId, outcome }` when there is no envelope (a repeated failed read, timeout, or abort). MS-WATCH marker lines go to stderr; do not merge the streams before parsing stdout.
-3. When the host resumes you on `MS-WATCH ATTENTION pr=`, call `stack_status` once for that stack, then fix the blocker as steps 3 to 7 of "Watch and patch" say, push, and start the watcher again with `--head` set to the SHA you pushed. On `MS-WATCH ATTENTION failed`, the watcher already retried once: tell the human the stack is not landed and is no longer being watched.
-4. When the human has taken one blocker over and asked you to keep watching the rest, pass `--ignore <blocker-substring>`. The watcher stays silent on the first attention whose blocker contains that text until the blocker, its PR, or its head changes; any other attention still wakes you.
+3. When the host resumes you on `MS-WATCH ATTENTION pr=`, call `stack_status` once for that stack, then fix the blocker as steps 3 to 7 of "Watch and patch" say, push, and start the watcher again with `--head` set to the SHA you pushed. When the ATTENTION line ends with `restart="mg stack watch <id> --bounce-id <id> --after-finished-at <time>"` (a merge queue bounce), start the watcher again with that command, adding `--head <sha>` after a push; without those flags a bounce you handled without a push (for example by turning Auto land back on) is reported again at once. On `MS-WATCH ATTENTION failed`, the watcher already retried once: tell the human the stack is not landed and is no longer being watched.
+4. When the human has taken one blocker over and asked you to keep watching the stack, pass `--ignore <blocker-substring>`. The watcher stays silent on the first attention whose blocker contains that text until the blocker, its PR, or its head changes. Attention names one blocker at a time, so while the ignored blocker stands, blockers on higher layers stay hidden too; the next blocked layer wakes you only after the ignored blocker, its PR, or its head changes.
 5. `--until landed` keeps the watcher running after an attention: it prints each new attention line once and exits only when the watch is done or a read fails twice. Use it only when your host streams output lines to you while the command runs.
 
+## Attention on any layer
+
+Attention covers the whole stack, not only `currentCandidate`. It names the lowest open layer, a parked one included, that has a blocker an agent must fix while no Vortex or Cyclone run is working on that layer. On a layer with auto-patch off, request_changes from Vortex at the live head is `Vortex findings need a person`, whichever layer it is on. There is one attention at a time: fix it, push, and restart the watch; the next read names the next blocked layer at once. Vortex findings that do not stop Auto land (Important findings Cyclone never took, Info notes) are not attention and the watch does not report them.
+
 ## Scope and enrollment
 
 Watch only stacks the human named. If no unambiguous stack ID is available, ask the human to identify it; do not discover and enroll other stacks. Keep a separate cursor for each named stack.