mergestorm 0.3.2 → 0.3.3

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.2 ──────────────────────────────────────────────────────────╮
+╭─ mergestorm v0.3.3 ──────────────────────────────────────────────────────────╮
 │      ▟██████████▛       Tips for getting started                             │
 │       ▜████████▛          review      review main...HEAD                     │
-│        ▝▜████▛▘           branches    pick a reviewed branch                 │
+│        ▝▜████▛▘           stack       list / adopt / restack / land          │
 │          ▜██▛             /help       list all commands                      │
 │           ██                                                                 │
-│           ▝▘            What's new in v0.3.2                                 │
-│  ● msk…  ·  maelstrom     • Full-width welcome + input                      │
+│           ▝▘            What's new in v0.3.3                                 │
+│  ● msk…  ·  maelstrom     • stack list / adopt / restack / land              │
 │  [████░░░░░░░░░░] 12% used                                                   │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 mergestorm
@@ -92,8 +92,15 @@ mergestorm branches [n]         Recently reviewed branches (arrow-pick on TTY)
 mergestorm chain [slug]         Branch review-chain timeline (default: current branch)
 mergestorm whoami [--json]      Key prefix, plan, API base, config path
 mergestorm thread <slug>        Jobs in a review thread
+mergestorm stack list [--json]  List adopted stacks
+mergestorm stack adopt <owner/repo>#<pr>  Adopt an open PR chain
+mergestorm stack restack <stack-id>  Restack descendants
+mergestorm stack land <stack-id>     Land the bottom open PR
+mergestorm stack auto-land on|off <stack-id>  Toggle auto-land when green
 ```
 
+`mg` is a short alias for `mergestorm` (same binary), e.g. `mg stack list`. Stack ops use the same login key as review commands (`/api/v1/stacks`).
+
 ### `login`
 
 Runs a browser device-authorization flow: prints a short code, opens `https://mergestorm.ai/cli/auth`, and — once you approve — mints and stores an API key in `~/.mergestorm/config.json` (mode `600`). No key copy/paste needed.

package/dist/api.d.ts

