mergestorm 0.1.0 → 0.2.0

package/dist/commands/jobs.js

@@ -0,0 +1,69 @@
+import { apiFetch, listJobs } from "../api.js";
+import { loadConfig } from "../config.js";
+import { CommandError } from "../errors.js";
+import { ansi } from "../ui/ansi.js";
+function relativeWhen(iso) {
+    const t = new Date(iso).getTime();
+    if (Number.isNaN(t))
+        return "—";
+    const sec = Math.max(0, Math.floor((Date.now() - t) / 1000));
+    if (sec < 60)
+        return `${sec}s ago`;
+    const min = Math.floor(sec / 60);
+    if (min < 60)
+        return `${min}m ago`;
+    const hr = Math.floor(min / 60);
+    if (hr < 48)
+        return `${hr}h ago`;
+    const days = Math.floor(hr / 24);
+    return `${days}d ago`;
+}
+export async function cmdJobs(args) {
+    const asJson = args.includes("--json");
+    const nArg = args.find((a) => /^\d+$/.test(a));
+    const limit = nArg ? Number.parseInt(nArg, 10) : 10;
+    const cfg = await loadConfig();
+    const items = await listJobs(limit, cfg);
+    if (asJson) {
+        console.log(JSON.stringify({ items }, null, 2));
+        return;
+    }
+    if (items.length === 0) {
+        console.log(ansi.dim("  No review jobs yet. Run `review` to submit one."));
+        return;
+    }
+    const header = ["JOB", "STATUS", "VERDICT", "THREAD", "WHEN"];
+    const rows = items.map((j) => [
+        j.job_id.slice(0, 8),
+        j.status,
+        j.verdict ?? "-",
+        (j.thread_slug ?? "-").slice(0, 20),
+        relativeWhen(j.created_at),
+    ]);
+    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("  full history: https://mergestorm.ai/dashboard/api"));
+}
+export async function cmdThread(slug, args = []) {
+    const asJson = args.includes("--json");
+    const cfg = await loadConfig();
+    const { status, body } = await apiFetch(cfg, `/api/v1/threads/${encodeURIComponent(slug)}`);
+    if (status === 404) {
+        throw new CommandError(`Thread not found: ${slug}`);
+    }
+    if (status !== 200) {
+        throw new CommandError(`Failed to load thread (HTTP ${status}): ${JSON.stringify(body)}`);
+    }
+    if (asJson) {
+        console.log(JSON.stringify(body, null, 2));
+        return;
+    }
+    const data = body;
+    console.log(`  Thread ${ansi.bold(data.slug)} · ${data.job_count} job(s)`);
+    for (const j of data.jobs ?? []) {
+        console.log(`  ${j.job_id.slice(0, 8)}  ${j.status.padEnd(12)}  ${(j.verdict ?? "-").padEnd(16)}  ${relativeWhen(j.created_at)}`);
+    }
+}

package/dist/commands/login.d.ts

@@ -0,0 +1,2 @@
+import { Interface } from "node:readline/promises";
+export declare function cmdLogin(args: string[], rl?: Interface): Promise<void>;

package/dist/commands/login.js

