mergestorm 0.1.1 → 0.3.0

package/dist/cli.js

@@ -1,381 +1,100 @@
 #!/usr/bin/env node
-import { spawn, spawnSync } from "node:child_process";
-import { mkdir, readFile, writeFile, rm, readdir, stat } from "node:fs/promises";
-import { homedir, platform } from "node:os";
-import path from "node:path";
-import { createInterface } from "node:readline/promises";
 import { stdin as input, stdout as output } from "node:process";
-const DEFAULT_API = "https://api.mergestorm.ai";
-const CONTEXT_DIR = ".mergestorm";
-function configPath() {
-    return path.join(homedir(), ".mergestorm", "config.json");
-}
-async function loadConfig() {
-    try {
-        const raw = await readFile(configPath(), "utf8");
-        return JSON.parse(raw);
-    }
-    catch {
-        return {};
-    }
-}
-async function saveConfig(cfg) {
-    const dir = path.dirname(configPath());
-    await mkdir(dir, { recursive: true });
-    await writeFile(configPath(), JSON.stringify(cfg, null, 2) + "\n", { encoding: "utf8", mode: 0o600 });
-}
-function apiBase(cfg) {
-    return (process.env.MERGESTORM_API_URL?.trim() || cfg.apiBase || DEFAULT_API).replace(/\/$/, "");
-}
-async function apiFetch(cfg, route, init = {}) {
-    const key = process.env.MERGESTORM_API_KEY?.trim() || cfg.apiKey;
-    if (!key) {
-        throw new Error("No API key. Run `mergestorm login` or set MERGESTORM_API_KEY.");
-    }
-    const headers = {
-        Authorization: `Bearer ${key}`,
-        ...init.headers,
-    };
-    let body = init.body;
-    if (init.json !== undefined) {
-        headers["Content-Type"] = "application/json";
-        body = JSON.stringify(init.json);
-    }
-    const res = await fetch(`${apiBase(cfg)}${route}`, { ...init, headers, body });
-    const text = await res.text();
-    let parsed = text;
-    try {
-        parsed = JSON.parse(text);
-    }
-    catch {
-        // keep text
-    }
-    return { status: res.status, body: parsed };
-}
-function git(args, cwd = process.cwd()) {
-    const result = spawnSync("git", args, { cwd, encoding: "utf8" });
-    if (result.status !== 0) {
-        throw new Error(result.stderr?.trim() || `git ${args.join(" ")} failed`);
-    }
-    return result.stdout;
-}
-async function collectContextFiles(root) {
-    const pack = path.join(root, CONTEXT_DIR);
-    let entries;
-    try {
-        entries = await readdir(pack, { withFileTypes: true });
-    }
-    catch {
-        return [];
-    }
-    const files = [];
-    for (const entry of entries) {
-        if (entry.isFile() && (entry.name.toLowerCase().endsWith(".md") || entry.name.toLowerCase().endsWith(".txt"))) {
-            const content = await readFile(path.join(pack, entry.name), "utf8");
-            files.push({ path: entry.name, content });
-        }
-        else if (entry.isDirectory() && !entry.name.startsWith(".")) {
-            const nested = await readdir(path.join(pack, entry.name), { withFileTypes: true }).catch(() => []);
-            for (const child of nested) {
-                if (child.isFile() && (child.name.toLowerCase().endsWith(".md") || child.name.toLowerCase().endsWith(".txt"))) {
-                    const rel = `${entry.name}/${child.name}`;
-                    const content = await readFile(path.join(pack, entry.name, child.name), "utf8");
-                    files.push({ path: rel, content });
-                }
-            }
-        }
-    }
-    return files;
-}
-async function collectChangedFiles(base, head) {
-    const names = git(["diff", "--name-only", "--diff-filter=ACMR", `${base}...${head}`])
-        .split("\n")
-        .map((s) => s.trim())
-        .filter(Boolean);
-    const files = [];
-    for (const name of names.slice(0, 40)) {
-        try {
-            const st = await stat(path.join(process.cwd(), name));
-            if (!st.isFile() || st.size > 400_000)
-                continue;
-            const content = await readFile(path.join(process.cwd(), name), "utf8");
-            files.push({ path: name, content });
-        }
-        catch {
-            // deleted or unreadable
-        }
-    }
-    return files;
-}
-function printBanner() {
-    console.log(`
-  ┌─────────────────────────────┐
-  │       MergeStorm CLI        │
-  │   review local diffs fast   │
-  └─────────────────────────────┘
-`);
-}
+import { DEFAULT_API } from "./config.js";
+import { CommandError } from "./errors.js";
+import { cmdBranches, cmdChain } from "./commands/branches.js";
+import { cmdCredits } from "./commands/credits.js";
+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 { cmdStatus } from "./commands/status.js";
+import { cmdWhoami } from "./commands/whoami.js";
+import { runShell } from "./shell.js";
+import { ansi } from "./ui/ansi.js";
+import { printWordmark } from "./ui/banner.js";
 function usage() {
-    printBanner();
+    printWordmark();
     console.log(`Usage:
-  mergestorm login                 Sign in via browser and store an API key
-  mergestorm login --key           Paste an existing API key instead (headless/CI)
-  mergestorm logout                Remove the stored API key
-  mergestorm review [base] [head]  Review git diff base...head (default: main...HEAD)
-  mergestorm status <job_id>       Poll a review job
+  mergestorm                      Interactive shell (TTY)
+  mergestorm shell                Explicit shell entry
+  mergestorm login                Sign in via browser and store an API key
+  mergestorm login --key          Paste an existing API key instead (headless/CI)
+  mergestorm logout               Remove the stored API key
+  mergestorm review [base] [head] Review git diff base...head (default: main...HEAD)
+  mergestorm status <job_id>      Poll a review job (JSON)
+  mergestorm credits [--json]     Credit balance (usage bars)
+  mergestorm jobs [n] [--json]    Recent review jobs
+  mergestorm branches [n]         Recently reviewed branches (pick on TTY)
+  mergestorm chain [slug]         Branch review-chain timeline (default: current)
+  mergestorm whoami [--json]      Key + plan + API base
+  mergestorm thread <slug>        Jobs in a review thread
 
 Env:
   MERGESTORM_API_KEY   API key (overrides config)
   MERGESTORM_API_URL   API base (default ${DEFAULT_API})
 `);
 }
