mergestorm 0.3.64 → 0.3.66

package/dist/commands/memory.d.ts

@@ -1,16 +1,15 @@
 import { type Config } from "../config.js";
 import { deleteMemory, getMemoryMode, listMemories, saveMemory, searchMemories, setMemoryMode, updateMemory, type MemoryItem, type MemoryKind, type MemoryScope } from "../memory-api.js";
-export declare const MEMORY_USAGE: string;
-export declare const MEMORY_SUBCOMMANDS: readonly ["list", "search", "add", "update", "delete", "mode"];
 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">): Flags;
+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>;

package/dist/commands/memory.js

@@ -1,18 +1,18 @@
 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";
-export const MEMORY_USAGE = [
+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>] [--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");
-export const MEMORY_SUBCOMMANDS = ["list", "search", "add", "update", "delete", "mode"];
 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");
@@ -29,6 +29,8 @@ export function parseMemoryFlags(args, allowed) {
         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))
@@ -108,14 +110,14 @@ export async function cmdMemory(args, deps = {}) {
         return;
     }
     if (sub === "add" || sub === "save" || sub === "remember") {
-        const flags = parseMemoryFlags(rest, ["repo", "kind"]);
+        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 }, await config());
-        emit(flags.json, saved, () => [saved.merged ? `That matched memory ${saved.id}, which now says this.` : `Saved to memory as ${saved.id}.`]);
+        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") {

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";
@@ -24,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)",
@@ -39,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)",
@@ -102,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);
@@ -186,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 });
         },