@@ -81,5 +81,36 @@ export type ThreadDetail = {
 /** Fetch /api/v1/me; returns null on 404/network so callers can degrade. */
 export declare function getMe(cfg?: Config): Promise<MeResponse | null>;
 export declare function listJobs(limit?: number, cfg?: Config): Promise<JobListItem[]>;
+export type StackLayerDto = {
+    branch: string;
+    parentBranch: string | null;
+    prNumber: number;
+    position: number;
+    state: string;
+    title: string | null;
+    htmlUrl: string | null;
+    ciStatus: string;
+    reviewStatus: string;
+    conflictDetail: string | null;
+    lastRestackedSha: string | null;
+};
+export type StackDto = {
+    id: string;
+    owner: string;
+    repo: string;
+    trunkBranch: string;
+    autoLandWhenGreen: boolean;
+    layers: StackLayerDto[];
+};
+/** List stacks (Bearer GET /api/v1/stacks). */
+export declare function listStacks(cfg?: Config): Promise<StackDto[]>;
+/** Adopt an open PR chain (Bearer POST /api/v1/stacks/adopt). */
+export declare function adoptStack(owner: string, repo: string, prNumber: number, cfg?: Config): Promise<unknown>;
+/** 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>;
+/** 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). */
 export declare function listThreads(limit?: number, cfg?: Config): Promise<ThreadListItem[]>;

package/dist/api.js

@@ -69,6 +69,63 @@ export async function listJobs(limit = 10, cfg) {
     const items = body.items;
     return Array.isArray(items) ? items : [];
 }
+/** List stacks (Bearer GET /api/v1/stacks). */
+export async function listStacks(cfg) {
+    const resolved = cfg ?? (await loadConfig());
+    const { status, body } = await apiFetch(resolved, "/api/v1/stacks");
+    if (status === 404) {
+        throw new CommandError("Stacks API is not available on this server yet. Deploy the API update or use the dashboard.");
+    }
+    if (status !== 200) {
+        throw new CommandError(`Failed to list stacks (HTTP ${status}): ${JSON.stringify(body)}`);
+    }
+    const stacks = body.stacks;
+    return Array.isArray(stacks) ? stacks : [];
+}
+/** Adopt an open PR chain (Bearer POST /api/v1/stacks/adopt). */
+export async function adoptStack(owner, repo, prNumber, cfg) {
+    const resolved = cfg ?? (await loadConfig());
+    const { status, body } = await apiFetch(resolved, "/api/v1/stacks/adopt", {
+        method: "POST",
+        json: { owner, repo, prNumber },
+    });
+    if (status === 404) {
+        throw new CommandError("Stacks API is not available on this server yet. Deploy the API update or use the dashboard.");
+    }
+    if (status !== 200) {
+        throw new CommandError(`Failed to adopt stack (HTTP ${status}): ${JSON.stringify(body)}`);
+    }
+    return body;
+}
+async function stackMutation(stackId, pathSuffix, method, json, failLabel, cfg) {
+    const resolved = cfg ?? (await loadConfig());
+    const { status, body } = await apiFetch(resolved, `/api/v1/stacks/${encodeURIComponent(stackId)}${pathSuffix}`, method === "PATCH"
+        ? { method, json }
+        : { method, json: json ?? {} });
+    if (status === 404) {
+        const err = body?.error;
+        if (err === "stack_not_found") {
+            throw new CommandError(`Stack not found: ${stackId}`);
+        }
+        throw new CommandError("Stacks API is not available on this server yet. Deploy the API update or use the dashboard.");
+    }
+    if (status !== 200) {
+        throw new CommandError(`${failLabel} (HTTP ${status}): ${JSON.stringify(body)}`);
+    }
+    return body;
+}
+/** Restack descendants (Bearer POST /api/v1/stacks/:id/restack). */
+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);
+}
+/** Toggle auto-land when green (Bearer PATCH /api/v1/stacks/:id). */
+export async function setStackAutoLand(stackId, autoLandWhenGreen, cfg) {
+    return stackMutation(stackId, "", "PATCH", { autoLandWhenGreen }, "Failed to update auto-land", cfg);
+}
 /** Recently reviewed branches/threads (Bearer GET /api/v1/threads). */
 export async function listThreads(limit = 20, cfg) {
     const resolved = cfg ?? (await loadConfig());

package/dist/cli.js

@@ -8,6 +8,7 @@ import { cmdJobs, cmdThread } from "./commands/jobs.js";
 import { cmdLogin } from "./commands/login.js";
 import { cmdLogout } from "./commands/logout.js";
 import { cmdReview } from "./commands/review.js";
+import { cmdStack } from "./commands/stack.js";
 import { cmdStatus } from "./commands/status.js";
 import { cmdWhoami } from "./commands/whoami.js";
 import { runShell } from "./shell.js";
@@ -29,6 +30,11 @@ function usage() {
   mergestorm chain [slug]         Branch review-chain timeline (default: current)
   mergestorm whoami [--json]      Key + plan + API base
   mergestorm thread <slug>        Jobs in a review thread
+  mergestorm stack list [--json]  List adopted stacks
+  mergestorm stack adopt <owner/repo>#<pr>  Adopt an open PR chain
+  mergestorm stack restack <stack-id>   Restack stack descendants
+  mergestorm stack land <stack-id>      Land the bottom open PR
+  mergestorm stack auto-land on|off <stack-id>  Toggle auto-land when green
 
   mg is a short alias for mergestorm (same binary).
 
@@ -64,6 +70,8 @@ async function runCommand(cmd, args) {
             throw new CommandError("usage: mergestorm thread <slug>");
         return cmdThread(args[0], args.slice(1));
     }
+    if (cmd === "stack")
+        return cmdStack(args);
     if (cmd === "shell")
         return runShell();
     usage();

package/dist/commands/stack.d.ts

@@ -0,0 +1,8 @@
+export declare function requireStackId(raw: string | undefined, usage: string): string;
+/** Parse `owner/repo#12` or `owner/repo 12`. */
+export declare function parseAdoptTarget(args: string[]): {
+    owner: string;
+    repo: string;
+    prNumber: number;
+};
+export declare function cmdStack(args: string[]): Promise<void>;

package/dist/commands/stack.js

@@ -0,0 +1,163 @@
+import { adoptStack, landNextStack, listStacks, restackStack, setStackAutoLand, } from "../api.js";
+import { loadConfig } from "../config.js";
+import { CommandError } from "../errors.js";
+import { ansi } from "../ui/ansi.js";
+const STACK_USAGE = `usage:
+  mergestorm stack list [--json]
+  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]`;
+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() ?? "";
+    if (!id || !UUID_RE.test(id)) {
+        throw new CommandError(usage);
+    }
+    return id;
+}
+/** Parse `owner/repo#12` or `owner/repo 12`. */
+export function parseAdoptTarget(args) {
+    const joined = args.join(" ").trim();
+    const hashMatch = /^([^/\s]+)\/([^#\s]+)#([1-9]\d*)$/.exec(joined);
+    if (hashMatch) {
+        return {
+            owner: hashMatch[1],
+            repo: hashMatch[2],
+            prNumber: Number(hashMatch[3]),
+        };
+    }
+    if (args.length >= 2) {
+        const slash = /^([^/\s]+)\/([^/\s]+)$/.exec(args[0]);
+        const pr = Number(args[1]);
+        if (slash && Number.isInteger(pr) && pr > 0) {
+            return { owner: slash[1], repo: slash[2], prNumber: pr };
+        }
+    }
+    throw new CommandError(`usage: mergestorm stack adopt <owner/repo>#<pr>`);
+}
+function formatStackHuman(s) {
+    const lines = [];
+    const auto = s.autoLandWhenGreen ? " · auto-land" : "";
+    lines.push(`  ${ansi.bold(`${s.owner}/${s.repo}`)}  trunk=${s.trunkBranch}${auto}`);
+    lines.push(`  ${ansi.dim(s.id)}`);
+    if (s.layers.length === 0) {
+        lines.push(ansi.dim("    (no layers)"));
+        return lines;
+    }
+    for (const layer of s.layers) {
+        const title = layer.title ? ` ${layer.title}` : "";
+        const pr = layer.prNumber > 0 ? `#${layer.prNumber}` : "—";
+        lines.push(`    ${String(layer.position).padStart(2)}  ${pr.padEnd(5)}  ${layer.state.padEnd(14)}  ${layer.branch}${title}`);
+    }
+    return lines;
+}
+async function cmdStackList(args) {
+    const asJson = args.includes("--json");
+    const cfg = await loadConfig();
+    const stacks = await listStacks(cfg);
+    if (asJson) {
+        console.log(JSON.stringify({ stacks }, null, 2));
+        return;
+    }
+    if (stacks.length === 0) {
+        console.log(ansi.dim("  No stacks yet. Adopt one: `stack adopt owner/repo#pr`"));
+        console.log(ansi.dim("  Dashboard: https://mergestorm.ai/dashboard/stacks"));
+        return;
+    }
+    for (const s of stacks) {
+        for (const line of formatStackHuman(s))
+            console.log(line);
+        console.log("");
+    }
+    console.log(ansi.dim("  Dashboard: https://mergestorm.ai/dashboard/stacks"));
+}
+async function cmdStackAdopt(args) {
+    const asJson = args.includes("--json");
+    const targetArgs = args.filter((a) => a !== "--json");
+    if (targetArgs.length === 0) {
+        throw new CommandError(`usage: mergestorm stack adopt <owner/repo>#<pr>`);
+    }
+    const { owner, repo, prNumber } = parseAdoptTarget(targetArgs);
+    const cfg = await loadConfig();
+    const body = await adoptStack(owner, repo, prNumber, cfg);
+    if (asJson) {
+        console.log(JSON.stringify(body, null, 2));
+        return;
+    }
+    if (typeof body !== "object" || body === null) {
+        throw new CommandError("Unexpected response shape from adopt API");
+    }
+    const data = body;
+    const stack = data.stack;
+    const chain = data.chain;
+    console.log(ansi.green(`  Adopted ${owner}/${repo}#${prNumber}` +
+        (stack?.id ? ` → ${stack.id}` : "") +
+        (Array.isArray(chain) ? ` (${chain.length} layer(s))` : "")));
+    if (stack?.trunkBranch) {
+        console.log(ansi.dim(`  trunk: ${stack.trunkBranch}`));
+    }
+    console.log(ansi.dim("  Dashboard: https://mergestorm.ai/dashboard/stacks"));
+}
+async function cmdStackRestack(args) {
+    const asJson = args.includes("--json");
+    const id = requireStackId(args.find((a) => a !== "--json"), "usage: mergestorm stack restack <stack-id>");
+    const cfg = await loadConfig();
+    const body = await restackStack(id, cfg);
+    if (asJson) {
+        console.log(JSON.stringify(body, null, 2));
+        return;
+    }
+    const fromBranch = body.fromBranch;
+    console.log(ansi.green(`  Restack started` + (fromBranch ? ` from ${fromBranch}` : "") + ` (${id})`));
+}
+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();
+    const body = await landNextStack(id, cfg);
+    if (asJson) {
+        console.log(JSON.stringify(body, null, 2));
+        return;
+    }
+    const pr = body.mergedPrNumber;
+    const branch = body.mergedBranch;
+    console.log(ansi.green(`  Landed` +
+        (pr != null ? ` #${pr}` : "") +
+        (branch ? ` (${branch})` : "") +
+        ` on ${id}`));
+}
+async function cmdStackAutoLand(args) {
+    const asJson = args.includes("--json");
+    const filtered = args.filter((a) => a !== "--json");
+    const mode = filtered[0]?.toLowerCase();
+    const id = requireStackId(filtered[1], "usage: mergestorm stack auto-land on|off <stack-id>");
+    if (mode !== "on" && mode !== "off") {
+        throw new CommandError("usage: mergestorm stack auto-land on|off <stack-id>");
+    }
+    const cfg = await loadConfig();
+    const body = await setStackAutoLand(id, mode === "on", cfg);
+    if (asJson) {
+        console.log(JSON.stringify(body, null, 2));
+        return;
+    }
+    console.log(ansi.green(`  Auto-land ${mode} for ${id}`));
+}
+export async function cmdStack(args) {
+    const sub = args[0]?.toLowerCase();
+    const rest = args.slice(1);
+    if (!sub || sub === "-h" || sub === "--help") {
+        throw new CommandError(STACK_USAGE);
+    }
+    if (sub === "list" || sub === "ls")
+        return cmdStackList(rest);
+    if (sub === "adopt")
+        return cmdStackAdopt(rest);
+    if (sub === "restack")
+        return cmdStackRestack(rest);
+    if (sub === "land" || sub === "land-next")
+        return cmdStackLand(rest);
+    if (sub === "auto-land" || sub === "autoland")
+        return cmdStackAutoLand(rest);
+    throw new CommandError(`${STACK_USAGE}\nunknown stack subcommand: ${sub}`);
+}

package/dist/shell.js

@@ -7,6 +7,7 @@ import { cmdJobs, cmdThread } from "./commands/jobs.js";
 import { cmdLogin } from "./commands/login.js";
 import { cmdLogout } from "./commands/logout.js";
 import { cmdReview } from "./commands/review.js";
+import { cmdStack } from "./commands/stack.js";
 import { cmdStatus } from "./commands/status.js";
 import { cmdWhoami } from "./commands/whoami.js";
 import { ansi } from "./ui/ansi.js";
@@ -27,6 +28,7 @@ export const COMMANDS = [
     { name: "chain", summary: "Show a branch review-chain timeline" },
     { name: "whoami", summary: "Key + plan + API base" },
     { name: "thread", summary: "Jobs in a review thread" },
+    { name: "stack", summary: "Stacks: list, adopt, restack, land, auto-land" },
     { name: "clear", summary: "Clear screen and reprint banner" },
     { name: "exit", summary: "Leave the shell" },
     { name: "quit", summary: "Leave the shell" },
@@ -161,6 +163,9 @@ export async function runShell() {
                     }
                     await cmdThread(args[0], args.slice(1));
                 }
+                else if (cmd === "stack") {
+                    await cmdStack(args);
+                }
                 else {
                     console.error(ansi.dim(`unknown command "${cmd}" -- type help`));
                 }

package/dist/ui/banner.js

@@ -35,6 +35,9 @@ const WHATS_NEW = {
     "0.3.2": [
         "`mg` short alias — same binary as `mergestorm`",
     ],
+    "0.3.3": [
+        "`stack list` / `adopt` / `restack` / `land` / `auto-land`",
+    ],
 };
 function formatStatusLines(me, key, barWidth) {
     if (!key) {

package/package.json

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