-/** Best-effort open a URL in the user's browser; silent if no opener exists. */
-function openBrowser(url) {
-    const os = platform();
-    const cmd = os === "darwin" ? "open" : os === "win32" ? "cmd" : "xdg-open";
-    const args = os === "win32" ? ["/c", "start", "", url] : [url];
-    try {
-        const child = spawn(cmd, args, { stdio: "ignore", detached: true });
-        child.on("error", () => { });
-        child.unref();
-    }
-    catch {
-        // no-op — the URL is printed for manual open
-    }
-}
-async function devicePost(base, route, json) {
-    const res = await fetch(`${base}${route}`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(json),
-    });
-    const text = await res.text();
-    let parsed = text;
-    try {
-        parsed = JSON.parse(text);
-    }
-    catch {
-        // keep text
-    }
-    return { status: res.status, body: parsed };
+async function runCommand(cmd, args) {
+    if (cmd === "login")
+        return cmdLogin(args);
+    if (cmd === "logout")
+        return cmdLogout();
+    if (cmd === "review")
+        return cmdReview(args);
+    if (cmd === "status") {
+        if (!args[0])
+            throw new CommandError("usage: mergestorm status <job_id>");
+        return cmdStatus(args[0], { format: "json" });
+    }
+    if (cmd === "credits" || cmd === "usage")
+        return cmdCredits(args);
+    if (cmd === "jobs")
+        return cmdJobs(args);
+    if (cmd === "branches" || cmd === "chains")
+        return cmdBranches(args);
+    if (cmd === "chain")
+        return cmdChain(args);
+    if (cmd === "whoami")
+        return cmdWhoami(args);
+    if (cmd === "thread") {
+        if (!args[0])
+            throw new CommandError("usage: mergestorm thread <slug>");
+        return cmdThread(args[0], args.slice(1));
+    }
+    if (cmd === "shell")
+        return runShell();
+    usage();
+    throw new CommandError(`unknown command: ${cmd}`);
 }