@@ -0,0 +1,101 @@
+import { spawn } from "node:child_process";
+import { platform } from "node:os";
+import { createInterface } from "node:readline/promises";
+import { stdin as input, stdout as output } from "node:process";
+import { apiBase, configPath, loadConfig, saveConfig } from "../config.js";
+import { devicePost } from "../api.js";
+import { CommandError } from "../errors.js";
+import { ansi } from "../ui/ansi.js";
+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 {
+        // URL is printed for manual open
+    }
+}
+async function loginWithKey(existingRl) {
+    const rl = existingRl ?? createInterface({ input, output });
+    const ownRl = !existingRl;
+    try {
+        const key = (await rl.question("Paste your MergeStorm API key (msk_live_...): ")).trim();
+        if (!key.startsWith("msk_live_")) {
+            throw new CommandError("Key should start with msk_live_");
+        }
+        const cfg = await loadConfig();
+        cfg.apiKey = key;
+        await saveConfig(cfg);
+        console.log(`Saved to ${configPath()}`);
+    }
+    finally {
+        if (ownRl)
+            rl.close();
+    }
+}
+export async function cmdLogin(args, rl) {
+    if (args.includes("--key")) {
+        await loginWithKey(rl);
+        return;
+    }
+    const cfg = await loadConfig();
+    const base = apiBase(cfg);
+    let start;
+    try {
+        start = await devicePost(base, "/api/v1/cli/device", {});
+    }
+    catch {
+        throw new CommandError("Could not start device login. The API may be unreachable or misconfigured.\n" +
+            "Run `mergestorm login --key` to paste an existing API key instead.");
+    }
+    if (start.status !== 200 || !start.body?.device_code) {
+        throw new CommandError(`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.`);
+    }
+    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(`  ${ansi.green(openUrl)}`);
+    console.log(`\n  Code: ${ansi.bold(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 {
+            throw new CommandError("Login failed: network error. Check your connection and run `mergestorm login` again.");
+        }
+        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") {
+            throw new CommandError("You have reached the max active API keys. Revoke one at https://mergestorm.ai/dashboard/api and try again.");
+        }
+        if (err === "expired_token") {
+            throw new CommandError("Login code expired. Run `mergestorm login` again.");
+        }
+        if (err === "already_redeemed") {
+            throw new CommandError("This code was already used. Run `mergestorm login` again.");
+        }
+        throw new CommandError(`Login failed: ${typeof err === "string" ? err : JSON.stringify(poll.body)}`);
+    }
+    throw new CommandError("Login timed out. Run `mergestorm login` again.");
+}

package/dist/commands/logout.d.ts

@@ -0,0 +1 @@
+export declare function cmdLogout(): Promise<void>;

package/dist/commands/logout.js

@@ -0,0 +1,11 @@
+import { clearConfig } from "../config.js";
+import { CommandError } from "../errors.js";
+export async function cmdLogout() {
+    try {
+        await clearConfig();
+        console.log("Logged out. Removed stored API key.");
+    }
+    catch (err) {
+        throw new CommandError(`Could not remove config: ${err instanceof Error ? err.message : String(err)}`);
+    }
+}

package/dist/commands/review.d.ts

@@ -0,0 +1,6 @@
+export type ReviewOptions = {
+    signal?: AbortSignal;
+    /** When true, show Ctrl+C detach hint during poll. */
+    interactive?: boolean;
+};
+export declare function cmdReview(args: string[], opts?: ReviewOptions): Promise<void>;

package/dist/commands/review.js

@@ -0,0 +1,109 @@
+import { apiFetch, getMe } from "../api.js";
+import { loadConfig } from "../config.js";
+import { CommandError, DetachedError } from "../errors.js";
+import { collectChangedFiles, collectContextFiles, git } from "../git.js";
+import { ansi } from "../ui/ansi.js";
+function sleep(ms, signal) {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(Object.assign(new Error("Aborted"), { name: "AbortError" }));
+            return;
+        }
+        const t = setTimeout(resolve, ms);
+        const onAbort = () => {
+            clearTimeout(t);
+            reject(Object.assign(new Error("Aborted"), { name: "AbortError" }));
+        };
+        signal?.addEventListener("abort", onAbort, { once: true });
+    });
+}
+export async function cmdReview(args, opts = {}) {
+    const base = args[0] || "main";
+    const head = args[1] || "HEAD";
+    const cfg = await loadConfig();
+    const meBefore = opts.interactive ? await getMe(cfg) : null;
+    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,
+        },
+        signal: opts.signal,
+    });
+    if (status === 402) {
+        throw new CommandError("Monthly review limit reached. Upgrade at https://mergestorm.ai/billing");
+    }
+    if (status !== 202 && status !== 200) {
+        throw new CommandError(`Failed: ${JSON.stringify(body, null, 2)}`);
+    }
+    const job = body;
+    const waitHint = opts.interactive
+        ? ` Waiting… (${ansi.dim("ctrl+c to detach — job keeps running")})`
+        : " Waiting…";
+    console.log(`Job ${job.job_id} (${job.status}).${waitHint}`);
+    try {
+        for (let i = 0; i < 90; i += 1) {
+            await sleep(2000, opts.signal);
+            const poll = await apiFetch(cfg, `/api/v1/reviews/${job.job_id}`, { signal: opts.signal });
+            if (poll.status !== 200) {
+                throw new CommandError(`Poll failed: ${JSON.stringify(poll.body, null, 2)}`);
+            }
+            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") {
+                throw new CommandError(`Review ${row.status}: ${row.error ?? ""}`);
+            }
+            console.log(`\nVerdict: ${ansi.bold(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.");
+            }
+            if (opts.interactive && meBefore) {
+                const meAfter = await getMe(cfg);
+                if (meAfter) {
+                    const used = Math.max(0, meBefore.usage.standard.remaining - meAfter.usage.standard.remaining);
+                    if (used > 0) {
+                        console.log(ansi.dim(`\n${used} credit${used === 1 ? "" : "s"} used · ${meAfter.usage.standard.remaining} remaining`));
+                    }
+                }
+            }
+            return;
+        }
+    }
+    catch (err) {
+        if (opts.interactive && err instanceof Error && err.name === "AbortError") {
+            throw new DetachedError(job.job_id);
+        }
+        throw err;
+    }
+    throw new CommandError(`Timed out waiting for review. Check: mergestorm status ${job.job_id}`);
+}

