mergestorm 0.3.61 → 0.3.63

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.63                                             │
 │ ▀▀▀▀▀▀▀▀▀     ● 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.63: Stack create starts a new stack unless --extend│
 ╰──────────────────────────────────────────────────────────────────────────────╯
 mergestorm
 ╭──────────────────────────────────────────────────────────────────────────────╮
@@ -93,7 +93,7 @@ mergestorm thread <slug>        Jobs in a review thread
 mergestorm issue create --title <t>  Open a GitHub issue through Mergestorm, no `gh` (`--body`, `--body-file`, `--label`, `--repo`)
 mergestorm stack create [name]  New local stack layer (optional `--onto` / `--trunk` / `--extend`)
 mergestorm stack submit         Push layers, open PRs (`gh`), register via adopt (optional `--extend`, `--server-side`)
-mergestorm stack publish        Publish the current branch through Mergestorm with no GitHub credentials (`--status` to read it)
+mergestorm stack publish        Publish the current branch through Mergestorm with no GitHub credentials (`--base <branch> --extend` to stack, `--status` to read it)
 mergestorm stack list [--json]  List registered stacks
 mergestorm stack adopt <owner/repo>#<pr>  Import an existing open PR chain
 mergestorm stack restack <stack-id>  Restack descendants
@@ -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.
@@ -138,9 +138,14 @@ Use `mergestorm dismiss` when a Vortex finding is wrong and you have checked it
 
 `mg` is a short alias for `mergestorm` (same binary), e.g. `mg stack create`. Happy path: **create → commit → submit → restack → land**. On review-unit stacks, `stack land` **promotes** the tip into the unit (same gates as the dashboard); otherwise it lands the bottom open PR. `stack adopt` is for importing a chain that already exists on GitHub (legacy / Graphite). Restack/land use the same login key (`/api/v1/stacks`). Unattended landing is `mg queue add`.
 
-`stack create` checks out a new branch from the current tip (or `--onto <branch>`), discovers trunk (`main` / `master` / `origin/HEAD`, overridable with `--trunk`), and records `{ branch, parentBranch }` in CLI-managed state under **`~/.mergestorm/stacks/<repo-id>/stack.json`**. The CLI updates this automatically; never edit it. Each worktree has its own authoring state; independent clones stay isolated too. Creating onto trunk with a non-empty active stack starts a new one. `--trunk` only sets trunk metadata — it does **not** change the parent; use `--onto main` (etc.) for a fresh stack from trunk.
+`stack create` always starts a new single PR from trunk unless you pass **`--extend`**, even when the worktree is still on an earlier PR's branch: it checks out the new branch from `origin/<trunk>` (or local trunk; from `HEAD` when trunk is checked out). It discovers trunk (`main` / `master` / `origin/HEAD`, overridable with `--trunk`) and records `{ branch, parentBranch }` in CLI-managed state under **`~/.mergestorm/stacks/<repo-id>/stack.json`**. The CLI updates this automatically; never edit it. Each worktree has its own authoring state; independent clones stay isolated too. Creating onto trunk with a non-empty active stack starts a new one.
 
-If the parent branch is already a layer of a **registered** (submitted) stack, `create` and `submit` refuse unless you pass **`--extend`**. That blocks accidentally gluing an unrelated PR onto an open unit. Growing a registered stack on purpose: `mg stack create --onto <tip> --extend` → commit → `mg stack submit --extend`.
+Both paths are one command:
+
+- New stack from trunk: `mg stack create <name>` (from any branch), then `mg stack submit`.
+- Grow a stack: `mg stack create <name> --extend` on the branch to stack onto (or `--onto <branch> --extend`), then `mg stack submit --extend` when the parent is a layer of a registered stack. `mg stack publish --base <branch> --extend` does the same for publish.
+
+`--onto` or `--base` with a branch other than trunk and no `--extend` is refused, so nothing is added to a stack by accident. Every create, submit and publish prints which one it made: a new single PR onto trunk, or a layer stacked on its parent.
 
 `stack submit` walks the **active** local stack: `git push -u origin` each layer, opens a PR with `gh` (`--base` = parent or trunk; adopt then moves the bottom of a 2+ PR stack onto `mg-stack-<n>` — leave it there; skips heads that already have an open PR; body from the tip commit — Summary + Test plan, preserving Fixes/Closes/Resolves), registers the stack with `POST /api/v1/stacks/adopt` internally (Mergestorm API key), then drops that local stack entry so the next create onto trunk is clean. Push is always your local `git` credentials. PRs open as you when `gh` is installed and `gh api user` succeeds; otherwise `stack submit` asks the Mergestorm API (`POST /api/v1/stacks/pulls`) to open them as the Mergestorm Surge App on your behalf, after checking your GitHub account has write access, and assigns you. Stacks, the merge queue and Auto land run through Surge, and Cyclone is the auto-patch App. Without Surge, submit stops before pushing and prints the server's message, which names the App to install and links its install page. `mg settings` prints a `Stacks, merge queue, Auto land` line when the server reports whether that App is ready.
 