@@ -201,6 +220,7 @@ 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",
@@ -225,7 +245,7 @@ export const COMMAND_REGISTRY = [
         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>] [--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",
@@ -348,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)
 `;
@@ -366,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" | "merge_queue_lands_alone_paths" | "merge_queue_overdrive" | "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,8 +22,6 @@ export type SettingsArgs = {
     repo?: RepoSettingsScope;
     listRepos?: boolean;
 };
-export declare function parsePathsFlagValue(flag: string, value: string | undefined, defaults: readonly string[]): string[];
-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

@@ -18,8 +18,9 @@ const REPO_FLAG_LABELS = {
     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",
 };
-export function parsePathsFlagValue(flag, value, defaults) {
+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");
     }
@@ -79,7 +80,7 @@ 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, --auto-land, --merge-queue-batch, --merge-queue-batch-size, --merge-queue-lands-alone and --merge-queue-overdrive 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];
         const row = BEARER_SETTINGS.find((row) => row.key === key);
@@ -115,7 +116,7 @@ function repoSettingWords(value) {
         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));

package/dist/commands/stack.d.ts

@@ -1,6 +1,6 @@
-import { type StackHeldBlocker, type StackRepairHint } from "../stack-blockers.js";
+import { type StackRepairHint } from "../stack-blockers.js";
 import { type StackWatchObligation } from "../stack-watch-obligation.js";
-import { adoptStack, ensureUpperPark, findStackPull, getEnrichedStack, getStackPublication, listMergeQueueEntries, listStacks, openStackPull, claimStackPulls, setStackPolicy, type StackDto, type StackPolicyPatch } from "../api.js";
+import { adoptStack, ensureUpperPark, findStackPull, getEnrichedStack, getIssueReview, getStackPublication, listMergeQueueEntries, listStacks, openStackPull, claimStackPulls, setStackPolicy, type StackDto, type StackPolicyPatch } from "../api.js";
 import { loadConfig } from "../config.js";
 import { createPrs, findOpenPrNumber } from "../gh.js";
 import { parseGithubOriginRepo } from "../git.js";
@@ -11,9 +11,7 @@ import { gitTopLevel } from "../repo-identity.js";
 import { loadStackMeta, saveStackMeta } from "../stack-meta.js";
 import { pollStackWatch } from "../stack-watch.js";
 import { runStackWatch } from "../stack-watch-loop.js";
-export declare function stackHeldLine(held: StackHeldBlocker | null | undefined): string[];
 export declare function stackRepairLine(repair: StackRepairHint | null | undefined): string[];
-export declare function stackWatchTextLines(watch: StackWatchObligation | null | undefined): string[];
 export declare function openStackWatch(stackId: string, opts?: {
     unread?: boolean;
 }): StackWatchObligation;
@@ -128,6 +126,22 @@ export type StackCreateDeps = {
 };
 export declare function cmdStackCreate(args: string[], deps?: StackCreateDeps): Promise<void>;
 /** Injectable seams for unit tests (STRUCT-04). Production callers omit deps. */
+export declare function issueReviewsEnabledFor(cfg: Awaited<ReturnType<typeof loadConfig>>, owner: string, repo: string): Promise<boolean>;
+export type IssueGateLayer = {
+    branch: string;
+    texts: string[];
+};
+export type IssueGateDeps = {
+    getIssueReview?: typeof getIssueReview;
+    issueReviewsEnabled?: typeof issueReviewsEnabledFor;
+};
+export declare function assertLinkedIssuesApproved(input: {
+    cfg: Awaited<ReturnType<typeof loadConfig>>;
+    owner: string;
+    repo: string;
+    layers: readonly IssueGateLayer[];
+    warn: (line: string) => void;
+}, deps?: IssueGateDeps): Promise<void>;
 export type StackSubmitDeps = {
     cwd?: string;
     gitTopLevel?: (cwd?: string) => string;
@@ -155,7 +169,7 @@ export type StackSubmitDeps = {
     adoptStack?: typeof adoptStack;
     ensureUpperPark?: typeof ensureUpperPark;
     env?: NodeJS.ProcessEnv;
-};
+} & IssueGateDeps;
 export declare function cmdStackSubmit(args: string[], deps?: StackSubmitDeps): Promise<void>;
 export declare function parseStackPublishArgs(args: string[]): {
     branch?: string;

package/dist/commands/stack.js

@@ -1,12 +1,12 @@
 import { cycloneStatusWords, stackBlockers, stackBlockersSummary } from "../stack-blockers.js";
 import { STACK_WATCH_NOT_DONE_SENTENCE, STACK_WATCH_NOTIFY_PATTERN, stackTerminalReason, stackWatchObligation, } from "../stack-watch-obligation.js";
-import { adoptStack, ensureUpperPark, findStackPull, getEnrichedStack, getStackPublication, landNextStack, listMergeQueueEntries, listStacks, openStackPull, claimStackPulls, restackStack, setStackPolicy, } from "../api.js";
+import { adoptStack, ensureUpperPark, findStackPull, getEnrichedStack, getIssueReview, getSettings, getStackPublication, issueNotApprovedError, landNextStack, listRepoSettings, listMergeQueueEntries, listStacks, openStackPull, claimStackPulls, restackStack, setStackPolicy, } from "../api.js";
 import { loadConfig } from "../config.js";
 import { rateLimitedMessage, REVIEW_EXIT, CommandError } from "../errors.js";
 import { createPrs, findOpenPrNumber, ghReady, githubApiFromEnv, } from "../gh.js";
 import { parseGithubOriginRepo } from "../git.js";
 import { branchExists, commitsAheadOf, createBranchFrom, createBranchFromHead, trunkStartRef, currentBranch, defaultLayerBranchName, deleteBranch, discoverTrunk, fetchRemoteBranch, pushBranch, tipCommitMessage, tipCommitSubject, worktreeDirty, } from "../git-stack.js";
-import { buildPrBodyFromCommit } from "../pr-body.js";
+import { buildPrBodyFromCommit, linkedIssueNumbers } from "../pr-body.js";
 import { publishBranchServerSide, assertExplicitStacking, publishWorkingBranch, workingBranchPublication, } from "../server-publish.js";
 import { gitTopLevel } from "../repo-identity.js";
 import { activeLayers, appendLayer, emptyStackMeta, loadStackMeta, removeActiveStack, resetStackMeta, saveStackMeta, selectStackForCreate, setActivePolicy, } from "../stack-meta.js";
@@ -19,7 +19,7 @@ import { present } from "../ui/present.js";
 import { canBrowse } from "./browse.js";
 import { isTransientReviewPollError } from "./review-client.js";
 import { openHelpBrowser } from "./help.js";
-export function stackHeldLine(held) {
+function stackHeldLine(held) {
     if (!held)
         return [];
     const agents = held.waitingOn.map((agent) => agent === "cyclone" ? "Cyclone" : "Vortex").join(" and ");
@@ -32,7 +32,7 @@ export function stackRepairLine(repair) {
     const note = "note" in repair && repair.note ? ` ${repair.note}` : "";
     return [`Repair #${repair.prNumber} ${repair.kind}${files}: ${repair.steps}${note}`];
 }