package/dist/commands/status.d.ts

@@ -0,0 +1,5 @@
+export type StatusOptions = {
+    format?: "json" | "pretty";
+    signal?: AbortSignal;
+};
+export declare function cmdStatus(jobId: string, opts?: StatusOptions): Promise<void>;

package/dist/commands/status.js

@@ -0,0 +1,39 @@
+import { apiFetch } from "../api.js";
+import { loadConfig } from "../config.js";
+import { CommandError } from "../errors.js";
+import { ansi } from "../ui/ansi.js";
+export async function cmdStatus(jobId, opts = {}) {
+    const format = opts.format ?? "json";
+    const cfg = await loadConfig();
+    const { status, body } = await apiFetch(cfg, `/api/v1/reviews/${jobId}`, {
+        signal: opts.signal,
+    });
+    if (status !== 200) {
+        throw new CommandError(JSON.stringify(body, null, 2));
+    }
+    if (format === "json") {
+        console.log(JSON.stringify(body, null, 2));
+        return;
+    }
+    const row = body;
+    console.log(`Status:  ${row.status}`);
+    if (row.verdict)
+        console.log(`Verdict: ${ansi.bold(row.verdict)}`);
+    if (row.summary)
+        console.log(row.summary);
+    if (row.error)
+        console.log(ansi.red(`Error: ${row.error}`));
+    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 && row.status === "completed") {
+        console.log("\nNo findings.");
+    }
+}

package/dist/commands/whoami.d.ts

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

package/dist/commands/whoami.js

@@ -0,0 +1,35 @@
+import { getMe } from "../api.js";
+import { apiBase, configPath, loadConfig, resolveApiKey, keyDisplay } from "../config.js";
+import { CommandError } from "../errors.js";
+import { ansi } from "../ui/ansi.js";
+export async function cmdWhoami(args) {
+    const asJson = args.includes("--json");
+    const cfg = await loadConfig();
+    const key = resolveApiKey(cfg);
+    if (!key) {
+        throw new CommandError("Not logged in. Run `mergestorm login`.");
+    }
+    const me = await getMe(cfg);
+    const payload = {
+        key_prefix: me?.key.prefix ?? keyDisplay(key),
+        key_name: me?.key.name ?? null,
+        plan_key: me?.plan_key ?? null,
+        plan_label_key: me?.plan_label_key ?? null,
+        api_base: apiBase(cfg),
+        config_path: configPath(),
+        usage: me?.usage ?? null,
+    };
+    if (asJson) {
+        console.log(JSON.stringify(payload, null, 2));
+        return;
+    }
+    console.log(`  Key      ${ansi.bold(String(payload.key_prefix))}${payload.key_name ? ` (${payload.key_name})` : ""}`);
+    if (payload.plan_key) {
+        console.log(`  Plan     ${payload.plan_label_key ?? payload.plan_key}`);
+    }
+    console.log(`  API      ${payload.api_base}`);
+    console.log(`  Config   ${payload.config_path}`);
+    if (!me) {
+        console.log(ansi.dim("  (live account details unavailable — older API or offline)"));
+    }
+}