@@ -148,7 +153,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 +172,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. */
@@ -142,6 +142,14 @@ export type PrVortexReview = {
     reviewed_at: string | null;
     finding_count: number;
     findings: PrReviewFindings | null;
+    dismissed_findings?: Array<{
+        path: string;
+        line: number;
+        title: string;
+        severity: string;
+        finding_key: string;
+        github_comment_id: number | null;
+    }>;
     patch_policy: unknown | null;
     /**
      * MS-01: True when the returned row is a resting completion but a newer
@@ -167,7 +175,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 +396,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 +404,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;
@@ -463,7 +466,12 @@ export type PrFindingDismissResult = {
         other_gates: "unchanged";
     };
     stack_id: string | null;
+    threads?: Array<{
+        finding_id: string;
+        state: "resolved" | "already_resolved" | "not_found" | "failed";
+    }>;
 };
+export declare function dismissThreadsLine(result: Pick<PrFindingDismissResult, "threads">): string | null;
 export type PrFindingDismissOutcome = {
     ok: true;
     result: PrFindingDismissResult;

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) {
@@ -793,6 +773,19 @@ export async function listThreads(limit = 20, cfg) {
     const items = body.items;
     return Array.isArray(items) ? items : [];
 }
+export function dismissThreadsLine(result) {
+    const threads = result.threads ?? [];
+    if (threads.length === 0)
+        return null;
+    const closed = threads.filter((thread) => thread.state === "resolved" || thread.state === "already_resolved").length;
+    const failed = threads.filter((thread) => thread.state === "failed").map((thread) => thread.finding_id);
+    const missing = threads.filter((thread) => thread.state === "not_found").map((thread) => thread.finding_id);
+    return [
+        `GitHub threads: ${closed} of ${threads.length} resolved.`,
+        ...(failed.length ? [`Could not resolve ${failed.join(", ")}; run the same dismissal again to retry.`] : []),
+        ...(missing.length ? [`No thread found for ${missing.join(", ")}.`] : []),
+    ].join(" ");
+}
 export async function dismissPrFindings(input, cfg, opts) {
     const resolved = cfg ?? (await loadConfig());
     const json = {

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, dismissThreadsLine, 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, dismissThreadsLine, 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/dismiss.js

@@ -1,4 +1,4 @@
-import { dismissPrFindings, } from "../api.js";
+import { dismissPrFindings, dismissThreadsLine, } from "../api.js";
 import { loadConfig } from "../config.js";
 import { CommandError, REVIEW_EXIT } from "../errors.js";
 import { stackWatchObligation } from "../stack-watch-obligation.js";
@@ -110,6 +110,9 @@ export function formatDismissResult(result, watch) {
         }
         if (result.remaining.length)
             lines.push("Still open:", ...result.remaining.map(findingLine));
+        const threads = dismissThreadsLine(result);
+        if (threads)
+            lines.push(threads);
     }
     const seam = result.gate.seam;
     if (seam) {

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.d.ts

@@ -4,7 +4,7 @@ import { adoptStack, ensureUpperPark, findStackPull, getEnrichedStack, getStackP
 import { loadConfig } from "../config.js";
 import { createPrs, findOpenPrNumber } from "../gh.js";
 import { parseGithubOriginRepo } from "../git.js";
-import { branchExists, commitsAheadOf, createBranchFromHead, currentBranch, defaultLayerBranchName, deleteBranch, discoverTrunk, fetchRemoteBranch, pushBranch, tipCommitMessage, tipCommitSubject, worktreeDirty } from "../git-stack.js";
+import { branchExists, commitsAheadOf, createBranchFrom, createBranchFromHead, trunkStartRef, currentBranch, defaultLayerBranchName, deleteBranch, discoverTrunk, fetchRemoteBranch, pushBranch, tipCommitMessage, tipCommitSubject, worktreeDirty } from "../git-stack.js";
 import { buildPrBodyFromCommit } from "../pr-body.js";
 import { publishBranchServerSide, type WorkingBranchDeps } from "../server-publish.js";
 import { gitTopLevel } from "../repo-identity.js";
@@ -33,6 +33,11 @@ export declare function findRegisteredParent(stacks: StackDto[], parentBranch: s
  * Local unsubmitted parents are fine; only API-listed layers trip this.
  */
 export declare function assertMayParentOntoRegistered(parentBranch: string, stacks: StackDto[], extend: boolean, verb: "create" | "submit", owner?: string, repo?: string): RegisteredParentHit | null;
+export declare function stackShapeLine(input: {
+    layers: number;
+    base: string;
+    extendedStack: boolean;
+}): string;
 export declare function requireStackId(raw: string | undefined, usage: string): string;
 /** Parse `owner/repo#12` or `owner/repo 12`. */
 export declare function parseAdoptTarget(args: string[]): {
@@ -110,6 +115,8 @@ export type StackCreateDeps = {
     currentBranch?: typeof currentBranch;
     branchExists?: typeof branchExists;
     createBranchFromHead?: typeof createBranchFromHead;
+    createBranchFrom?: typeof createBranchFrom;
+    trunkStartRef?: typeof trunkStartRef;
     deleteBranch?: typeof deleteBranch;
     discoverTrunk?: typeof discoverTrunk;
     defaultLayerBranchName?: typeof defaultLayerBranchName;
@@ -156,6 +163,7 @@ export declare function parseStackPublishArgs(args: string[]): {
     title?: string;
     replaceHead?: string;
     autoLand?: boolean;
+    extend: boolean;
     status: boolean;
     asJson: boolean;
 };