mergestorm 0.3.63 → 0.3.66

package/dist/commands/login.js

@@ -2,8 +2,8 @@ import { spawn } from "node:child_process";
 import { platform } from "node:os";
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import path from "node:path";
-import { apiBase, configPath, loadConfig, mergestormHome, saveConfig, } from "../config.js";
-import { devicePost, getMe } from "../api.js";
+import { accountNameFromMe, apiBase, configFor, configPath, mergestormHome, provisionalAccountName, readStore, saveAccount, } from "../config.js";
+import { accountLabel, devicePost, getMe, revokeOwnKey } from "../api.js";
 import { CommandError } from "../errors.js";
 import { ansi } from "../ui/ansi.js";
 import { present } from "../ui/present.js";
@@ -40,6 +40,33 @@ export async function validateApiKey(cfg) {
         throw err;
     }
 }
+async function loginConfig() {
+    const store = await readStore();
+    return configFor(store, store.activeAccount);
+}
+export function loggedInLine(account) {
+    const label = accountLabel(account);
+    return label ? `Logged in as ${label}.` : "Logged in.";
+}
+async function storeLogin(cfg, me, opts) {
+    const apiKey = cfg.apiKey ?? "";
+    const name = accountNameFromMe(me) ?? provisionalAccountName(apiKey);
+    const before = await readStore();
+    const replaced = Object.hasOwn(before.accounts, name) ? configFor(before, name) : undefined;
+    try {
+        await saveAccount(name, { apiKey, apiBase: cfg.apiBase }, { activate: true });
+    }
+    catch (err) {
+        if (opts.minted && err instanceof CommandError && err.code === "account_limit") {
+            await revokeOwnKey(cfg, { timeoutMs: 8_000 });
+        }
+        throw err;
+    }
+    if (replaced?.apiKey && replaced.apiKey !== apiKey) {
+        await revokeOwnKey({ ...replaced, ignoreEnv: true }, { timeoutMs: 8_000 });
+    }
+    return name;
+}
 async function loginWithKey() {
     // Always use muted secret input on TTY so the key never lands in
     // question()/history echo.
@@ -47,12 +74,12 @@ async function loginWithKey() {
     if (!key.startsWith("msk_live_")) {
         throw new CommandError("Key should start with msk_live_");
     }
-    const cfg = await loadConfig();
-    cfg.apiKey = key;
-    const me = await validateApiKey(cfg);
-    await saveConfig(cfg);
+    const cfg = await loginConfig();
+    const candidate = { apiKey: key, apiBase: apiBase(cfg), ignoreEnv: true };
+    const me = await validateApiKey(candidate);
+    const name = await storeLogin(candidate, me, { minted: false });
     const prefix = me.key?.prefix?.trim() || "msk_live_…";
-    await present("Login", [`  Verified ${prefix}… · saved to ${configPath()}`]);
+    await present("Login", [`  Logged in as ${name}. Verified ${prefix}… · saved to ${configPath()}`]);
 }
 export function pendingLoginPath() {
     return path.join(mergestormHome(), "login-pending.json");
@@ -140,12 +167,21 @@ async function pollDeviceLogin(pending, retryCommand, recovery) {
             throw new CommandError(`Login failed: network error. Check your connection and run \`${retryCommand}\` again.`);
         }
         if (poll.status === 200 && poll.body?.api_key) {
-            const next = await loadConfig();
-            next.apiKey = poll.body.api_key;
-            next.apiBase = pending.apiBase;
-            await saveConfig(next);
+            const minted = { apiKey: poll.body.api_key, apiBase: pending.apiBase, ignoreEnv: true };
             await clearPendingLogin(pending.deviceCode);
-            await present("Login", [`  Logged in. Key saved to ${configPath()}`]);
+            let me = accountLabel(poll.body?.account)
+                ? { account: poll.body.account }
+                : null;
+            if (!me) {
+                try {
+                    me = await getMe(minted, { timeoutMs: 8_000 });
+                }
+                catch {
+                    me = null;
+                }
+            }
+            const name = await storeLogin(minted, me, { minted: true });
+            await present("Login", [`  Logged in as ${name}. Key saved to ${configPath()}`]);
             return;
         }
         const err = poll.body?.error;
@@ -177,7 +213,7 @@ async function pollDeviceLogin(pending, retryCommand, recovery) {
     throw new CommandError(`Login timed out. ${recovery}`);
 }
 async function loginStart() {
-    const cfg = await loadConfig();
+    const cfg = await loginConfig();
     const base = apiBase(cfg);
     const pending = pendingFromStart(base, await startDeviceLogin(base));
     await savePendingLogin(pending);
@@ -213,7 +249,7 @@ export async function cmdLogin(args, deps = { openBrowser }) {
         await loginFinish();
         return;
     }
-    const cfg = await loadConfig();
+    const cfg = await loginConfig();
     const base = apiBase(cfg);
     const pending = pendingFromStart(base, await startDeviceLogin(base));
     console.log("To sign in, open this URL and confirm the code:\n");

package/dist/commands/logout.js

@@ -1,12 +1,11 @@
-import { clearConfig } from "../config.js";
+import { loadConfig } from "../config.js";
 import { CommandError } from "../errors.js";
 import { present } from "../ui/present.js";
+import { logoutAccount } from "./account.js";
 export async function cmdLogout() {
-    try {
-        await clearConfig();
-        await present("Logout", ["  Logged out. Removed stored API key."]);
-    }
-    catch (err) {
-        throw new CommandError(`Could not remove config: ${err instanceof Error ? err.message : String(err)}`);
+    const cfg = await loadConfig();
+    if (!cfg.account) {
+        throw new CommandError("Not logged in. Nothing to log out of.");
     }
+    await present("Logout", await logoutAccount(cfg.account));
 }

package/dist/commands/memory.d.ts

@@ -0,0 +1,29 @@
+import { type Config } from "../config.js";
+import { deleteMemory, getMemoryMode, listMemories, saveMemory, searchMemories, setMemoryMode, updateMemory, type MemoryItem, type MemoryKind, type MemoryScope } from "../memory-api.js";
+type Flags = {
+    positional: string[];
+    json: boolean;
+    keepBoth?: boolean;
+    repo?: string;
+    kind?: MemoryKind;
+    scope?: MemoryScope;
+    limit?: number;
+};
+export declare function parseMemoryFlags(args: string[], allowed: ReadonlyArray<"repo" | "kind" | "scope" | "limit" | "keep-both">): Flags;
+export declare function formatMemoryLine(memory: MemoryItem): string;
+export type MemoryDeps = {
+    loadConfig?: () => Promise<Config>;
+    chatId?: string | null;
+    print?: (line: string) => void;
+    api?: Partial<{
+        listMemories: typeof listMemories;
+        searchMemories: typeof searchMemories;
+        saveMemory: typeof saveMemory;
+        updateMemory: typeof updateMemory;
+        deleteMemory: typeof deleteMemory;
+        getMemoryMode: typeof getMemoryMode;
+        setMemoryMode: typeof setMemoryMode;
+    }>;
+};
+export declare function cmdMemory(args: string[], deps?: MemoryDeps): Promise<void>;
+export {};

package/dist/commands/memory.js

@@ -0,0 +1,154 @@
+import { loadConfig } from "../config.js";
+import { CommandError, REVIEW_EXIT } from "../errors.js";
+import { MEMORY_KINDS, MEMORY_SEARCH_LIMIT_MAX, deleteMemory, getMemoryMode, isMemoryKind, isMemoryMode, isMemoryScope, listMemories, memoryChatId, saveMemory, searchMemories, setMemoryMode, updateMemory, } from "../memory-api.js";
+const MEMORY_USAGE = [
+    "usage: mergestorm memory list [--scope user|repo] [--repo <owner/repo>] [--kind <kind>] [--json]",
+    "       mergestorm memory search <query> [--repo <owner/repo>] [--limit <1-20>] [--json]",
+    "       mergestorm memory add <text> --kind <kind> [--repo <owner/repo>] [--keep-both] [--json]",
+    "       mergestorm memory update <id> <text> [--kind <kind>] [--json]",
+    "       mergestorm memory delete <id> [--json]",
+    "       mergestorm memory mode [off|on_request|all] [--json]",
+    `  kind is one of ${MEMORY_KINDS.join(", ")}. With --repo a memory is about that repository, otherwise about you.`,
+    "  add refuses text close to a memory you have; update that memory, or add again with --keep-both when they are different things.",
+    "  search covers your memories, and with --repo that repository's memories and standing rules too.",
+    "  Inside a Breeze chat (MERGESTORM_CHAT_ID), add and search follow that chat's memory setting.",
+].join("\n");
+const REPO = /^[A-Za-z0-9](?:[A-Za-z0-9-]{0,38})\/[A-Za-z0-9._-]{1,100}$/;
+function usage(message) {
+    return new CommandError(message ? `${message}\n${MEMORY_USAGE}` : MEMORY_USAGE, REVIEW_EXIT.usage, "usage");
+}
+export function parseMemoryFlags(args, allowed) {
+    const flags = { positional: [], json: false };
+    const value = (flag, raw) => {
+        if (raw === undefined || raw.startsWith("--"))
+            throw usage(`${flag} needs a value`);
+        return raw.trim();
+    };
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        const name = arg.startsWith("--") ? arg.slice(2) : null;
+        if (arg === "--json")
+            flags.json = true;
+        else if (name === "keep-both" && allowed.includes("keep-both"))
+            flags.keepBoth = true;
+        else if (name === "repo" && allowed.includes("repo")) {
+            const repo = value(arg, args[++i]).replace(/^https?:\/\/github\.com\//i, "").replace(/\.git$/i, "");
+            if (!REPO.test(repo))
+                throw usage("--repo needs <owner/repo>");
+            flags.repo = repo.toLowerCase();
+        }
+        else if (name === "kind" && allowed.includes("kind")) {
+            const kind = value(arg, args[++i]);
+            if (!isMemoryKind(kind))
+                throw usage(`--kind is one of ${MEMORY_KINDS.join(", ")}`);
+            flags.kind = kind;
+        }
+        else if (name === "scope" && allowed.includes("scope")) {
+            const scope = value(arg, args[++i]);
+            if (!isMemoryScope(scope))
+                throw usage("--scope is user or repo");
+            flags.scope = scope;
+        }
+        else if (name === "limit" && allowed.includes("limit")) {
+            const limit = Number(value(arg, args[++i]));
+            if (!Number.isInteger(limit) || limit < 1 || limit > MEMORY_SEARCH_LIMIT_MAX)
+                throw usage(`--limit is a whole number from 1 to ${MEMORY_SEARCH_LIMIT_MAX}`);
+            flags.limit = limit;
+        }
+        else if (arg.startsWith("--"))
+            throw usage(`unknown argument ${arg}`);
+        else
+            flags.positional.push(arg);
+    }
+    return flags;
+}
+export function formatMemoryLine(memory) {
+    const where = memory.repo ? `${memory.kind}, ${memory.repo}` : memory.kind;
+    return `${memory.id}  (${where}) ${memory.text}`;
+}
+export async function cmdMemory(args, deps = {}) {
+    const print = deps.print ?? ((line) => console.log(line));
+    const api = { listMemories, searchMemories, saveMemory, updateMemory, deleteMemory, getMemoryMode, setMemoryMode, ...deps.api };
+    const sub = args[0]?.toLowerCase();
+    const rest = args.slice(1);
+    if (!sub || sub === "-h" || sub === "--help" || sub === "help" || rest.some((arg) => arg === "-h" || arg === "--help")) {
+        print(MEMORY_USAGE);
+        return;
+    }
+    const config = () => (deps.loadConfig ?? loadConfig)();
+    const chatId = deps.chatId === undefined ? memoryChatId() : deps.chatId;
+    const emit = (json, data, lines) => {
+        if (json)
+            print(JSON.stringify(data, null, 2));
+        else
+            for (const line of lines())
+                print(line);
+    };
+    if (sub === "list" || sub === "ls") {
+        const flags = parseMemoryFlags(rest, ["repo", "kind", "scope"]);
+        if (flags.positional.length > 0)
+            throw usage(`unexpected argument ${flags.positional[0]}`);
+        const listed = await api.listMemories({ ...(flags.scope ? { scope: flags.scope } : {}), ...(flags.repo ? { repo: flags.repo } : {}), ...(flags.kind ? { kind: flags.kind } : {}) }, await config());
+        emit(flags.json, listed, () => [
+            `Memory is ${listed.memory_mode}. ${listed.items.length === 1 ? "1 memory" : `${listed.items.length} memories`}.`,
+            ...listed.items.map(formatMemoryLine),
+        ]);
+        return;
+    }
+    if (sub === "search") {
+        const flags = parseMemoryFlags(rest, ["repo", "limit"]);
+        const query = flags.positional.join(" ").trim();
+        if (!query)
+            throw usage("search needs a query");
+        const found = await api.searchMemories({ query, ...(flags.repo ? { repo: flags.repo } : {}), ...(flags.limit ? { limit: flags.limit } : {}), chatId }, await config());
+        emit(flags.json, found, () => {
+            if (found.memory_mode === "off")
+                return ["Memory is off, so nothing was searched."];
+            const all = [...found.rules, ...found.items];
+            return all.length === 0 ? ["Nothing in memory matches."] : all.map(formatMemoryLine);
+        });
+        return;
+    }
+    if (sub === "add" || sub === "save" || sub === "remember") {
+        const flags = parseMemoryFlags(rest, ["repo", "kind", "keep-both"]);
+        const text = flags.positional.join(" ").trim();
+        if (!text)
+            throw usage("add needs the text to remember");
+        if (!flags.kind)
+            throw usage(`add needs --kind (${MEMORY_KINDS.join(", ")})`);
+        const saved = await api.saveMemory({ text, kind: flags.kind, ...(flags.repo ? { repo: flags.repo } : {}), chatId, ...(flags.keepBoth ? { keepBoth: true } : {}) }, await config());
+        emit(flags.json, saved, () => [saved.merged ? `Memory ${saved.id} already says this.` : `Saved to memory as ${saved.id}.`]);
+        return;
+    }
+    if (sub === "update" || sub === "edit") {
+        const flags = parseMemoryFlags(rest, ["kind"]);
+        const [id, ...words] = flags.positional;
+        const text = words.join(" ").trim();
+        if (!id || !text)
+            throw usage("update needs a memory id and the new text");
+        const updated = await api.updateMemory(id, { text, ...(flags.kind ? { kind: flags.kind } : {}) }, await config());
+        emit(flags.json, updated, () => [`Memory ${updated.id} updated.`]);
+        return;
+    }
+    if (sub === "delete" || sub === "rm" || sub === "forget") {
+        const flags = parseMemoryFlags(rest, []);
+        const [id, extra] = flags.positional;
+        if (!id || extra !== undefined)
+            throw usage("delete needs one memory id");
+        const deleted = await api.deleteMemory(id, await config());
+        emit(flags.json, deleted, () => [`Memory ${deleted.id} deleted.`]);
+        return;
+    }
+    if (sub === "mode") {
+        const flags = parseMemoryFlags(rest, []);
+        const [mode, extra] = flags.positional;
+        if (extra !== undefined)
+            throw usage(`unexpected argument ${extra}`);
+        if (mode !== undefined && !isMemoryMode(mode))
+            throw usage("mode is off, on_request or all");
+        const result = mode === undefined ? await api.getMemoryMode(await config()) : await api.setMemoryMode(mode, await config());
+        emit(flags.json, result, () => [`Memory is ${result.memory_mode}.`]);
+        return;
+    }
+    throw usage(`unknown memory subcommand: ${sub}`);
+}

package/dist/commands/registry.d.ts

@@ -3,6 +3,7 @@ import type { CommandSpec } from "../ui/prompt.js";
 export type CommandContext = {
     mode: "oneshot" | "shell";
     signal?: AbortSignal;
+    account?: string;
     /** Shell: refresh banner after login/logout. */
     afterAuth?: () => Promise<void>;
 };

package/dist/commands/registry.js

@@ -1,5 +1,6 @@
-import { DEFAULT_API } from "../config.js";
+import { DEFAULT_API, splitAccountFlag, withAccount } from "../config.js";
 import { CommandError } from "../errors.js";
+import { cmdAccount } from "./account.js";
 import { cmdBranches, cmdChain } from "./branches.js";
 import { canBrowse, openTabsBrowser } from "./browse.js";
 import { cmdCredits } from "./credits.js";
@@ -8,6 +9,7 @@ import { cmdIssue } from "./issue.js";
 import { cmdJobs, cmdThread } from "./jobs.js";
 import { cmdLogin } from "./login.js";
 import { cmdLogout } from "./logout.js";
+import { cmdMemory } from "./memory.js";
 import { cmdQueue } from "./queue.js";
 import { cmdPr } from "./pr.js";
 import { cmdReview } from "./review.js";
@@ -23,9 +25,9 @@ import { cmdWhoami } from "./whoami.js";
 export const COMMAND_REGISTRY = [
     {
         name: "login",
-        summary: "Sign in via browser (or paste a key)",
+        summary: "Sign in via browser (or paste a key); adds an account, up to 3",
         usage: [
-            "mergestorm login                Sign in via browser and store an API key",
+            "mergestorm login                Sign in via browser and add the account (up to 3 saved)",
             "mergestorm login --start        Print a sign-in URL and code, then exit (agents)",
             "mergestorm login --finish       Store the API key once the code from --start is approved",
             "mergestorm login --key          Paste an existing API key instead (headless/CI)",
@@ -38,14 +40,28 @@ export const COMMAND_REGISTRY = [
     },
     {
         name: "logout",
-        summary: "Remove the stored API key",
-        usage: ["mergestorm logout               Remove the stored API key"],
+        summary: "Log out of the active account and revoke its key",
+        usage: ["mergestorm logout               Log out of the active account (or --account <name>) and revoke its key"],
         async run(_args, ctx) {
             await cmdLogout();
             if (ctx.afterAuth)
                 await ctx.afterAuth();
         },
     },
+    {
+        name: "account",
+        summary: "Saved accounts: list, use <name>, remove <name>",
+        usage: [
+            "mergestorm account list [--json]  Saved accounts (up to 3), the active one marked",
+            "mergestorm account use <name>   Make <name> the active account",
+            "mergestorm account remove <name>  Log out of <name> and revoke its key",
+        ],
+        async run(args, ctx) {
+            await cmdAccount(args);
+            if (ctx.afterAuth)
+                await ctx.afterAuth();
+        },
+    },
     {
         name: "review",
         summary: "Review git diff (default origin/HEAD or main or master)",
@@ -101,11 +117,15 @@ export const COMMAND_REGISTRY = [
     },
     {
         name: "issue",
-        summary: "Open a GitHub issue through Mergestorm, no gh needed",
+        summary: "Open a GitHub issue through Mergestorm and wait for its Vortex review",
         usage: [
-            "mergestorm issue create --title <title> [--body <text> | --body-file <path>] [--label <name>]… [--repo <owner/repo>] [--json]",
+            "mergestorm issue create --title <title> [--body <text> | --body-file <path>] [--label <name>]… [--repo <owner/repo>] [--wait [--timeout <s>]] [--json]",
             "  Opens the issue as the Surge App; needs write access on GitHub, uses existing labels only",
             "  The same title again returns the open issue it already made when it is among the newest 100 open issues; an older one, or two calls at once, can still create a duplicate",
+            "  --wait then waits for the Vortex issue review, like issue wait",
+            "mergestorm issue wait <n> [--repo <owner/repo>] [--timeout <s>] [--json]",
+            "  Waits for the Vortex issue review (default 900s); exits 0 once approved or when issue reviews are off",
+            "  Exits 4 with the points to answer: reply in a comment on the issue, wait again, and open the PR only after approval",
         ],
         async run(args) {
             await cmdIssue(args);
@@ -185,7 +205,7 @@ export const COMMAND_REGISTRY = [
     {
         name: "whoami",
         summary: "Key + plan (Status tab on a TTY)",
-        usage: ["mergestorm whoami [--json]      Key + plan + API base"],
+        usage: ["mergestorm whoami [--json]      Account + key + plan + API base"],
         async run(args, ctx) {
             await cmdWhoami(args, { mode: ctx.mode });
         },
@@ -200,10 +220,12 @@ export const COMMAND_REGISTRY = [
             "  [--cyclone-skip-ci on|off]",
             "  [--cyclone-patch-unverified on|off]  Patch languages we cannot typecheck",
             "  [--vortex-seam on|off] [--vortex-skip-all-clear on|off]",
+            "  [--issue-review on|off]  Account default for Vortex issue reviews; --repo overrides it per repository",
             "  [--auto-land on|off]  Auto land default for new stacks",
             "  [--auto-land-settle <seconds>]  How long Auto land waits before queueing (15-300, default 60)",
             "  [--merge-queue-batch on|off]  Test several queued pull requests on one CI run",
-            "  [--merge-queue-batch-size <n>]  Most pull requests per batch (2-8, default 4)",
+            "  [--merge-queue-batch-size <n>]  Most pull requests per batch (2-10, default 4)",
+            "  [--merge-queue-overdrive on|off]  Account default: batch up to 10 queued pull requests; --repo overrides it per repository",
             "  [--ignore-bot add <login>|remove <login>|clear]",
             "  [--vortex-skip-check none|neutral] [--vortex-findings failure|neutral|success]",
             "  [--cyclone-fail-check failure|neutral]",
@@ -217,6 +239,21 @@ export const COMMAND_REGISTRY = [
             await cmdSettings(args, { mode: ctx.mode });
         },
     },
+    {
+        name: "memory",
+        summary: "Your memories: list, search, add, update, delete, mode",
+        usage: [
+            "mergestorm memory list [--scope user|repo] [--repo <owner/repo>] [--kind <kind>] [--json]",
+            "mergestorm memory search <query> [--repo <owner/repo>] [--limit <1-20>] [--json]",
+            "mergestorm memory add <text> --kind rule|style|preference|fact|project [--repo <owner/repo>] [--keep-both] [--json]",
+            "mergestorm memory update <id> <text> [--kind <kind>] [--json]",
+            "mergestorm memory delete <id> [--json]",
+            "mergestorm memory mode [off|on_request|all] [--json]  Read or set whether Breeze remembers",
+        ],
+        async run(args) {
+            await cmdMemory(args);
+        },
+    },
     {
         name: "skill",
         summary: "Install Mergestorm skills for Claude, Cursor, or agents",
@@ -331,9 +368,12 @@ export function formatUsageBody() {
     return `${cmdLines}
 
   mg is a short alias for mergestorm (same binary).
+  --account <name> before or after any command runs it as that saved account
+  without changing the active one; MERGESTORM_ACCOUNT=<name> does the same.
 
 Env:
-  MERGESTORM_API_KEY   API key (overrides config)
+  MERGESTORM_API_KEY   API key (overrides every saved account)
+  MERGESTORM_ACCOUNT   Saved account to run as (default: the active one)
   MERGESTORM_API_URL   API base (default ${DEFAULT_API})
   MERGESTORM_HOME      State directory for login and stack state (default ~/.mergestorm)
 `;
@@ -349,6 +389,7 @@ export async function dispatchCommand(name, args, ctx) {
     // `shell` as a subcommand is oneshot-only.
     if (cmd.name === "shell" && ctx.mode === "shell")
         return false;
-    await cmd.run(args, ctx);
+    const split = splitAccountFlag(args);
+    await withAccount(split.account ?? ctx.account, () => cmd.run(split.args, ctx));
     return true;
 }

package/dist/commands/review-client.d.ts

@@ -10,10 +10,8 @@ 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;
-export declare const MAX_CONTEXT_TEXT_CHARS = 60000;
 export declare const MAX_CONTEXT_FILES = 10;
 export declare const MAX_CONTEXT_FILE_CHARS = 16000;
-export declare const MAX_CONTEXT_FILES_TOTAL = 60000;
 export declare const MAX_IDEMPOTENCY_KEY_CHARS = 128;
 export type ReviewInput = {
     thread: string;
@@ -57,7 +55,6 @@ 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

@@ -13,10 +13,10 @@ 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}$/;
-export const MAX_CONTEXT_TEXT_CHARS = 60_000;
+const MAX_CONTEXT_TEXT_CHARS = 60_000;
 export const MAX_CONTEXT_FILES = 10;
 export const MAX_CONTEXT_FILE_CHARS = 16_000;
-export const MAX_CONTEXT_FILES_TOTAL = 60_000;
+const MAX_CONTEXT_FILES_TOTAL = 60_000;
 export const MAX_IDEMPOTENCY_KEY_CHARS = 128;
 export async function collectReviewInput(base, head, cwd = process.cwd(), sandboxRoot) {
     let diff;
@@ -129,7 +129,7 @@ export async function loadReviewContext(opts) {
 }
 const REPLAYED_JOB_RESUBMIT_STATUSES = ["failed", "quota_exceeded"];
 const MAX_REPLAYED_JOB_RESUBMITS = 5;
-export function reviewIdempotencyKey(input, opts = {}, afterJobId = null) {
+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,

package/dist/commands/review.d.ts

@@ -10,7 +10,7 @@ export declare const VORTEX_ROUTER_CAPS: {
 /**
  * Pinnable L0 lanes only. Keep this list byte-identical to
  * `pinnableVortexSpecialistIds(VORTEX_SPECIALIST_IDS)` in review-findings
- * (`cli-lockstep.test.ts`). Do not add `governance` (round-gated) or `seam`
+ * (`index.test.ts`). Do not add `governance` (round-gated) or `seam`
  * (phase-gated). Those L1 lanes are not local pins.
  */
 export declare const VORTEX_SPECIALIST_IDS: readonly ["security", "performance", "architecture", "tests", "data", "api", "frontend"];

package/dist/commands/review.js

@@ -16,7 +16,7 @@ export const VORTEX_ROUTER_CAPS = { standard: 3, max: 5 };
 /**
  * Pinnable L0 lanes only. Keep this list byte-identical to
  * `pinnableVortexSpecialistIds(VORTEX_SPECIALIST_IDS)` in review-findings
- * (`cli-lockstep.test.ts`). Do not add `governance` (round-gated) or `seam`
+ * (`index.test.ts`). Do not add `governance` (round-gated) or `seam`
  * (phase-gated). Those L1 lanes are not local pins.
  */
 export const VORTEX_SPECIALIST_IDS = [

package/dist/commands/settings.d.ts

@@ -1,16 +1,16 @@
-import { type RepoSettings, type RepoSettingsPatch, type SettingsPatch, type SettingsResponse } from "../api.js";
+import { type RepoSettingsPatch, type SettingsPatch, type SettingsResponse } from "../api.js";
 /**
  * CLI flag → Bearer settings key. Boolean flags take on|off. The connected flags are
  * read-only on the API and deliberately have no flag here.
  */
-export declare const SETTINGS_FLAGS: Record<string, "auto_review_enabled" | "auto_patch_enabled" | "auto_resolve_conflicts_enabled" | "auto_fix_ci_enabled" | "vortex_show_thinking_traces" | "repo_overview_enabled" | "cyclone_skip_ci_enabled" | "cyclone_patch_unverified_languages" | "vortex_auto_overflow_enabled" | "vortex_skip_all_clear_comments" | "vortex_seam_specialist_enabled" | "auto_land_default" | "auto_land_settle_seconds" | "merge_queue_batch_enabled" | "merge_queue_batch_size" | "ignored_bot_logins" | "vortex_bot_skip_check" | "vortex_findings_check" | "cyclone_patch_failure_check">;
+export declare const SETTINGS_FLAGS: Record<string, "auto_review_enabled" | "auto_patch_enabled" | "auto_resolve_conflicts_enabled" | "auto_fix_ci_enabled" | "vortex_show_thinking_traces" | "repo_overview_enabled" | "cyclone_skip_ci_enabled" | "cyclone_patch_unverified_languages" | "vortex_auto_overflow_enabled" | "vortex_skip_all_clear_comments" | "vortex_seam_specialist_enabled" | "issue_review_enabled" | "auto_land_default" | "auto_land_settle_seconds" | "merge_queue_batch_enabled" | "merge_queue_batch_size" | "merge_queue_lands_alone_paths" | "merge_queue_overdrive" | "ignored_bot_logins" | "vortex_bot_skip_check" | "vortex_findings_check" | "cyclone_patch_failure_check">;
 type IgnoreBotOperation = {
     action: "add" | "remove";
     login: string;
 } | {
     action: "clear";
 };
-export type RepoSettingsScope = {
+type RepoSettingsScope = {
     owner: string;
     repo: string;
     patch: RepoSettingsPatch;
@@ -22,7 +22,6 @@ export type SettingsArgs = {
     repo?: RepoSettingsScope;
     listRepos?: boolean;
 };
-export declare function formatRepoSettingsLines(repos: readonly RepoSettings[]): string[];
 /** Parse boolean and enum flags plus ordered ignore-list operations. */
 export declare function parseSettingsArgs(rawArgs: string[]): SettingsArgs;
 /** Static printout includes the Config toggles plus enum and login settings. */

package/dist/commands/settings.js

@@ -14,7 +14,26 @@ const REPO_FLAG_LABELS = {
     auto_patch_enabled: "Auto patch",
     auto_review_enabled: "Auto review",
     auto_land_default: "Auto land (new stacks)",
+    merge_queue_batch_enabled: "Merge queue batching",
+    merge_queue_batch_size: "Merge queue batch size (pull requests)",
+    merge_queue_lands_alone_paths: "Merge queue lands-alone paths",
+    merge_queue_overdrive: "Merge queue overdrive",
+    issue_review_enabled: "Vortex issue reviews",
 };
+function parsePathsFlagValue(flag, value, defaults) {
+    if (value === undefined || value === "" || value.startsWith("--")) {
+        throw new CommandError(`${flag} takes a comma-separated list of path patterns, default, or none.`, 2, "usage");
+    }
+    if (value === "default")
+        return [...defaults];
+    if (value === "none")
+        return [];
+    const paths = [...new Set(value.split(",").map((entry) => entry.trim()).filter((entry) => entry !== ""))];
+    if (paths.length === 0 || paths.some((entry) => /\s/.test(entry))) {
+        throw new CommandError(`${flag} takes a comma-separated list of path patterns, default, or none.`, 2, "usage");
+    }
+    return paths;
+}
 function parseRepoSlug(raw) {
     const match = /^([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)$/.exec(raw ?? "");
     if (!match)
@@ -61,20 +80,43 @@ function parseRepoSettingsArgs(slug, args) {
             throw new CommandError(`Unknown settings flag: ${flag}. See \`mergestorm --help\`.`, 2, "usage");
         }
         if (!REPO_SETTINGS_KEYS.includes(key)) {
-            throw new CommandError(`${flag} is an account setting. With --repo only --auto-patch, --auto-review and --auto-land can be set.`, 2, "usage");
+            throw new CommandError(`${flag} is an account setting. With --repo only --auto-patch, --auto-review, --auto-land, --merge-queue-batch, --merge-queue-batch-size, --merge-queue-lands-alone, --merge-queue-overdrive and --issue-review can be set.`, 2, "usage");
         }
         const value = eq >= 0 ? arg.slice(eq + 1) : args[++i];
-        if (value !== "on" && value !== "off" && value !== "inherit") {
+        const row = BEARER_SETTINGS.find((row) => row.key === key);
+        if (value === "inherit") {
+            scope.patch[key] = null;
+            continue;
+        }
+        if ("kind" in row && row.kind === "count") {
+            const amount = value !== undefined && /^\d+$/.test(value) ? Number(value) : Number.NaN;
+            if (!Number.isInteger(amount) || amount < row.min || amount > row.max) {
+                throw new CommandError(`${flag} takes a whole number from ${row.min} through ${row.max}, or inherit, with --repo.`, 2, "usage");
+            }
+            scope.patch.merge_queue_batch_size = amount;
+            continue;
+        }
+        if ("kind" in row && row.kind === "paths") {
+            scope.patch.merge_queue_lands_alone_paths = parsePathsFlagValue(flag, value, row.defaults);
+            continue;
+        }
+        if (value !== "on" && value !== "off") {
             throw new CommandError(`${flag} takes on, off or inherit with --repo.`, 2, "usage");
         }
-        scope.patch[key] = value === "inherit" ? null : value === "on";
+        scope.patch[key] = value === "on";
     }
     return { json, patch: {}, repo: scope };
 }
 function repoSettingWords(value) {
-    return value === null ? "inherit (follows the account)" : value ? "on" : "off";
+    if (value === null)
+        return "inherit (follows the account)";
+    if (Array.isArray(value))
+        return value.length === 0 ? "(none)" : value.join(", ");
+    if (typeof value === "number")
+        return String(value);
+    return value ? "on" : "off";
 }
-export function formatRepoSettingsLines(repos) {
+function formatRepoSettingsLines(repos) {
     if (repos.length === 0)
         return ["  No repositories are connected to this account."];
     const width = Math.max(...Object.values(REPO_FLAG_LABELS).map((label) => label.length));
@@ -149,6 +191,10 @@ export function parseSettingsArgs(rawArgs) {
         }
         const value = eq >= 0 ? arg.slice(eq + 1) : args[++i];
         const row = BEARER_SETTINGS.find((row) => row.key === key);
+        if ("kind" in row && row.kind === "paths") {
+            Object.assign(patch, { [key]: parsePathsFlagValue(flag, value, row.defaults) });
+            continue;
+        }
         if ("kind" in row && row.kind === "logins") {
             if (value === "clear")
                 ignoreBots.push({ action: "clear" });