package/dist/config.d.ts

@@ -0,0 +1,13 @@
+export declare const DEFAULT_API = "https://api.mergestorm.ai";
+export type Config = {
+    apiKey?: string;
+    apiBase?: string;
+};
+export declare function configPath(): string;
+export declare function loadConfig(): Promise<Config>;
+export declare function saveConfig(cfg: Config): Promise<void>;
+export declare function clearConfig(): Promise<void>;
+export declare function apiBase(cfg: Config): string;
+export declare function resolveApiKey(cfg: Config): string | undefined;
+/** Short display form of a stored key (prefix only). */
+export declare function keyDisplay(key: string | undefined): string | null;

package/dist/config.js

@@ -0,0 +1,41 @@
+import { mkdir, readFile, writeFile, rm } from "node:fs/promises";
+import { homedir } from "node:os";
+import path from "node:path";
+export const DEFAULT_API = "https://api.mergestorm.ai";
+export function configPath() {
+    return path.join(homedir(), ".mergestorm", "config.json");
+}
+export async function loadConfig() {
+    try {
+        const raw = await readFile(configPath(), "utf8");
+        return JSON.parse(raw);
+    }
+    catch {
+        return {};
+    }
+}
+export 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,
+    });
+}
+export async function clearConfig() {
+    await rm(configPath(), { force: true });
+}
+export function apiBase(cfg) {
+    return (process.env.MERGESTORM_API_URL?.trim() || cfg.apiBase || DEFAULT_API).replace(/\/$/, "");
+}
+export function resolveApiKey(cfg) {
+    return process.env.MERGESTORM_API_KEY?.trim() || cfg.apiKey;
+}
+/** Short display form of a stored key (prefix only). */
+export function keyDisplay(key) {
+    if (!key)
+        return null;
+    if (key.length <= 16)
+        return key;
+    return `${key.slice(0, 12)}…`;
+}

package/dist/errors.d.ts

@@ -0,0 +1,10 @@
+/** Thrown by command handlers; one-shot mode maps `exitCode` onto process.exitCode. */
+export declare class CommandError extends Error {
+    readonly exitCode: number;
+    constructor(message: string, exitCode?: number);
+}
+/** Review/status poll aborted by Ctrl+C — shell returns to the prompt. */
+export declare class DetachedError extends Error {
+    readonly jobId: string;
+    constructor(jobId: string);
+}

package/dist/errors.js

@@ -0,0 +1,18 @@
+/** Thrown by command handlers; one-shot mode maps `exitCode` onto process.exitCode. */
+export class CommandError extends Error {
+    exitCode;
+    constructor(message, exitCode = 1) {
+        super(message);
+        this.name = "CommandError";
+        this.exitCode = exitCode;
+    }
+}
+/** Review/status poll aborted by Ctrl+C — shell returns to the prompt. */
+export class DetachedError extends Error {
+    jobId;
+    constructor(jobId) {
+        super(`detached — check later with: status ${jobId}`);
+        this.name = "DetachedError";
+        this.jobId = jobId;
+    }
+}

package/dist/git.d.ts

@@ -0,0 +1,9 @@
+export declare function git(args: string[], cwd?: string): string;
+export declare function collectContextFiles(root: string): Promise<{
+    path: string;
+    content: string;
+}[]>;
+export declare function collectChangedFiles(base: string, head: string): Promise<{
+    path: string;
+    content: string;
+}[]>;

package/dist/git.js

@@ -0,0 +1,66 @@
+import { spawnSync } from "node:child_process";
+import { readdir, readFile, stat } from "node:fs/promises";
+import path from "node:path";
+const CONTEXT_DIR = ".mergestorm";
+export function git(args, cwd = process.cwd()) {
+    try {
+        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;
+    }
+    catch (err) {
+        throw new Error(`git ${args.join(" ")} failed: ${err instanceof Error ? err.message : String(err)}`);
+    }
+}
+export 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;
+}
+export 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;
+}

package/dist/shell.d.ts

@@ -0,0 +1 @@
+export declare function runShell(): Promise<void>;