mergestorm 0.3.63 → 0.3.66

package/dist/cli.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import { stdin as input, stdout as output } from "node:process";
+import { splitAccountFlag, withAccount } from "./config.js";
 import { CommandError } from "./errors.js";
 import { dispatchCommand, formatUsageBody, } from "./commands/registry.js";
 import { isSupportedNode, unsupportedNodeMessage, } from "./node-version.js";
@@ -17,37 +18,38 @@ function usage() {
 ${formatUsageBody()}
 `);
 }
-async function runCommand(cmd, args) {
+async function runCommand(cmd, args, account) {
     if (cmd === "help" || cmd === "?") {
         usage();
         return;
     }
-    const ok = await dispatchCommand(cmd, args, { mode: "oneshot" });
+    const ok = await dispatchCommand(cmd, args, { mode: "oneshot", account });
     if (!ok) {
         usage();
         throw new CommandError(`unknown command: ${cmd}`);
     }
 }
 async function main() {
-    const [, , cmd, ...args] = process.argv;
-    if (!cmd) {
-        if (input.isTTY && output.isTTY) {
-            await runShell();
+    try {
+        const { account, args: argv } = splitAccountFlag(process.argv.slice(2));
+        const [cmd, ...args] = argv;
+        if (!cmd) {
+            if (input.isTTY && output.isTTY) {
+                await withAccount(account, () => runShell());
+                return;
+            }
+            usage();
             return;
         }
-        usage();
-        return;
-    }
-    if (cmd === "-h" || cmd === "--help" || cmd === "help" || cmd === "?") {
-        usage();
-        return;
-    }
-    if (cmd === "-v" || cmd === "--version" || cmd === "version") {
-        console.log(cliVersion());
-        return;
-    }
-    try {
-        await runCommand(cmd, args);
+        if (cmd === "-h" || cmd === "--help" || cmd === "help" || cmd === "?") {
+            usage();
+            return;
+        }
+        if (cmd === "-v" || cmd === "--version" || cmd === "version") {
+            console.log(cliVersion());
+            return;
+        }
+        await runCommand(cmd, args, account);
     }
     catch (err) {
         if (err instanceof CommandError) {

package/dist/client/index.d.ts

@@ -1,6 +1,6 @@
-export { DEFAULT_API, apiBase, clearConfig, configPath, keyDisplay, loadConfig, mergestormHome, resolveApiKey, saveConfig, type Config, } from "../config.js";
+export { ACCOUNT_LIMIT, DEFAULT_API, accountNameFromMe, apiBase, configPath, keyDisplay, listAccounts, loadConfig, mergestormHome, removeAccount, resolveApiKey, saveAccount, settleAccountName, splitAccountFlag, useAccount, withAccount, type AccountSummary, type Config, type StoredAccount, } from "../config.js";
 export { BEARER_SETTINGS, BEARER_BOOLEAN_SETTINGS_KEYS, BEARER_SETTINGS_FLAGS, BEARER_SETTINGS_KEYS, BEARER_SETTINGS_LABELS, type BearerSettingsKey, } from "../automation-catalog.js";
-export { API_TIMEOUT_PREFIX, DEFAULT_API_TIMEOUT_MS, SETTINGS_WRITABLE_KEYS, adoptStack, apiFetch, cancelMergeQueueEntry, devicePost, dismissPrFindings, dismissThreadsLine, enqueueStack, ensureUpperPark, getEnrichedStack, getMe, getPrVortexReview, getReview, getSettings, listRepoSettings, patchRepoSettings, REPO_SETTINGS_KEYS, getStackPublication, landNextStack, listJobs, listMergeQueueEntries, listStacks, listThreads, openStackIssue, parseRetryAfterSeconds, patchSettings, restackStack, setStackPolicy, stackPolicyBody, submitStackPublication, type ApiFetchInit, type ApiFetchResult, type JobListItem, type MeResponse, type MergeQueueBounceDetail, type MergeQueueBounceKind, type MergeQueueEnqueuedBy, type MergeQueueEnqueuedVia, type MergeQueueEntryDto, type MergeQueueEntryState, type PrDismissedFinding, type PrFindingDismissInput, type PrFindingDismissOutcome, type PrFindingDismissResult, type PrReviewFinding, type PrReviewFindings, type PrVortexReview, type SettingsPatch, type RepoSettings, type RepoSettingsKey, type RepoSettingsPatch, type SettingsResponse, type StackDto, type StackPolicyPatch, type StackPublication, type StackPublicationRequest, type StackPublicationStatus, type ThreadDetail, type ThreadListItem, } from "../api.js";
+export { API_TIMEOUT_PREFIX, DEFAULT_API_TIMEOUT_MS, SETTINGS_WRITABLE_KEYS, adoptStack, accountLabel, apiFetch, cancelMergeQueueEntry, devicePost, dismissPrFindings, dismissThreadsLine, enqueueStack, ensureUpperPark, getEnrichedStack, getIssueReview, ISSUE_REVIEW_DEFAULT_TIMEOUT_MS, ISSUE_REVIEW_POLL_INTERVAL_MS, ISSUE_REVIEW_STATES, IssueReviewTimeoutError, issueNotApprovedError, issueNotApprovedRefusal, issueReviewLines, parseIssueReviewStatus, pollIssueReview, type IssueReviewPoint, type IssueReviewState, type IssueReviewStatus, type IssueReviewTarget, type PollIssueReviewOptions, getMe, getPrVortexReview, revokeOwnKey, getReview, getSettings, listRepoSettings, patchRepoSettings, REPO_SETTINGS_KEYS, getStackPublication, landNextStack, listJobs, listMergeQueueEntries, listStacks, listThreads, openStackIssue, parseRetryAfterSeconds, patchSettings, restackStack, setStackPolicy, stackPolicyBody, submitStackPublication, type ApiFetchInit, type ApiFetchResult, type JobListItem, type AccountIdentity, type MeResponse, type MergeQueueBounceDetail, type MergeQueueBounceKind, type MergeQueueEnqueuedBy, type MergeQueueEnqueuedVia, type MergeQueueEntryDto, type MergeQueueEntryState, type PrDismissedFinding, type PrFindingDismissInput, type PrFindingDismissOutcome, type PrFindingDismissResult, type PrReviewFinding, type PrReviewFindings, type PrVortexReview, type SettingsPatch, type RepoSettings, type RepoSettingsKey, type RepoSettingsPatch, type SettingsResponse, type StackDto, type StackPolicyPatch, type StackPublication, type StackPublicationRequest, type StackPublicationStatus, type ThreadDetail, type ThreadListItem, } from "../api.js";
 export { CommandError, DetachedError, RATE_LIMITED_HINT, REVIEW_EXIT, isCommandErrorCode, rateLimitedMessage, type CommandErrorCode, type CommandErrorExtras, } from "../errors.js";
 export { REVIEW_POLL_BACKOFF_MS, REVIEW_POLL_DEFAULT_TIMEOUT_MS, REVIEW_POLL_INTERVAL_MS, REVIEW_POLL_MAX_INTERVAL_MS, REVIEW_POLL_MAX_TRANSIENT_RETRIES, REVIEW_POLL_STRETCH_AFTER_MS, REVIEW_POLL_STRETCH_SPAN_MS, REVIEW_THREAD_SLUG_RE, PrReviewPollTimeoutError, ReviewPollTimeoutError, noPrReviewYetMessage, collectReviewInput, formatReviewSubmitError, isTransientReviewPollError, isTransientReviewPollStatus, loadReviewContext, pollPrVortexReview, pollReview, stretchedPollIntervalMs, submitReview, transientRetryWaitMs, type PollReviewOptions, type PollPrVortexReviewOptions, type ReviewInput, type SubmitReviewOptions, } from "../commands/review-client.js";
 export { REVIEW_JOB_ENVELOPE_SCHEMA, toReviewJobEnvelope, type ReviewEnvelopeFallbacks, type ReviewJobEnvelope, type ReviewJobRow, } from "../ui/job-envelope.js";
@@ -8,6 +8,8 @@ export { discoverTrunk } from "../git-stack.js";
 export { parseGithubOriginRepo } from "../git.js";
 export { BOUNCE_KIND_LABELS, deriveStackAgentsBusy, mergeQueueBounceLabel, type StackAgentsBusy } from "../stack-dto.js";
 export { STACK_WATCH_SCHEMA, STACK_WATCH_DEFAULT_TIMEOUT_MS, STACK_WATCH_BUSY_RECHECK_S, StackWatchError, StackWatchTimeoutError, pollStackWatch, type PollStackWatchOptions, type StackWatchCursor, type StackWatchEnvelope, } from "../stack-watch.js";
-export { stackBlockers, stackBlockersSummary, sameHead, layerAgents, layerAgentsBusy, conflictLiveParent, stackRepair, agentsCannotClear, autoFixCiActive, autoResolveActive, type StackAgentBusy, type StackBlocker, type StackBusyAgent, type StackHeldBlocker, type StackLandGatePending, type StackLayerAgents, type StackRepairHint, } from "../stack-blockers.js";
+export { BREEZE_BRANCH_PREFIX, stackBlockers, stackBlockersSummary, sameHead, layerAgents, layerAgentsBusy, conflictLiveParent, stackRepair, agentsCannotClear, autoFixCiActive, autoResolveActive, type StackAgentBusy, type StackBlocker, type StackBusyAgent, type StackHeldBlocker, type StackLandGatePending, type StackLayerAgents, type StackRepairHint, } from "../stack-blockers.js";
 export { STACK_WATCH_NOT_DONE_SENTENCE, STACK_WATCH_NOTIFY_PATTERN, stackWatchBackgroundCommand, stackTerminalReason, stackWatchNextArgs, stackWatchObligation, type StackWatchDoneReason, type StackWatchNext, type StackWatchNextArgs, type StackWatchObligation, type StackWatchObligationInput, type StackWatchReason, } from "../stack-watch-obligation.js";
-export { publishBranchServerSide, publishWorkingBranch, workingBranchPublication, type ServerPublishResult, type WorkingBranchInput, } from "../server-publish.js";
+export { READ_ONLY_GIT, publishBranchServerSide, publishWorkingBranch, workingBranchPublication, type GitRead, type ServerPublishDeps, type ServerPublishInput, type ServerPublishResult, type WorkingBranchInput, } from "../server-publish.js";
+export { MEMORY_KINDS, MEMORY_MODES, MEMORY_SCOPES, MEMORY_SEARCH_LIMIT_MAX, deleteMemory, getMemoryMode, listMemories, memoryChatId, saveMemory, searchMemories, setMemoryMode, updateMemory, type MemoryItem, type MemoryKind, type MemoryList, type MemoryMode, type MemoryScope, type MemorySearch, } from "../memory-api.js";
+export { WEB_SEARCH_KINDS, WEB_SEARCH_PAGE_MAX, WEB_SEARCH_RECENCIES, readWebPage, searchWeb, type WebSearchInput, type WebText, } from "../web-api.js";

package/dist/client/index.js

@@ -1,6 +1,6 @@
-export { DEFAULT_API, apiBase, clearConfig, configPath, keyDisplay, loadConfig, mergestormHome, resolveApiKey, saveConfig, } from "../config.js";
+export { ACCOUNT_LIMIT, DEFAULT_API, accountNameFromMe, apiBase, configPath, keyDisplay, listAccounts, loadConfig, mergestormHome, removeAccount, resolveApiKey, saveAccount, settleAccountName, splitAccountFlag, useAccount, withAccount, } from "../config.js";
 export { BEARER_SETTINGS, BEARER_BOOLEAN_SETTINGS_KEYS, BEARER_SETTINGS_FLAGS, BEARER_SETTINGS_KEYS, BEARER_SETTINGS_LABELS, } from "../automation-catalog.js";
-export { API_TIMEOUT_PREFIX, DEFAULT_API_TIMEOUT_MS, SETTINGS_WRITABLE_KEYS, adoptStack, apiFetch, cancelMergeQueueEntry, devicePost, dismissPrFindings, dismissThreadsLine, enqueueStack, ensureUpperPark, getEnrichedStack, getMe, getPrVortexReview, getReview, getSettings, listRepoSettings, patchRepoSettings, REPO_SETTINGS_KEYS, getStackPublication, landNextStack, listJobs, listMergeQueueEntries, listStacks, listThreads, openStackIssue, parseRetryAfterSeconds, patchSettings, restackStack, setStackPolicy, stackPolicyBody, submitStackPublication, } from "../api.js";
+export { API_TIMEOUT_PREFIX, DEFAULT_API_TIMEOUT_MS, SETTINGS_WRITABLE_KEYS, adoptStack, accountLabel, apiFetch, cancelMergeQueueEntry, devicePost, dismissPrFindings, dismissThreadsLine, enqueueStack, ensureUpperPark, getEnrichedStack, getIssueReview, ISSUE_REVIEW_DEFAULT_TIMEOUT_MS, ISSUE_REVIEW_POLL_INTERVAL_MS, ISSUE_REVIEW_STATES, IssueReviewTimeoutError, issueNotApprovedError, issueNotApprovedRefusal, issueReviewLines, parseIssueReviewStatus, pollIssueReview, getMe, getPrVortexReview, revokeOwnKey, getReview, getSettings, listRepoSettings, patchRepoSettings, REPO_SETTINGS_KEYS, getStackPublication, landNextStack, listJobs, listMergeQueueEntries, listStacks, listThreads, openStackIssue, parseRetryAfterSeconds, patchSettings, restackStack, setStackPolicy, stackPolicyBody, submitStackPublication, } from "../api.js";
 export { CommandError, DetachedError, RATE_LIMITED_HINT, REVIEW_EXIT, isCommandErrorCode, rateLimitedMessage, } from "../errors.js";
 export { REVIEW_POLL_BACKOFF_MS, REVIEW_POLL_DEFAULT_TIMEOUT_MS, REVIEW_POLL_INTERVAL_MS, REVIEW_POLL_MAX_INTERVAL_MS, REVIEW_POLL_MAX_TRANSIENT_RETRIES, REVIEW_POLL_STRETCH_AFTER_MS, REVIEW_POLL_STRETCH_SPAN_MS, REVIEW_THREAD_SLUG_RE, PrReviewPollTimeoutError, ReviewPollTimeoutError, noPrReviewYetMessage, collectReviewInput, formatReviewSubmitError, isTransientReviewPollError, isTransientReviewPollStatus, loadReviewContext, pollPrVortexReview, pollReview, stretchedPollIntervalMs, submitReview, transientRetryWaitMs, } from "../commands/review-client.js";
 export { REVIEW_JOB_ENVELOPE_SCHEMA, toReviewJobEnvelope, } from "../ui/job-envelope.js";
@@ -8,6 +8,8 @@ export { discoverTrunk } from "../git-stack.js";
 export { parseGithubOriginRepo } from "../git.js";
 export { BOUNCE_KIND_LABELS, deriveStackAgentsBusy, mergeQueueBounceLabel } from "../stack-dto.js";
 export { STACK_WATCH_SCHEMA, STACK_WATCH_DEFAULT_TIMEOUT_MS, STACK_WATCH_BUSY_RECHECK_S, StackWatchError, StackWatchTimeoutError, pollStackWatch, } from "../stack-watch.js";
-export { stackBlockers, stackBlockersSummary, sameHead, layerAgents, layerAgentsBusy, conflictLiveParent, stackRepair, agentsCannotClear, autoFixCiActive, autoResolveActive, } from "../stack-blockers.js";
+export { BREEZE_BRANCH_PREFIX, stackBlockers, stackBlockersSummary, sameHead, layerAgents, layerAgentsBusy, conflictLiveParent, stackRepair, agentsCannotClear, autoFixCiActive, autoResolveActive, } from "../stack-blockers.js";
 export { STACK_WATCH_NOT_DONE_SENTENCE, STACK_WATCH_NOTIFY_PATTERN, stackWatchBackgroundCommand, stackTerminalReason, stackWatchNextArgs, stackWatchObligation, } from "../stack-watch-obligation.js";
-export { publishBranchServerSide, publishWorkingBranch, workingBranchPublication, } from "../server-publish.js";
+export { READ_ONLY_GIT, publishBranchServerSide, publishWorkingBranch, workingBranchPublication, } from "../server-publish.js";
+export { MEMORY_KINDS, MEMORY_MODES, MEMORY_SCOPES, MEMORY_SEARCH_LIMIT_MAX, deleteMemory, getMemoryMode, listMemories, memoryChatId, saveMemory, searchMemories, setMemoryMode, updateMemory, } from "../memory-api.js";
+export { WEB_SEARCH_KINDS, WEB_SEARCH_PAGE_MAX, WEB_SEARCH_RECENCIES, readWebPage, searchWeb, } from "../web-api.js";

package/dist/commands/account.d.ts

@@ -0,0 +1,3 @@
+export declare const ACCOUNT_USAGE = "usage: mergestorm account list [--json] | use <name> | remove <name>";
+export declare function logoutAccount(name: string): Promise<string[]>;
+export declare function cmdAccount(args: string[]): Promise<void>;

package/dist/commands/account.js

@@ -0,0 +1,75 @@
+import { revokeOwnKey } from "../api.js";
+import { ACCOUNT_LIMIT, apiBase, configFor, listAccounts, readStore, removeAccount, useAccount, } from "../config.js";
+import { CommandError } from "../errors.js";
+import { ansi } from "../ui/ansi.js";
+import { present } from "../ui/present.js";
+export const ACCOUNT_USAGE = "usage: mergestorm account list [--json] | use <name> | remove <name>";
+export async function logoutAccount(name) {
+    const store = await readStore();
+    const cfg = configFor(store, Object.hasOwn(store.accounts, name) ? name : undefined);
+    if (!cfg.account)
+        await removeAccount(name);
+    cfg.apiBase = apiBase(cfg);
+    cfg.ignoreEnv = true;
+    const revoked = await revokeOwnKey(cfg, { timeoutMs: 8_000 });
+    const after = await removeAccount(name);
+    const lines = [
+        revoked
+            ? `  Logged out ${name}. Its API key is revoked.`
+            : `  Logged out ${name}. Its API key could not be revoked; revoke it at https://mergestorm.ai/settings#api if it should not stay valid.`,
+    ];
+    if (after.activeAccount)
+        lines.push(`  Active account: ${after.activeAccount}`);
+    else
+        lines.push("  No accounts left. Run `mergestorm login` to sign in.");
+    return lines;
+}
+async function accountList(asJson) {
+    const accounts = await listAccounts();
+    if (asJson) {
+        console.log(JSON.stringify({ active: accounts.find((a) => a.active)?.name ?? null, limit: ACCOUNT_LIMIT, accounts }, null, 2));
+        return;
+    }
+    if (accounts.length === 0) {
+        await present("Accounts", ["  No accounts. Run `mergestorm login` to sign in."]);
+        return;
+    }
+    const width = Math.max(...accounts.map((a) => a.name.length));
+    const lines = accounts.map((a) => {
+        const mark = a.active ? ansi.brightGreen("●") : ansi.dim("○");
+        const name = a.active ? ansi.bold(a.name.padEnd(width)) : a.name.padEnd(width);
+        return `  ${mark} ${name}  ${ansi.dim(a.keyPrefix)}  ${ansi.dim(a.apiBase)}`;
+    });
+    lines.push("", `  ${ansi.dim(`${accounts.length} of ${ACCOUNT_LIMIT} · account use <name> switches · --account <name> runs one command as another`)}`);
+    await present("Accounts", lines);
+}
+function nameArg(rest, verb) {
+    const name = rest.find((arg) => !arg.startsWith("-"));
+    if (!name) {
+        throw new CommandError(`mergestorm account ${verb} needs an account name.\n${ACCOUNT_USAGE}`, 1, "usage");
+    }
+    return name;
+}
+export async function cmdAccount(args) {
+    const asJson = args.includes("--json");
+    const [sub = "list", ...rest] = args.filter((arg) => arg !== "--json");
+    if (sub === "list") {
+        await accountList(asJson);
+        return;
+    }
+    if (sub === "use") {
+        const name = nameArg(rest, "use");
+        await useAccount(name);
+        await present("Account", [`  Active account: ${name}`]);
+        return;
+    }
+    if (sub === "remove") {
+        await present("Account", await logoutAccount(nameArg(rest, "remove")));
+        return;
+    }
+    if (sub === "--help" || sub === "-h" || sub === "help") {
+        console.log(ACCOUNT_USAGE);
+        return;
+    }
+    throw new CommandError(`unknown account subcommand: ${sub}\n${ACCOUNT_USAGE}`, 1, "usage");
+}