-async function cmdLoginWithKey() {
-    const rl = createInterface({ input, output });
-    try {
-        const key = (await rl.question("Paste your MergeStorm API key (msk_live_...): ")).trim();
-        if (!key.startsWith("msk_live_")) {
-            console.error("Key should start with msk_live_");
-            process.exitCode = 1;
+async function main() {
+    const [, , cmd, ...args] = process.argv;
+    if (!cmd) {
+        if (input.isTTY && output.isTTY) {
+            await runShell();
             return;
         }
-        const cfg = await loadConfig();
-        cfg.apiKey = key;
-        await saveConfig(cfg);
-        console.log(`Saved to ${configPath()}`);
-    }
-    finally {
-        rl.close();
-    }
-}
-async function cmdLogin(args) {
-    printBanner();
-    if (args.includes("--key")) {
-        await cmdLoginWithKey();
-        return;
-    }
-    const cfg = await loadConfig();
-    const base = apiBase(cfg);
-    let start;
-    try {
-        start = await devicePost(base, "/api/v1/cli/device", {});
-    }
-    catch {
-        console.error("Could not start device login. The API may be unreachable or misconfigured.\n" +
-            "Run `mergestorm login --key` to paste an existing API key instead.");
-        process.exitCode = 1;
-        return;
-    }
-    if (start.status !== 200 || !start.body?.device_code) {
-        console.error(`Could not start device login (HTTP ${start.status}). The API may be unreachable or misconfigured.\n` +
-            `Run \`mergestorm login --key\` to paste an existing API key instead.`);
-        process.exitCode = 1;
+        usage();
         return;
     }
-    const { device_code, user_code, verification_uri, verification_uri_complete, interval, expires_in, } = start.body;
-    const openUrl = verification_uri_complete || verification_uri;
-    console.log("To sign in, open this URL and confirm the code:\n");
-    console.log(`  ${openUrl}`);
-    console.log(`\n  Code: ${user_code}\n`);
-    openBrowser(openUrl);
-    console.log("Waiting for approval…");
-    const pollMs = Math.max((interval || 5), 2) * 1000;
-    const deadline = Date.now() + (expires_in || 600) * 1000;
-    while (Date.now() < deadline) {
-        await new Promise((r) => setTimeout(r, pollMs));
-        let poll;
-        try {
-            poll = await devicePost(base, "/api/v1/cli/device/token", { device_code });
-        }
-        catch {
-            console.error("\nLogin failed: network error. Check your connection and run `mergestorm login` again.");
-            process.exitCode = 1;
-            return;
-        }
-        if (poll.status === 200 && poll.body?.api_key) {
-            const next = await loadConfig();
-            next.apiKey = poll.body.api_key;
-            await saveConfig(next);
-            console.log(`\nLogged in. Key saved to ${configPath()}`);
-            return;
-        }
-        const err = poll.body?.error;
-        if (err === "authorization_pending") {
-            process.stdout.write(".");
-            continue;
-        }
-        if (err === "key_limit_reached") {
-            console.error("\nYou have reached the max active API keys. Revoke one at https://mergestorm.ai/dashboard/account and try again.");
-            process.exitCode = 1;
-            return;
-        }
-        if (err === "expired_token") {
-            console.error("\nLogin code expired. Run `mergestorm login` again.");
-            process.exitCode = 1;
-            return;
-        }
-        if (err === "already_redeemed") {
-            console.error("\nThis code was already used. Run `mergestorm login` again.");
-            process.exitCode = 1;
-            return;
-        }
-        console.error(`\nLogin failed: ${typeof err === "string" ? err : JSON.stringify(poll.body)}`);
-        process.exitCode = 1;
+    if (cmd === "-h" || cmd === "--help") {
+        usage();
         return;
     }
-    console.error("\nLogin timed out. Run `mergestorm login` again.");
-    process.exitCode = 1;
-}
-async function cmdLogout() {
     try {
-        await rm(configPath(), { force: true });
-        console.log("Logged out. Removed stored API key.");
+        await runCommand(cmd, args);
     }
     catch (err) {
-        console.error("Could not remove config:", err instanceof Error ? err.message : err);
-        process.exitCode = 1;
-    }
-}
-async function cmdReview(args) {
-    const base = args[0] || "main";
-    const head = args[1] || "HEAD";
-    const cfg = await loadConfig();
-    console.log(`Collecting diff ${base}...${head} …`);
-    const diff = git(["diff", `${base}...${head}`]);
-    if (!diff.trim()) {
-        console.log("No changes to review.");
-        return;
-    }
-    const files = await collectChangedFiles(base, head);
-    const context_files = await collectContextFiles(process.cwd());
-    const branch = git(["rev-parse", "--abbrev-ref", "HEAD"]).trim() || "local";
-    const thread = `local/${branch}`.replace(/[^a-zA-Z0-9._/-]/g, "-").slice(0, 120);
-    console.log(`Submitting review (${Buffer.byteLength(diff, "utf8")} byte diff, ${files.length} file(s), ${context_files.length} context file(s))…`);
-    const { status, body } = await apiFetch(cfg, "/api/v1/reviews", {
-        method: "POST",
-        json: {
-            thread,
-            base_label: base,
-            head_label: head,
-            diff,
-            files,
-            context_files,
-        },
-    });
-    if (status === 402) {
-        console.error("Monthly review limit reached. Upgrade at https://mergestorm.ai/billing");
-        process.exitCode = 1;
-        return;
-    }
-    if (status !== 202 && status !== 200) {
-        console.error("Failed:", JSON.stringify(body, null, 2));
-        process.exitCode = 1;
-        return;
-    }
-    const job = body;
-    console.log(`Job ${job.job_id} (${job.status}). Waiting…`);
-    for (let i = 0; i < 90; i += 1) {
-        await new Promise((r) => setTimeout(r, 2000));
-        const poll = await apiFetch(cfg, `/api/v1/reviews/${job.job_id}`);
-        if (poll.status !== 200) {
-            console.error("\nPoll failed:", JSON.stringify(poll.body, null, 2));
-            process.exitCode = 1;
+        if (err instanceof CommandError) {
+            console.error(err.message);
+            process.exitCode = err.exitCode;
             return;
         }
-        const row = poll.body;
-        if (row.status === "queued" || row.status === "in_progress") {
-            process.stdout.write(".");
-            continue;
-        }
-        console.log("");
-        if (row.status === "failed" || row.status === "quota_exceeded") {
-            console.error(`Review ${row.status}: ${row.error ?? ""}`);
-            process.exitCode = 1;
-            return;
-        }
-        console.log(`\nVerdict: ${row.verdict ?? "comment"}`);
-        console.log(row.summary ?? "");
-        const inline = row.findings?.inline ?? [];
-        const off = row.findings?.off_diff ?? row.findings?.offDiff ?? [];
-        for (const c of inline) {
-            console.log(`\n[${c.severity}] ${c.path}:${c.line}${c.title ? ` — ${c.title}` : ""}`);
-            console.log(c.body);
-        }
-        for (const c of off) {
-            console.log(`\n[${c.severity}] off-diff ${c.path ?? ""}`);
-            console.log(c.body);
-        }
-        if (inline.length === 0 && off.length === 0) {
-            console.log("\nNo findings.");
-        }
-        return;
-    }
-    console.error("\nTimed out waiting for review. Check: mergestorm status " + job.job_id);
-    process.exitCode = 1;
-}
-async function cmdStatus(jobId) {
-    const cfg = await loadConfig();
-    const { status, body } = await apiFetch(cfg, `/api/v1/reviews/${jobId}`);
-    if (status !== 200) {
-        console.error(JSON.stringify(body, null, 2));
+        console.error(err instanceof Error ? err.message : err);
         process.exitCode = 1;
-        return;
-    }
-    console.log(JSON.stringify(body, null, 2));
-}
-async function main() {
-    const [, , cmd, ...args] = process.argv;
-    if (!cmd || cmd === "-h" || cmd === "--help") {
-        usage();
-        return;
-    }
-    if (cmd === "login")
-        return cmdLogin(args);
-    if (cmd === "logout")
-        return cmdLogout();
-    if (cmd === "review")
-        return cmdReview(args);
-    if (cmd === "status") {
-        if (!args[0]) {
-            console.error("usage: mergestorm status <job_id>");
-            process.exitCode = 1;
-            return;
-        }
-        return cmdStatus(args[0]);
     }
-    usage();
-    process.exitCode = 1;
 }
 main().catch((err) => {
-    console.error(err instanceof Error ? err.message : err);
+    console.error(ansi.red(err instanceof Error ? err.message : String(err)));
     process.exitCode = 1;
 });

package/dist/commands/branches.d.ts

@@ -0,0 +1,10 @@
+import { type ThreadListItem } from "../api.js";
+/** One-line label for a branch/thread row (also used by tests). */
+export declare function formatBranchRow(item: ThreadListItem): string;
+/** Interactive list of recently reviewed branches → open chain on select. */
+export declare function cmdBranches(args?: string[]): Promise<void>;
+/**
+ * Show the review-chain timeline for a branch/thread.
+ * Defaults to `local/<current-git-branch>` when no slug is given.
+ */
+export declare function cmdChain(args?: string[]): Promise<void>;

package/dist/commands/branches.js

@@ -0,0 +1,85 @@
+import { stdin as input, stdout as output } from "node:process";
+import { listThreads } from "../api.js";
+import { loadConfig } from "../config.js";
+import { CommandError } from "../errors.js";
+import { git } from "../git.js";
+import { ansi } from "../ui/ansi.js";
+import { selectFromList } from "../ui/select.js";
+import { cmdThread, relativeWhen } from "./jobs.js";
+/** One-line label for a branch/thread row (also used by tests). */
+export function formatBranchRow(item) {
+    const name = (item.branch?.trim() || item.slug).slice(0, 36);
+    const jobs = `${item.job_count} job${item.job_count === 1 ? "" : "s"}`;
+    const verdict = item.last_verdict ?? "-";
+    const when = relativeWhen(item.last_activity_at);
+    const pr = item.owner && item.repo && item.pr_number != null
+        ? `  PR #${item.pr_number}`
+        : "";
+    const closed = item.status === "closed" ? "  closed" : "";
+    return `${name.padEnd(36)}  ${jobs.padEnd(8)}  ${verdict.padEnd(12)}  ${when}${pr}${closed}`;
+}
+function printBranchTable(items) {
+    const header = ["BRANCH / SLUG", "JOBS", "VERDICT", "WHEN", "PR"];
+    const rows = items.map((t) => [
+        (t.branch?.trim() || t.slug).slice(0, 36),
+        String(t.job_count),
+        t.last_verdict ?? "-",
+        relativeWhen(t.last_activity_at),
+        t.pr_number != null ? `#${t.pr_number}` : "-",
+    ]);
+    const widths = header.map((h, i) => Math.max(h.length, ...rows.map((r) => r[i]?.length ?? 0)));
+    const fmt = (cols) => "  " + cols.map((c, i) => c.padEnd(widths[i])).join("  ");
+    console.log(ansi.dim(fmt(header)));
+    for (const r of rows)
+        console.log(fmt(r));
+    console.log(ansi.dim("  open a chain:  chain <slug>   ·   or re-run on a TTY to pick"));
+}
+/** Interactive list of recently reviewed branches → open chain on select. */
+export async function cmdBranches(args = []) {
+    const asJson = args.includes("--json");
+    const nArg = args.find((a) => /^\d+$/.test(a));
+    const limit = nArg ? Number.parseInt(nArg, 10) : 20;
+    const cfg = await loadConfig();
+    const items = await listThreads(limit, cfg);
+    if (asJson) {
+        console.log(JSON.stringify({ items }, null, 2));
+        return;
+    }
+    if (items.length === 0) {
+        console.log(ansi.dim("  No reviewed branches yet. Run `review` on a branch first."));
+        return;
+    }
+    if (!input.isTTY || !output.isTTY) {
+        printBranchTable(items);
+        return;
+    }
+    const picked = await selectFromList({
+        title: "Recently reviewed branches",
+        items,
+        render: (item) => formatBranchRow(item),
+    });
+    if (!picked) {
+        console.log(ansi.dim("  cancelled"));
+        return;
+    }
+    await cmdThread(picked.slug, []);
+}
+/**
+ * Show the review-chain timeline for a branch/thread.
+ * Defaults to `local/<current-git-branch>` when no slug is given.
+ */
+export async function cmdChain(args = []) {
+    const asJson = args.includes("--json");
+    const positional = args.filter((a) => a !== "--json");
+    let slug = positional[0]?.trim() ?? "";
+    if (!slug) {
+        try {
+            const branch = git(["rev-parse", "--abbrev-ref", "HEAD"]).trim() || "local";
+            slug = `local/${branch}`.replace(/[^a-zA-Z0-9._/-]/g, "-").slice(0, 120);
+        }
+        catch {
+            throw new CommandError("usage: chain <slug>   (or run inside a git repo to use the current branch)");
+        }
+    }
+    await cmdThread(slug, asJson ? ["--json"] : []);
+}

package/dist/commands/credits.d.ts

@@ -0,0 +1 @@
+export declare function cmdCredits(args: string[]): Promise<void>;

package/dist/commands/credits.js

@@ -0,0 +1,28 @@
+import { getMe } from "../api.js";
+import { loadConfig } from "../config.js";
+import { CommandError } from "../errors.js";
+import { ansi } from "../ui/ansi.js";
+import { formatResetLabel, usageBar } from "../ui/usage.js";
+export async function cmdCredits(args) {
+    const asJson = args.includes("--json");
+    const cfg = await loadConfig();
+    const me = await getMe(cfg);
+    if (!me) {
+        throw new CommandError("Credits are not available (not logged in, offline, or API too old). " +
+            "Try `mergestorm login` or open https://mergestorm.ai/billing");
+    }
+    if (asJson) {
+        console.log(JSON.stringify({ usage: me.usage, resets_at: me.resets_at ?? null }, null, 2));
+        return;
+    }
+    const s = me.usage.standard;
+    const p = me.usage.premium;
+    // Claude Usage tab layout: label → long bar + "N% used" → Resets line.
+    console.log(`  ${ansi.bold("Standard")}`);
+    console.log(`  ${usageBar(s.used, s.limit)}`);
+    console.log("");
+    console.log(`  ${ansi.bold("Premium")}`);
+    console.log(`  ${usageBar(p.used, p.limit)}`);
+    console.log("");
+    console.log(`  ${ansi.dim(formatResetLabel(me.resets_at))}`);
+}

package/dist/commands/jobs.d.ts

@@ -0,0 +1,6 @@
+import { type ThreadDetail } from "../api.js";
+export declare function relativeWhen(iso: string): string;
+export declare function cmdJobs(args: string[]): Promise<void>;
+/** Numbered chain timeline for a thread (branch/PR meta when present). */
+export declare function formatThreadTimeline(data: ThreadDetail): string[];
+export declare function cmdThread(slug: string, args?: string[]): Promise<void>;