-export function stackWatchTextLines(watch) {
+function stackWatchTextLines(watch) {
     if (!watch)
         return [];
     if (watch.done)
@@ -680,6 +680,65 @@ export async function cmdStackCreate(args, deps = {}) {
     created.push(ansi.dim("  authoring state: managed automatically outside the repository"));
     await present("Stack", created);
 }
+/** Injectable seams for unit tests (STRUCT-04). Production callers omit deps. */
+export async function issueReviewsEnabledFor(cfg, owner, repo) {
+    const repos = await listRepoSettings(cfg, { timeoutMs: STACK_GUARD_TIMEOUT_MS });
+    const row = repos.find((r) => r.owner.toLowerCase() === owner.toLowerCase() && r.repo.toLowerCase() === repo.toLowerCase());
+    if (typeof row?.issue_review_enabled === "boolean")
+        return row.issue_review_enabled;
+    const settings = await getSettings(cfg, { timeoutMs: STACK_GUARD_TIMEOUT_MS });
+    if (!settings)
+        throw new CommandError("Could not read the account settings");
+    return settings.issue_review_enabled === true;
+}
+export async function assertLinkedIssuesApproved(input, deps = {}) {
+    const { cfg, owner, repo, layers, warn } = input;
+    if (layers.length === 0)
+        return;
+    const getIssueReviewFn = deps.getIssueReview ?? getIssueReview;
+    const unverified = (err) => {
+        if (err instanceof CommandError && (err.code === "auth_invalid" || err.code === "missing_api_key" || err.code === "rate_limited"))
+            return err;
+        return new CommandError(`Could not verify the Vortex reviews of the linked issues (${err instanceof Error ? err.message : String(err)}); ` +
+            "refusing to submit. Retry when the API is reachable.");
+    };
+    const linked = layers.map((layer) => ({ branch: layer.branch, numbers: linkedIssueNumbers({ owner, repo }, ...layer.texts) }));
+    const statuses = [];
+    for (const number of [...new Set(linked.flatMap((layer) => layer.numbers))].sort((a, b) => a - b)) {
+        let status;
+        try {
+            status = await getIssueReviewFn(cfg, { owner, repo, number }, { timeoutMs: STACK_GUARD_TIMEOUT_MS });
+        }
+        catch (err) {
+            throw unverified(err);
+        }
+        if (!status) {
+            warn(ansi.dim("  This Mergestorm server does not check issue reviews yet; submitting without the issue gate."));
+            continue;
+        }
+        statuses.push(status);
+    }
+    const unlinked = linked.filter((layer) => layer.numbers.length === 0);
+    if (unlinked.length > 0) {
+        let enabled;
+        try {
+            enabled = await (deps.issueReviewsEnabled ?? issueReviewsEnabledFor)(cfg, owner, repo);
+        }
+        catch (err) {
+            throw unverified(err);
+        }
+        if (enabled) {
+            throw new CommandError([
+                `Issue reviews are on for ${owner}/${repo}, and ${unlinked.map((layer) => layer.branch).join(", ")} links no issue.`,
+                "Open one with `mergestorm issue create --title <problem> --wait`, answer the Vortex review until it is approved,",
+                "then add `Fixes #N` to the tip commit message and submit again.",
+            ].join("\n"), REVIEW_EXIT.failed, "issue_not_approved");
+        }
+    }
+    const blocking = statuses.filter((status) => status.state !== "approved" && status.state !== "off");
+    if (blocking.length > 0)
+        throw issueNotApprovedError(blocking);
+}
 export async function cmdStackSubmit(args, deps = {}) {
     const { extend, autoLand, autoReview, autoPatch, autoResolveConflicts, autoFixCi, rest, serverSide, asJson } = parseStackSubmitArgs(args);
     const api = rest ? "rest" : githubApiFromEnv(deps.env ?? process.env);
@@ -803,6 +862,21 @@ export async function cmdStackSubmit(args, deps = {}) {
     for (const plan of plans) {
         existingPrs.set(plan.branch, await opener.findOpen(plan.branch));
     }
+    await assertLinkedIssuesApproved({
+        cfg: await loadConfigFn(),
+        owner,
+        repo,
+        layers: plans
+            .filter((plan) => existingPrs.get(plan.branch) == null)
+            .map((plan) => {
+            if (!branchExistsFn(plan.branch, cwd)) {
+                throw new CommandError(`Stack layer branch missing locally: ${plan.branch}`);
+            }
+            const message = tipCommitMessageFn(plan.branch, cwd);
+            return { branch: plan.branch, texts: [message, buildPrBodyFn(message)] };
+        }),
+        warn: progress,
+    }, deps);
     const newHeads = plans
         .filter((plan) => existingPrs.get(plan.branch) == null)
         .map((plan) => plan.branch);

package/dist/commands/whoami.js

@@ -1,9 +1,8 @@
-import { getMe } from "../api.js";
-import { apiBase, configPath, loadConfig, resolveApiKey } from "../config.js";
+import { accountLabel, getMe } from "../api.js";
+import { apiBase, configPath, listAccounts, loadConfig, resolveApiKey, settleAccountName } from "../config.js";
 import { CommandError } from "../errors.js";
 import { ansi } from "../ui/ansi.js";
 import { present } from "../ui/present.js";
-import { canBrowse, openTabsBrowser } from "./browse.js";
 export async function cmdWhoami(args, opts = {}) {
     const asJson = args.includes("--json");
     const cfg = await loadConfig();
@@ -11,15 +10,17 @@ export async function cmdWhoami(args, opts = {}) {
     if (!key) {
         throw new CommandError("Not logged in. Run `mergestorm login` (agents: `mergestorm login --start`, then `--finish`).");
     }
-    if (!asJson && canBrowse()) {
-        await openTabsBrowser("status");
-        return;
-    }
     const me = await getMe(cfg);
     if (!me) {
         throw new CommandError("Live account details unavailable. Could not verify account with /me.");
     }
+    const account = (await settleAccountName(cfg, me)) ?? accountLabel(me.account);
+    const accounts = (await listAccounts()).map((a) => a.name);
     const payload = {
+        account,
+        accounts,
+        github_login: me.account?.github_login ?? null,
+        email: me.account?.email ?? null,
         key_prefix: me.key.prefix,
         key_name: me.key.name ?? null,
         plan_key: me.plan_key ?? null,
@@ -37,9 +38,12 @@ export async function cmdWhoami(args, opts = {}) {
         console.log(text);
         return;
     }
-    const lines = [
-        `  Key      ${ansi.bold(String(payload.key_prefix))}${payload.key_name ? ` (${payload.key_name})` : ""}`,
-    ];
+    const lines = [`  Account  ${account ? ansi.bold(account) : "unknown (API too old to say)"}`];
+    lines.push(`  Key      ${ansi.bold(String(payload.key_prefix))}${payload.key_name ? ` (${payload.key_name})` : ""}`);
+    const others = accounts.filter((name) => name !== account);
+    if (others.length > 0) {
+        lines.push(`  Others   ${others.join(", ")} ${ansi.dim("· mergestorm account use <name>")}`);
+    }
     if (payload.plan_key) {
         lines.push(`  Plan     ${payload.plan_label_key ?? payload.plan_key}`);
     }

package/dist/config.d.ts

@@ -1,16 +1,69 @@
 export declare const DEFAULT_API = "https://api.mergestorm.ai";
+export declare const ACCOUNT_LIMIT = 3;
 export type Config = {
     apiKey?: string;
     apiBase?: string;
     ignoreEnv?: boolean;
+    account?: string;
+};
+export type StoredAccount = {
+    apiKey: string;
+    apiBase?: string;
+};
+export type AccountStore = {
+    accounts: Record<string, StoredAccount>;
+    activeAccount?: string;
+    apiBase?: string;
+    ignoreEnv?: boolean;
+};
+type StoreFile = AccountStore & {
+    apiKey?: string;
+};
+export type AccountSummary = {
+    name: string;
+    active: boolean;
+    keyPrefix: string;
+    apiBase: string;
+};
+export type NamedMe = {
+    account?: {
+        github_login?: string | null;
+        email?: string | null;
+    } | null;
 };
 export declare function mergestormHome(env?: NodeJS.ProcessEnv): string;
 export declare function configPath(): string;
+export declare function provisionalAccountName(apiKey: string): string;
+export declare function accountNameFromMe(me: NamedMe | null | undefined): string | null;
+export declare function serializeStore(store: AccountStore): StoreFile;
+export declare function migrateStore(raw: unknown): {
+    store: AccountStore;
+    migrated: boolean;
+};
+export declare function writeStore(store: AccountStore): Promise<void>;
+export declare function readStore(): Promise<AccountStore>;
+export declare function withAccount<T>(name: string | undefined, fn: () => Promise<T>): Promise<T>;
+export declare function requestedAccount(store: AccountStore, env?: NodeJS.ProcessEnv): string | undefined;
+export declare function selectAccountName(store: AccountStore, requested: string | undefined): string | undefined;
+export declare function configFor(store: AccountStore, name: string | undefined): Config;
 export declare function loadConfig(): Promise<Config>;
-export declare function saveConfig(cfg: Config): Promise<void>;
-export declare function clearConfig(): Promise<void>;
+export declare function accountLimitMessage(store: AccountStore): string;
+export declare function saveAccount(name: string, account: StoredAccount, opts?: {
+    activate?: boolean;
+}): Promise<AccountStore>;
+export declare function useAccount(name: string): Promise<AccountStore>;
+export declare function removeAccount(name: string): Promise<AccountStore>;
+export declare function renameAccount(from: string, to: string): Promise<AccountStore>;
+export declare function summarizeAccounts(store: AccountStore): AccountSummary[];
+export declare function listAccounts(): Promise<AccountSummary[]>;
+export declare function settleAccountName(cfg: Config, me: NamedMe | null | undefined): Promise<string | undefined>;
+export declare function splitAccountFlag(args: readonly string[]): {
+    account?: string;
+    args: string[];
+};
 export declare function apiBase(cfg: Config): string;
 export declare function resolveChatId(cfg: Config): string | undefined;
 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;
+export {};