package/dist/commands/browse.d.ts

@@ -7,6 +7,7 @@ export declare function canBrowse(): boolean;
 /** Shared job row mapper for the Usage tab and the static `credits` panel. */
 export declare function toPanelJob(job: JobListItem): UsagePanelJob;
 export type StatusTabInput = {
+    account?: string | null;
     keyPrefix: string;
     keyName: string | null;
     plan: string | null;
@@ -20,19 +21,10 @@ export type StatusTabInput = {
     resetsAt?: string | null;
     now?: Date;
 };
-/** Short chrome note — lives on the hint row, not in the Status body. */
-export declare function statusReachabilityNote(input: Pick<StatusTabInput, "reachable" | "keyInvalid">): string;
 /** Status tab body: whoami + credits from `/me`. Reachability is the footer. */
 export declare function buildStatusTabLines(input: StatusTabInput): string[];
 /** In-place job detail for the Jobs tab (same envelope as `status <id>`). */
 export declare function formatJobDetailLines(row: ReviewJobRow): string[];
-/** Human labels for the Config tab and the static `settings` printout. */
-export declare const SETTINGS_LABELS: Record<"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", string>;
-export declare const STACKS_READY_LABEL = "Stacks, merge queue, Auto land";
-export declare const STACKS_READY_WORDS: {
-    readonly on: "ready";
-    readonly off: "not ready (install Mergestorm Surge)";
-};
 /** Config rows in a stable order: writable toggles, then connected flags. */
 export declare function buildConfigRows(settings: SettingsResponse): TabsConfigRow[];
 /**

package/dist/commands/browse.js

@@ -1,6 +1,6 @@
 import { getMe, getReview, getSettings, listJobs, patchSettings, } from "../api.js";
 import { BEARER_BOOLEAN_SETTINGS_KEYS, BEARER_SETTINGS_LABELS } from "../automation-catalog.js";
-import { apiBase, keyDisplay, loadConfig, resolveApiKey } from "../config.js";
+import { apiBase, keyDisplay, loadConfig, resolveApiKey, settleAccountName } from "../config.js";
 import { CommandError } from "../errors.js";
 import { ansi } from "../ui/ansi.js";
 import { humanSummary } from "../ui/human-summary.js";
@@ -23,7 +23,7 @@ export function toPanelJob(job) {
     };
 }
 /** Short chrome note — lives on the hint row, not in the Status body. */
-export function statusReachabilityNote(input) {
+function statusReachabilityNote(input) {
     if (input.keyInvalid)
         return "key revoked";
     if (!input.reachable)
@@ -50,9 +50,10 @@ function creditsValue(input) {
 }
 /** Status tab body: whoami + credits from `/me`. Reachability is the footer. */
 export function buildStatusTabLines(input) {
-    const lines = [
-        field("Key", `${ansi.bold(input.keyPrefix)}${input.keyName ? ` (${input.keyName})` : ""}`),
-    ];
+    const lines = [];
+    if (input.account)
+        lines.push(field("Account", ansi.bold(input.account)));
+    lines.push(field("Key", `${ansi.bold(input.keyPrefix)}${input.keyName ? ` (${input.keyName})` : ""}`));
     if (input.plan)
         lines.push(field("Plan", input.plan));
     lines.push(field("API", input.apiBase));
@@ -120,9 +121,9 @@ export function formatJobDetailLines(row) {
     return lines;
 }
 /** Human labels for the Config tab and the static `settings` printout. */
-export const SETTINGS_LABELS = BEARER_SETTINGS_LABELS;
-export const STACKS_READY_LABEL = "Stacks, merge queue, Auto land";
-export const STACKS_READY_WORDS = {
+const SETTINGS_LABELS = BEARER_SETTINGS_LABELS;
+const STACKS_READY_LABEL = "Stacks, merge queue, Auto land";
+const STACKS_READY_WORDS = {
     on: "ready",
     off: "not ready (install Mergestorm Surge)",
 };
@@ -219,6 +220,7 @@ export async function openTabsBrowser(initial) {
     }
     const data = {
         statusLines: buildStatusTabLines({
+            account: me ? await settleAccountName(cfg, me) : cfg.account,
             keyPrefix: me?.key.prefix ?? keyDisplay(key) ?? "msk_live_…",
             keyName: me?.key.name ?? null,
             plan: me ? (me.plan_label_key ?? me.plan_key) : null,

package/dist/commands/dismiss.d.ts

@@ -1,12 +1,10 @@
 import { type PrFindingDismissInput, type PrFindingDismissOutcome, type PrFindingDismissResult } from "../api.js";
 import { type Config } from "../config.js";
 import { type StackWatchObligation } from "../stack-watch-obligation.js";
-export declare const DISMISS_USAGE: string;
 export type ParsedDismissArgs = PrFindingDismissInput & {
     json: boolean;
 };
 export declare function parseDismissArgs(args: string[]): ParsedDismissArgs;
-export declare function dismissWatch(result: PrFindingDismissResult): StackWatchObligation | null;
 export declare function formatDismissResult(result: PrFindingDismissResult, watch: StackWatchObligation | null): string;
 export type DismissDeps = {
     loadConfig?: () => Promise<Config>;

package/dist/commands/dismiss.js

@@ -3,7 +3,7 @@ import { loadConfig } from "../config.js";
 import { CommandError, REVIEW_EXIT } from "../errors.js";
 import { stackWatchObligation } from "../stack-watch-obligation.js";
 import { parseAdoptTarget, withWatch } from "./stack.js";
-export const DISMISS_USAGE = [
+const DISMISS_USAGE = [
     "usage: mergestorm dismiss <owner/repo>#<n> --head <sha> --review <id>",
     "         (--finding <id> [--finding <id>…] | --all) --reason <text> [--evidence <url>] [--json]",
     "       mergestorm dismiss <owner/repo>#<n> --head <sha> --review <id> --preview [--json]",
@@ -84,7 +84,7 @@ export function parseDismissArgs(args) {
         json,
     };
 }
-export function dismissWatch(result) {
+function dismissWatch(result) {
     if (!result.stack_id)
         return null;
     return stackWatchObligation({ stackId: result.stack_id, terminal: null, unread: true, freshCursor: true });

package/dist/commands/help.js

@@ -41,9 +41,10 @@ export function buildHelpTabs() {
                 "",
                 rule("Account"),
                 cmd("login", "sign in (--key; agents: --start)"),
-                cmd("whoami", "key · plan · API"),
+                cmd("whoami", "account · key · plan · API"),
+                cmd("account", "list · use <name> · remove <name>"),
                 cmd("settings", "automation toggles · Config tab"),
-                cmd("logout", "forget the stored key"),
+                cmd("logout", "log out of the active account"),
                 cmd("clear / exit", "reprint home · leave the shell"),
             ],
         },

package/dist/commands/issue.d.ts

@@ -1,23 +1,41 @@
-import { openStackIssue } from "../api.js";
+import { openStackIssue, pollIssueReview, type IssueReviewStatus } from "../api.js";
 import { loadConfig } from "../config.js";
 import { parseGithubOriginRepo } from "../git.js";
-export declare const ISSUE_USAGE: string;
+type RepoTarget = {
+    owner: string;
+    repo: string;
+};
 export type ParsedIssueArgs = {
     title: string;
     body: string;
     labels: string[];
-    repo?: {
-        owner: string;
-        repo: string;
-    };
+    repo?: RepoTarget;
+    json: boolean;
+    wait?: boolean;
+    timeoutMs?: number;
+};
+export type ParsedIssueWaitArgs = {
+    number: number;
+    repo?: RepoTarget;
+    timeoutMs: number;
     json: boolean;
 };
 export declare function parseIssueCreateArgs(args: string[], readBody?: (path: string) => string): ParsedIssueArgs;
+export declare function parseIssueWaitArgs(args: string[]): ParsedIssueWaitArgs;
 export type IssueDeps = {
     cwd?: string;
     loadConfig?: typeof loadConfig;
     openStackIssue?: typeof openStackIssue;
+    pollIssueReview?: typeof pollIssueReview;
     parseGithubOriginRepo?: typeof parseGithubOriginRepo;
     readBody?: (path: string) => string;
 };
+export declare function waitForIssueReview(target: RepoTarget & {
+    number: number;
+}, opts: {
+    timeoutMs: number;
+    json: boolean;
+    jsonShape?: (status: IssueReviewStatus) => unknown;
+}, deps?: IssueDeps): Promise<void>;
 export declare function cmdIssue(args: string[], deps?: IssueDeps): Promise<void>;
+export {};

package/dist/commands/issue.js

@@ -1,18 +1,39 @@
 import { readFileSync } from "node:fs";
-import { openStackIssue } from "../api.js";
+import { ISSUE_REVIEW_DEFAULT_TIMEOUT_MS, IssueReviewTimeoutError, issueNotApprovedError, issueReviewLines, openStackIssue, pollIssueReview, } from "../api.js";
 import { loadConfig } from "../config.js";
 import { CommandError, REVIEW_EXIT } from "../errors.js";
 import { parseGithubOriginRepo } from "../git.js";
-export const ISSUE_USAGE = [
+const ISSUE_USAGE = [
     "usage: mergestorm issue create --title <title> [--body <text> | --body-file <path>]",
-    "         [--label <name>]… [--repo <owner/repo>] [--json]",
+    "         [--label <name>]… [--repo <owner/repo>] [--wait [--timeout <seconds>]] [--json]",
     "  Opens a GitHub issue through Mergestorm as the Surge App. Needs no gh and no GitHub login.",
     "  Uses existing labels only. Running it again with the same title returns the open issue it already made when that issue is among the newest 100 open issues; an older one, or two calls at once, can still create a duplicate.",
+    "  --wait waits for the Vortex issue review afterwards, like issue wait.",
+    "       mergestorm issue wait <number> [--repo <owner/repo>] [--timeout <seconds>] [--json]",
+    `  Waits for the Vortex review of the issue (default ${ISSUE_REVIEW_DEFAULT_TIMEOUT_MS / 1000}s). Exits 0 once the issue is approved or issue reviews are off.`,
+    `  Exits ${REVIEW_EXIT.failed} when the review has points to answer: reply in a comment on the issue, then wait again. Open the pull request only after approval.`,
 ].join("\n");
-const VALUE_FLAGS = new Set(["--title", "--body", "--body-file", "--label", "--repo"]);
+const VALUE_FLAGS = new Set(["--title", "--body", "--body-file", "--label", "--repo", "--timeout"]);
 function usage(message) {
     return new CommandError(message ? `${message}\n${ISSUE_USAGE}` : ISSUE_USAGE, REVIEW_EXIT.usage, "usage");
 }
+function flagValue(flag, raw) {
+    if (raw === undefined || raw.startsWith("--"))
+        throw usage(`${flag} needs a value`);
+    return raw;
+}
+function parseRepo(raw) {
+    const match = /^([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)$/.exec(raw.trim());
+    if (!match)
+        throw usage("--repo needs <owner/repo>");
+    return { owner: match[1], repo: match[2] };
+}
+function parseTimeoutMs(raw) {
+    const seconds = Number(raw);
+    if (!Number.isInteger(seconds) || seconds < 1)
+        throw usage("--timeout needs a whole number of seconds, at least 1");
+    return seconds * 1000;
+}
 export function parseIssueCreateArgs(args, readBody = (path) => readFileSync(path, "utf8")) {
     let title = "";
     let body;
@@ -20,33 +41,30 @@ export function parseIssueCreateArgs(args, readBody = (path) => readFileSync(pat
     let repo;
     const labels = [];
     let json = false;
-    const value = (flag, raw) => {
-        if (raw === undefined || raw.startsWith("--"))
-            throw usage(`${flag} needs a value`);
-        return raw;
-    };
+    let wait = false;
+    let timeoutMs;
     for (let i = 0; i < args.length; i++) {
         const arg = args[i];
         if (arg === "--title")
-            title = value(arg, args[++i]).trim();
+            title = flagValue(arg, args[++i]).trim();
         else if (arg === "--body")
-            body = value(arg, args[++i]);
+            body = flagValue(arg, args[++i]);
         else if (arg === "--body-file")
-            bodyFile = value(arg, args[++i]);
+            bodyFile = flagValue(arg, args[++i]);
         else if (arg === "--label") {
-            const label = value(arg, args[++i]).trim();
+            const label = flagValue(arg, args[++i]).trim();
             if (!label)
                 throw usage("--label needs a non-empty name");
             labels.push(label);
         }
-        else if (arg === "--repo") {
-            const match = /^([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)$/.exec(value(arg, args[++i]).trim());
-            if (!match)
-                throw usage("--repo needs <owner/repo>");
-            repo = { owner: match[1], repo: match[2] };
-        }
+        else if (arg === "--repo")
+            repo = parseRepo(flagValue(arg, args[++i]));
         else if (arg === "--json")
             json = true;
+        else if (arg === "--wait")
+            wait = true;
+        else if (arg === "--timeout")
+            timeoutMs = parseTimeoutMs(flagValue(arg, args[++i]));
         else
             throw usage(`unknown argument ${arg}`);
     }
@@ -54,6 +72,8 @@ export function parseIssueCreateArgs(args, readBody = (path) => readFileSync(pat
         throw usage("--title is required");
     if (body !== undefined && bodyFile !== undefined)
         throw usage("pass --body or --body-file, not both");
+    if (timeoutMs !== undefined && !wait)
+        throw usage("--timeout requires --wait");
     if (bodyFile !== undefined) {
         try {
             body = readBody(bodyFile);
@@ -62,12 +82,102 @@ export function parseIssueCreateArgs(args, readBody = (path) => readFileSync(pat
             throw new CommandError(`Could not read ${bodyFile}: ${err instanceof Error ? err.message : String(err)}`);
         }
     }
-    return { title, body: body ?? "", labels, ...(repo ? { repo } : {}), json };
+    return {
+        title,
+        body: body ?? "",
+        labels,
+        ...(repo ? { repo } : {}),
+        json,
+        ...(wait ? { wait } : {}),
+        ...(timeoutMs !== undefined ? { timeoutMs } : {}),
+    };
+}
+export function parseIssueWaitArgs(args) {
+    let number;
+    let repo;
+    let timeoutMs = ISSUE_REVIEW_DEFAULT_TIMEOUT_MS;
+    let json = false;
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        if (arg === "--repo")
+            repo = parseRepo(flagValue(arg, args[++i]));
+        else if (arg === "--timeout")
+            timeoutMs = parseTimeoutMs(flagValue(arg, args[++i]));
+        else if (arg === "--json")
+            json = true;
+        else if (!arg.startsWith("--") && number === undefined) {
+            const match = /^#?(\d+)$/.exec(arg.trim());
+            const n = match ? Number(match[1]) : NaN;
+            if (!Number.isSafeInteger(n) || n < 1)
+                throw usage(`issue wait needs an issue number, got ${arg}`);
+            number = n;
+        }
+        else
+            throw usage(`unknown argument ${arg}`);
+    }
+    if (number === undefined)
+        throw usage("issue wait needs an issue number");
+    return { number, ...(repo ? { repo } : {}), timeoutMs, json };
+}
+function resolveTarget(repo, deps) {
+    const target = repo ?? (deps.parseGithubOriginRepo ?? parseGithubOriginRepo)(deps.cwd ?? process.cwd());
+    if (!target) {
+        throw new CommandError("Could not parse GitHub owner/repo from `origin`. Pass --repo <owner/repo>.");
+    }
+    return target;
+}
+function asAuthExit(err) {
+    if (err instanceof CommandError && (err.code === "auth_invalid" || err.code === "missing_api_key")) {
+        return new CommandError(err.message, REVIEW_EXIT.auth, err.code);
+    }
+    return err;
+}
+function approvedLine(status) {
+    if (status.state === "off")
+        return `Issue reviews are off for ${status.owner}/${status.repo}; #${status.number} needs no approval.`;
+    const by = status.approvedBy === "human" ? "a person" : "Vortex";
+    return `${status.owner}/${status.repo}#${status.number} is approved by ${by}.`;
+}
+export async function waitForIssueReview(target, opts, deps = {}) {
+    const printJson = (status) => console.log(JSON.stringify(opts.jsonShape ? opts.jsonShape(status) : status, null, 2));
+    const progress = (line) => (opts.json ? console.error(line) : console.log(line));
+    let status;
+    try {
+        const cfg = await (deps.loadConfig ?? loadConfig)();
+        progress(`Waiting for the Vortex review of ${target.owner}/${target.repo}#${target.number} …`);
+        status = await (deps.pollIssueReview ?? pollIssueReview)(cfg, target, { timeoutMs: opts.timeoutMs });
+    }
+    catch (err) {
+        if (err instanceof IssueReviewTimeoutError) {
+            if (opts.json)
+                printJson(err.lastStatus);
+            else
+                console.log(issueReviewLines(err.lastStatus).join("\n"));
+        }
+        throw asAuthExit(err);
+    }
+    if (!status) {
+        throw new CommandError("This Mergestorm server does not review issues yet. Update the API, or open the pull request as before.", 1, "issue_review_unavailable");
+    }
+    if (opts.json)
+        printJson(status);
+    if (status.state === "approved" || status.state === "off") {
+        if (!opts.json) {
+            console.log(approvedLine(status));
+            if (status.next)
+                console.log(status.next);
+        }
+        return;
+    }
+    const refusal = issueNotApprovedError([status], `Vortex has not approved ${status.owner}/${status.repo}#${status.number} yet.`);
+    if (opts.json)
+        throw new CommandError(refusal.message.split("\n")[0], refusal.exitCode, refusal.code);
+    throw refusal;
 }
 export async function cmdIssue(args, deps = {}) {
     const sub = args[0]?.toLowerCase();
     const asksForHelp = (arg) => arg === "-h" || arg === "--help" || arg === "help";
-    const createAsksForHelp = (rest) => {
+    const restAsksForHelp = (rest) => {
         for (let i = 0; i < rest.length; i++) {
             const arg = rest[i];
             if (asksForHelp(arg))
@@ -77,22 +187,34 @@ export async function cmdIssue(args, deps = {}) {
         }
         return false;
     };
-    if (!sub || asksForHelp(sub) || (sub === "create" && createAsksForHelp(args.slice(1)))) {
+    if (!sub || asksForHelp(sub) || ((sub === "create" || sub === "wait") && restAsksForHelp(args.slice(1)))) {
         console.log(ISSUE_USAGE);
         return;
     }
+    if (sub === "wait") {
+        const parsed = parseIssueWaitArgs(args.slice(1));
+        const target = resolveTarget(parsed.repo, deps);
+        await waitForIssueReview({ ...target, number: parsed.number }, parsed, deps);
+        return;
+    }
     if (sub !== "create")
         throw usage(`unknown issue subcommand: ${sub}`);
     const parsed = parseIssueCreateArgs(args.slice(1), deps.readBody);
-    const target = parsed.repo ?? (deps.parseGithubOriginRepo ?? parseGithubOriginRepo)(deps.cwd ?? process.cwd());
-    if (!target) {
-        throw new CommandError("Could not parse GitHub owner/repo from `origin`. Pass --repo <owner/repo>.");
-    }
+    const target = resolveTarget(parsed.repo, deps);
     const issue = await (deps.openStackIssue ?? openStackIssue)({ owner: target.owner, repo: target.repo, title: parsed.title, body: parsed.body, labels: parsed.labels }, await (deps.loadConfig ?? loadConfig)());
-    if (parsed.json) {
-        console.log(JSON.stringify({ owner: target.owner, repo: target.repo, ...issue }, null, 2));
-        return;
+    const created = { owner: target.owner, repo: target.repo, ...issue };
+    if (parsed.json && !parsed.wait) {
+        console.log(JSON.stringify(created, null, 2));
     }
-    console.log(`${issue.created ? "Opened" : "Already open:"} ${target.owner}/${target.repo}#${issue.number}  ${issue.url}`);
-    console.log(`Put \`Fixes #${issue.number}\` in the commit or pull request body.`);
+    else if (!parsed.json) {
+        console.log(`${issue.created ? "Opened" : "Already open:"} ${target.owner}/${target.repo}#${issue.number}  ${issue.url}`);
+        console.log(`Put \`Fixes #${issue.number}\` in the commit or pull request body.`);
+    }
+    if (!parsed.wait)
+        return;
+    await waitForIssueReview({ ...target, number: issue.number }, {
+        timeoutMs: parsed.timeoutMs ?? ISSUE_REVIEW_DEFAULT_TIMEOUT_MS,
+        json: parsed.json,
+        jsonShape: (review) => ({ ...created, review }),
+    }, deps);
 }

package/dist/commands/login.d.ts

@@ -1,10 +1,11 @@
 import { type Config } from "../config.js";
-import { type MeResponse } from "../api.js";
+import { type AccountIdentity, type MeResponse } from "../api.js";
 /**
  * Probe /api/v1/me with an in-memory config. Does not write disk.
  * Throws CommandError when the key must not be saved.
  */
 export declare function validateApiKey(cfg: Config): Promise<MeResponse>;
+export declare function loggedInLine(account: AccountIdentity | null | undefined): string;
 export declare function pendingLoginPath(): string;
 export interface LoginDeps {
     openBrowser: (url: string) => void;