mergestorm 0.3.4 → 0.3.5

package/README.md

@@ -48,14 +48,14 @@ mergestorm          # uses your local build
 On a TTY, bare `mergestorm` (or `mergestorm shell`) opens a branded REPL: a **full-width** welcome panel (logo + status on the left, tips / what's new on the right) and a **full-width** bordered input box with a live `/` slash-command dropdown. Non-TTY (CI/pipes) prints usage instead — no hanging prompt.
 
 ```
-╭─ mergestorm v0.3.4 ──────────────────────────────────────────────────────────╮
+╭─ mergestorm v0.3.5 ──────────────────────────────────────────────────────────╮
 │      ▟██████████▛       Tips for getting started                             │
 │       ▜████████▛          review      review main...HEAD                     │
 │        ▝▜████▛▘           stack       create → submit → restack → land       │
 │          ▜██▛             /help       list all commands                      │
 │           ██                                                                 │
-│           ▝▘            What's new in v0.3.4                                 │
-│  ● msk…  ·  maelstrom     • stack create / submit (author with mg)           │
+│           ▝▘            What's new in v0.3.5                                 │
+│  ● msk…  ·  maelstrom     • stack submit fills PR body from tip commit       │
 │  [████░░░░░░░░░░] 12% used                                                   │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 mergestorm
@@ -105,7 +105,7 @@ mergestorm stack auto-land on|off <stack-id>  Toggle auto-land when green
 
 `stack create` is local-only: it checks out a new branch from the current tip (or `--onto <branch>`), discovers trunk (`main` / `master` / `origin/HEAD`, overridable with `--trunk`), and appends `{ branch, parentBranch }` under **`.mergestorm/stack.json`**. No GitHub or API calls.
 
-`stack submit` walks that meta: `git push -u origin` each layer, opens a PR with `gh` (`--base` = parent or trunk; skips heads that already have an open PR), then registers the stack with `POST /api/v1/stacks/adopt` internally (Mergestorm API key). Push/PR auth is your local `git` + `gh auth` — not a Cyclone app token.
+`stack submit` walks that meta: `git push -u origin` each layer, opens a PR with `gh` (`--base` = parent or trunk; skips heads that already have an open PR; body from the tip commit — Summary + Test plan, preserving Fixes/Closes/Resolves), then registers the stack with `POST /api/v1/stacks/adopt` internally (Mergestorm API key). Push/PR auth is your local `git` + `gh auth` — not a Cyclone app token.
 
 ### `login`
 

package/dist/api.d.ts

@@ -91,6 +91,13 @@ export type StackLayerDto = {
     htmlUrl: string | null;
     ciStatus: string;
     reviewStatus: string;
+    checks: {
+        total: number;
+        success: number;
+        pending: number;
+        failure: number;
+        failingName: string | null;
+    } | null;
     conflictDetail: string | null;
     lastRestackedSha: string | null;
 };
@@ -109,7 +116,9 @@ export declare function adoptStack(owner: string, repo: string, prNumber: number
 /** 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): Promise<unknown>;
+export declare function landNextStack(stackId: string, cfg?: Config, opts?: {
+    prNumber?: number;
+}): Promise<unknown>;
 /** Toggle auto-land when green (Bearer PATCH /api/v1/stacks/:id). */
 export declare function setStackAutoLand(stackId: string, autoLandWhenGreen: boolean, cfg?: Config): Promise<unknown>;
 /** Recently reviewed branches/threads (Bearer GET /api/v1/threads). */

package/dist/api.js

@@ -119,8 +119,11 @@ 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) {
-    return stackMutation(stackId, "/land-next", "POST", {}, "Failed to land next", cfg);
+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);
 }
 /** Toggle auto-land when green (Bearer PATCH /api/v1/stacks/:id). */
 export async function setStackAutoLand(stackId, autoLandWhenGreen, cfg) {

package/dist/cli.js

@@ -35,7 +35,7 @@ function usage() {
   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 stack descendants
-  mergestorm stack land <stack-id>      Land the bottom open PR
+  mergestorm stack land <stack-id>      Land bottom PR (or promote into unit)
   mergestorm stack auto-land on|off <stack-id>  Toggle auto-land when green
 
   mg is a short alias for mergestorm (same binary).

package/dist/commands/stack.js

@@ -2,7 +2,8 @@ import { adoptStack, landNextStack, listStacks, restackStack, setStackAutoLand,
 import { loadConfig } from "../config.js";
 import { CommandError } from "../errors.js";
 import { createPr, findOpenPrNumber, requireGh } from "../gh.js";
-import { branchExists, createBranchFromHead, currentBranch, defaultLayerBranchName, deleteBranch, discoverTrunk, pushBranch, tipCommitSubject, worktreeDirty, } from "../git-stack.js";
+import { branchExists, createBranchFromHead, currentBranch, defaultLayerBranchName, deleteBranch, discoverTrunk, pushBranch, tipCommitMessage, tipCommitSubject, worktreeDirty, } from "../git-stack.js";
+import { buildPrBodyFromCommit } from "../pr-body.js";
 import { appendLayer, loadStackMeta, saveStackMeta, } from "../stack-meta.js";
 import { ansi } from "../ui/ansi.js";
 import { parseGithubOriginRepo } from "./review.js";
@@ -13,7 +14,11 @@ const STACK_USAGE = `usage:
   mergestorm stack adopt <owner/repo>#<pr>
   mergestorm stack restack <stack-id> [--json]
   mergestorm stack land <stack-id> [--json]
-  mergestorm stack auto-land on|off <stack-id> [--json]`;
+  mergestorm stack auto-land on|off <stack-id> [--json]
+
+  stack submit opens PRs with a body generated from each layer tip commit.
+  stack land promotes into the review unit when one exists; otherwise lands
+  the bottom open PR (unit-less stacks).`;
 const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 export function requireStackId(raw, usage) {
     const id = raw?.trim() ?? "";
@@ -192,6 +197,7 @@ async function cmdStackSubmit(args) {
         let created = false;
         if (prNumber == null) {
             const title = tipCommitSubject(layer.branch, cwd);
+            const body = buildPrBodyFromCommit(tipCommitMessage(layer.branch, cwd));
             console.log(ansi.dim(`  Opening PR ${layer.branch} → ${base} …`));
             prNumber = createPr({
                 owner,
@@ -199,7 +205,7 @@ async function cmdStackSubmit(args) {
                 base,
                 head: layer.branch,
                 title,
-                body: "",
+                body,
                 cwd,
             });
             created = true;
@@ -311,6 +317,7 @@ async function cmdStackLand(args) {
     const asJson = args.includes("--json");
     const id = requireStackId(args.find((a) => a !== "--json"), "usage: mergestorm stack land <stack-id>");
     const cfg = await loadConfig();
+    // Server routes unit stacks to promote-next (#244 / AUD-07).
     const body = await landNextStack(id, cfg);
     if (asJson) {
         console.log(JSON.stringify(body, null, 2));
@@ -318,6 +325,15 @@ async function cmdStackLand(args) {
     }
     const pr = body.mergedPrNumber;
     const branch = body.mergedBranch;
+    const uNumber = body.uNumber;
+    if (typeof uNumber === "number" && uNumber > 0) {
+        console.log(ansi.green(`  Promoted` +
+            (pr != null ? ` #${pr}` : "") +
+            ` into U${uNumber}` +
+            (branch ? ` (${branch})` : "") +
+            ` on ${id}`));
+        return;
+    }
     console.log(ansi.green(`  Landed` +
         (pr != null ? ` #${pr}` : "") +
         (branch ? ` (${branch})` : "") +

package/dist/git-stack.d.ts

@@ -1,6 +1,10 @@
 /** Current branch name, or null when detached. */
 export declare function currentBranch(cwd?: string): string | null;
-/** True when the worktree has staged/unstaged/untracked changes. */
+/**
+ * True when the worktree has staged/unstaged/untracked changes that should
+ * block `stack create`. Ignores `.mergestorm/stack.json` so local stack meta
+ * written by create does not prevent the next layer.
+ */
 export declare function worktreeDirty(cwd?: string): boolean;
 /**
  * Resolve trunk branch: --trunk flag, then origin/HEAD, then main/master if present.
@@ -16,3 +20,5 @@ export declare function defaultLayerBranchName(explicit?: string): string;
 export declare function pushBranch(branch: string, cwd?: string): void;
 /** First line of the tip commit on `branch` (for PR title). */
 export declare function tipCommitSubject(branch: string, cwd?: string): string;
+/** Full tip commit message on `branch` (subject + body; for PR description). */
+export declare function tipCommitMessage(branch: string, cwd?: string): string;

package/dist/git-stack.js

@@ -11,10 +11,28 @@ export function currentBranch(cwd = process.cwd()) {
         return null;
     }
 }
-/** True when the worktree has staged/unstaged/untracked changes. */
+/**
+ * True when the worktree has staged/unstaged/untracked changes that should
+ * block `stack create`. Ignores `.mergestorm/stack.json` so local stack meta
+ * written by create does not prevent the next layer.
+ */
 export function worktreeDirty(cwd = process.cwd()) {
     const out = git(["status", "--porcelain"], cwd);
-    return out.trim().length > 0;
+    for (const line of out.split("\n")) {
+        const trimmed = line.trimEnd();
+        if (!trimmed)
+            continue;
+        // porcelain: XY PATH or XY ORIG -> PATH (renames only)
+        const status = trimmed.slice(0, 2);
+        const pathPart = (status.includes("R") || status.includes("C"))
+            ? trimmed.slice(3).split(" -> ").pop()?.trim() ?? ""
+            : trimmed.slice(3).trim();
+        if (pathPart === ".mergestorm/stack.json" || pathPart.endsWith("/.mergestorm/stack.json")) {
+            continue;
+        }
+        return true;
+    }
+    return false;
 }
 /**
  * Resolve trunk branch: --trunk flag, then origin/HEAD, then main/master if present.
@@ -97,3 +115,15 @@ export function tipCommitSubject(branch, cwd = process.cwd()) {
         return branch;
     }
 }
+/** Full tip commit message on `branch` (subject + body; for PR description). */
+export function tipCommitMessage(branch, cwd = process.cwd()) {
+    try {
+        const s = git(["log", "-1", "--format=%B", branch], cwd);
+        if (s.trim())
+            return s;
+        return tipCommitSubject(branch, cwd);
+    }
+    catch {
+        return tipCommitSubject(branch, cwd);
+    }
+}

package/dist/pr-body.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Build a GitHub PR body from a tip commit message (#217).
+ * Pure — no git / network.
+ */
+/**
+ * Turn `git log -1 --format=%B` output into a non-empty PR description.
+ */
+export declare function buildPrBodyFromCommit(fullMessage: string): string;

package/dist/pr-body.js

@@ -0,0 +1,63 @@
+/**
+ * Build a GitHub PR body from a tip commit message (#217).
+ * Pure — no git / network.
+ */
+const TRAILER_RE = /^(fixes|closes|resolves)\s+#(\d+)\s*$/i;
+/**
+ * Turn `git log -1 --format=%B` output into a non-empty PR description.
+ */
+export function buildPrBodyFromCommit(fullMessage) {
+    const lines = fullMessage.replace(/\r\n/g, "\n").split("\n");
+    const subject = (lines[0] ?? "").trim() || "Update";
+    const trailers = [];
+    const bodyLines = [];
+    for (const raw of lines.slice(1)) {
+        const line = raw.trim();
+        if (!line)
+            continue;
+        const m = TRAILER_RE.exec(line);
+        if (m) {
+            const verb = m[1][0].toUpperCase() + m[1].slice(1).toLowerCase();
+            trailers.push(`${verb} #${m[2]}`);
+            continue;
+        }
+        bodyLines.push(line);
+    }
+    // Also pick trailers that appear as the whole subject (unusual but cheap).
+    const subjectTrailer = TRAILER_RE.exec(subject);
+    const summaryBullets = [];
+    if (subjectTrailer) {
+        const verb = subjectTrailer[1][0].toUpperCase() + subjectTrailer[1].slice(1).toLowerCase();
+        trailers.unshift(`${verb} #${subjectTrailer[2]}`);
+        summaryBullets.push(`- ${subject}`);
+    }
+    else {
+        summaryBullets.push(`- ${subject}`);
+    }
+    for (const para of bodyLines) {
+        summaryBullets.push(`- ${para}`);
+    }
+    const parts = [
+        "## Summary",
+        ...summaryBullets,
+        "",
+        "## Test plan",
+        "- [ ] CI green",
+    ];
+    if (trailers.length > 0) {
+        parts.push("", ...uniqueTrailers(trailers));
+    }
+    return parts.join("\n") + "\n";
+}
+function uniqueTrailers(trailers) {
+    const seen = new Set();
+    const out = [];
+    for (const t of trailers) {
+        const key = t.toLowerCase();
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        out.push(t);
+    }
+    return out;
+}

package/dist/ui/banner.js

@@ -42,6 +42,10 @@ const WHATS_NEW = {
         "`stack create` / `submit` — author stacks with `mg` (not Graphite)",
         "Adopt is import-only; happy path is create → submit → restack → land",
     ],
+    "0.3.5": [
+        "`stack submit` fills PR body from the tip commit (keeps Fixes/Closes)",
+        "Unit-stack `stack land` promotes (matches server gates)",
+    ],
 };
 function formatStatusLines(me, key, barWidth) {
     if (!key) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mergestorm",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "MergeStorm CLI — interactive shell and one-shot review commands",
   "type": "module",
   "bin": {