mergestorm 0.3.62 → 0.3.64

package/README.md

@@ -45,12 +45,12 @@ On a TTY, bare `mergestorm` (or `mergestorm shell`) opens a branded REPL: a comp
 
 ```
 ╭──────────────────────────────────────────────────────────────────────────────╮
-│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.62                                             │
+│  ▀▀▀▀▀▀▀▀▀▀▘  mergestorm v0.3.64                                             │
 │ ▀▀▀▀▀▀▀▀▀     ● msk_live_… · maelstrom                                       │
 │  ▀▀▀▀▀▀       [████████░░░░░░░░░░░░░░░░░░░░░░] 25% used                      │
 │   ▝▀▀▀▀▀      local reviews + stacked PRs · mergestorm.ai                    │
 │     ▝▀▀▘      review a diff · usage for tabs · /help for all commands        │
-│       ▀       New in v0.3.62: Watch wakes for a blocker on any layer         │
+│       ▀       New in v0.3.64: Memory commands and Overdrive merge batches    │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 mergestorm
 ╭──────────────────────────────────────────────────────────────────────────────╮
@@ -93,7 +93,7 @@ mergestorm thread <slug>        Jobs in a review thread
 mergestorm issue create --title <t>  Open a GitHub issue through Mergestorm, no `gh` (`--body`, `--body-file`, `--label`, `--repo`)
 mergestorm stack create [name]  New local stack layer (optional `--onto` / `--trunk` / `--extend`)
 mergestorm stack submit         Push layers, open PRs (`gh`), register via adopt (optional `--extend`, `--server-side`)
-mergestorm stack publish        Publish the current branch through Mergestorm with no GitHub credentials (`--status` to read it)
+mergestorm stack publish        Publish the current branch through Mergestorm with no GitHub credentials (`--base <branch> --extend` to stack, `--status` to read it)
 mergestorm stack list [--json]  List registered stacks
 mergestorm stack adopt <owner/repo>#<pr>  Import an existing open PR chain
 mergestorm stack restack <stack-id>  Restack descendants
@@ -113,7 +113,8 @@ mergestorm dismiss <owner/repo>#<n> --head <sha> --review <id> --finding <id> --
 - It prints nothing while the stack is `waiting` or `in_progress`, including while Cyclone or Vortex holds the blocked PR (`busy[]`, `actAfter: "agents_idle"`).
 - On attention it prints `MS-WATCH ATTENTION pr=<n> head=<sha> blocker="<blocker>" repair=<kind>` and exits 3. Attention names the lowest layer with a blocker an agent must fix, on any layer of the stack, not only the current candidate.
 - A confirmed landing prints `MS-WATCH LANDED stack=<id> reason=landed` and exits 0. `closed`, `archived` and `not_found` end the watch with `MS-WATCH ATTENTION stack=<id> reason=<reason>` and exit 3. A missing stack does not prove a landing; verify each PR before reporting it merged.
-- A failed read is retried once. If the retry fails too, it prints `MS-WATCH ATTENTION failed stack=<id> error="<message>"` and exits 3. A rate limit is waited out.
+- A permanent read error is retried once; if the retry fails too, it prints `MS-WATCH ATTENTION failed stack=<id> error="<message>"` and exits 3. Timeouts, 5xx and rate limits are retried, but after 15 minutes with no stack read it prints the same line and exits 3.
+- A watch that cannot start (bad flags, a config it cannot read, a crash) prints `MS-WATCH ATTENTION failed` too, so the command never exits without an `MS-WATCH` line unless you stop it (Ctrl+C or an abort, exit 130). Pass each flag as its own word: in zsh an unquoted `$args` holding several flags stays one word and the command refuses it.
 - `--head <sha>` enrolls the SHA you just pushed. After fixing a blocker, restart the watcher with it.
 - `--ignore <text>` keeps it silent on the first attention whose blocker contains that text (case-insensitive), until the blocker, its PR or its head changes. Use it for a blocker a human has taken over. Repeat the flag for more than one.
 - `--until landed` keeps running after an attention, printing each new attention once, and exits only when the watch is done or reads keep failing.
@@ -138,9 +139,14 @@ Use `mergestorm dismiss` when a Vortex finding is wrong and you have checked it
 
 `mg` is a short alias for `mergestorm` (same binary), e.g. `mg stack create`. Happy path: **create → commit → submit → restack → land**. On review-unit stacks, `stack land` **promotes** the tip into the unit (same gates as the dashboard); otherwise it lands the bottom open PR. `stack adopt` is for importing a chain that already exists on GitHub (legacy / Graphite). Restack/land use the same login key (`/api/v1/stacks`). Unattended landing is `mg queue add`.
 
-`stack create` checks out a new branch from the current tip (or `--onto <branch>`), discovers trunk (`main` / `master` / `origin/HEAD`, overridable with `--trunk`), and records `{ branch, parentBranch }` in CLI-managed state under **`~/.mergestorm/stacks/<repo-id>/stack.json`**. The CLI updates this automatically; never edit it. Each worktree has its own authoring state; independent clones stay isolated too. Creating onto trunk with a non-empty active stack starts a new one. `--trunk` only sets trunk metadata — it does **not** change the parent; use `--onto main` (etc.) for a fresh stack from trunk.
+`stack create` always starts a new single PR from trunk unless you pass **`--extend`**, even when the worktree is still on an earlier PR's branch: it checks out the new branch from `origin/<trunk>` (or local trunk; from `HEAD` when trunk is checked out). It discovers trunk (`main` / `master` / `origin/HEAD`, overridable with `--trunk`) and records `{ branch, parentBranch }` in CLI-managed state under **`~/.mergestorm/stacks/<repo-id>/stack.json`**. The CLI updates this automatically; never edit it. Each worktree has its own authoring state; independent clones stay isolated too. Creating onto trunk with a non-empty active stack starts a new one.
 
-If the parent branch is already a layer of a **registered** (submitted) stack, `create` and `submit` refuse unless you pass **`--extend`**. That blocks accidentally gluing an unrelated PR onto an open unit. Growing a registered stack on purpose: `mg stack create --onto <tip> --extend` → commit → `mg stack submit --extend`.
+Both paths are one command:
+
+- New stack from trunk: `mg stack create <name>` (from any branch), then `mg stack submit`.
+- Grow a stack: `mg stack create <name> --extend` on the branch to stack onto (or `--onto <branch> --extend`), then `mg stack submit --extend` when the parent is a layer of a registered stack. `mg stack publish --base <branch> --extend` does the same for publish.
+
+`--onto` or `--base` with a branch other than trunk and no `--extend` is refused, so nothing is added to a stack by accident. Every create, submit and publish prints which one it made: a new single PR onto trunk, or a layer stacked on its parent.
 
 `stack submit` walks the **active** local stack: `git push -u origin` each layer, opens a PR with `gh` (`--base` = parent or trunk; adopt then moves the bottom of a 2+ PR stack onto `mg-stack-<n>` — leave it there; skips heads that already have an open PR; body from the tip commit — Summary + Test plan, preserving Fixes/Closes/Resolves), registers the stack with `POST /api/v1/stacks/adopt` internally (Mergestorm API key), then drops that local stack entry so the next create onto trunk is clean. Push is always your local `git` credentials. PRs open as you when `gh` is installed and `gh api user` succeeds; otherwise `stack submit` asks the Mergestorm API (`POST /api/v1/stacks/pulls`) to open them as the Mergestorm Surge App on your behalf, after checking your GitHub account has write access, and assigns you. Stacks, the merge queue and Auto land run through Surge, and Cyclone is the auto-patch App. Without Surge, submit stops before pushing and prints the server's message, which names the App to install and links its install page. `mg settings` prints a `Stacks, merge queue, Auto land` line when the server reports whether that App is ready.
 

package/dist/api.d.ts

@@ -142,6 +142,14 @@ export type PrVortexReview = {
     reviewed_at: string | null;
     finding_count: number;
     findings: PrReviewFindings | null;
+    dismissed_findings?: Array<{
+        path: string;
+        line: number;
+        title: string;
+        severity: string;
+        finding_key: string;
+        github_comment_id: number | null;
+    }>;
     patch_policy: unknown | null;
     /**
      * MS-01: True when the returned row is a resting completion but a newer
@@ -174,13 +182,18 @@ export type SettingsResponse = import("./automation-catalog.js").BearerSettingsV
     github_connected: boolean;
     stacks_ready?: boolean;
 };
-export declare const REPO_SETTINGS_KEYS: readonly ["auto_patch_enabled", "auto_review_enabled", "auto_land_default"];
+export declare const REPO_SETTINGS_SWITCH_KEYS: readonly ["auto_patch_enabled", "auto_review_enabled", "auto_land_default", "merge_queue_batch_enabled", "merge_queue_overdrive"];
+export declare const REPO_SETTINGS_KEYS: readonly ["auto_patch_enabled", "auto_review_enabled", "auto_land_default", "merge_queue_batch_enabled", "merge_queue_overdrive", "merge_queue_batch_size", "merge_queue_lands_alone_paths"];
 export type RepoSettingsKey = (typeof REPO_SETTINGS_KEYS)[number];
+export type RepoSettingsValues = Record<(typeof REPO_SETTINGS_SWITCH_KEYS)[number], boolean | null> & {
+    merge_queue_batch_size: number | null;
+    merge_queue_lands_alone_paths: string[] | null;
+};
 export type RepoSettings = {
     owner: string;
     repo: string;
-} & Record<RepoSettingsKey, boolean | null>;
-export type RepoSettingsPatch = Partial<Record<RepoSettingsKey, boolean | null>>;
+} & RepoSettingsValues;
+export type RepoSettingsPatch = Partial<RepoSettingsValues>;
 export declare function listRepoSettings(cfg?: Config, opts?: {
     timeoutMs?: number;
 }): Promise<RepoSettings[]>;
@@ -458,7 +471,12 @@ export type PrFindingDismissResult = {
         other_gates: "unchanged";
     };
     stack_id: string | null;
+    threads?: Array<{
+        finding_id: string;
+        state: "resolved" | "already_resolved" | "not_found" | "failed";
+    }>;
 };
+export declare function dismissThreadsLine(result: Pick<PrFindingDismissResult, "threads">): string | null;
 export type PrFindingDismissOutcome = {
     ok: true;
     result: PrFindingDismissResult;

package/dist/api.js

@@ -1,4 +1,4 @@
-import { apiBase, loadConfig, resolveApiKey } from "./config.js";
+import { apiBase, loadConfig, resolveApiKey, resolveChatId } from "./config.js";
 import { BEARER_SETTINGS_KEYS as SETTINGS_WRITABLE_KEYS, } from "./automation-catalog.js";
 import { CommandError, REVIEW_EXIT, rateLimitedMessage, plainServerText, } from "./errors.js";
 /** Default per-request timeout so a hung API cannot stall the shell/CI forever. */
@@ -84,8 +84,10 @@ export async function apiFetch(cfg, route, init = {}) {
         throw new CommandError("No API key. Run `mergestorm login` (agents: `mergestorm login --start`, then `--finish`) or set MERGESTORM_API_KEY.", 1, "missing_api_key");
     }
     const { json, timeoutMs = DEFAULT_API_TIMEOUT_MS, signal: userSignal, ...rest } = init;
+    const chatId = resolveChatId(cfg);
     const headers = {
         Authorization: `Bearer ${key}`,
+        ...(chatId ? { "x-mergestorm-chat-id": chatId } : {}),
         ...rest.headers,
     };
     let body = rest.body;
@@ -172,7 +174,14 @@ export function applyPrReviewQuery(query, opts) {
  * The connected flags are read-only there and deliberately absent here.
  */
 export { SETTINGS_WRITABLE_KEYS };
-export const REPO_SETTINGS_KEYS = ["auto_patch_enabled", "auto_review_enabled", "auto_land_default"];
+export const REPO_SETTINGS_SWITCH_KEYS = [
+    "auto_patch_enabled",
+    "auto_review_enabled",
+    "auto_land_default",
+    "merge_queue_batch_enabled",
+    "merge_queue_overdrive",
+];
+export const REPO_SETTINGS_KEYS = [...REPO_SETTINGS_SWITCH_KEYS, "merge_queue_batch_size", "merge_queue_lands_alone_paths"];
 function repoSettingsFailure(status, body, retryAfterSeconds, action) {
     if (status === 429) {
         return new CommandError(rateLimitedMessage(retryAfterSeconds), REVIEW_EXIT.rate_limited, "rate_limited", {
@@ -773,6 +782,19 @@ export async function listThreads(limit = 20, cfg) {
     const items = body.items;
     return Array.isArray(items) ? items : [];
 }
+export function dismissThreadsLine(result) {
+    const threads = result.threads ?? [];
+    if (threads.length === 0)
+        return null;
+    const closed = threads.filter((thread) => thread.state === "resolved" || thread.state === "already_resolved").length;
+    const failed = threads.filter((thread) => thread.state === "failed").map((thread) => thread.finding_id);
+    const missing = threads.filter((thread) => thread.state === "not_found").map((thread) => thread.finding_id);
+    return [
+        `GitHub threads: ${closed} of ${threads.length} resolved.`,
+        ...(failed.length ? [`Could not resolve ${failed.join(", ")}; run the same dismissal again to retry.`] : []),
+        ...(missing.length ? [`No thread found for ${missing.join(", ")}.`] : []),
+    ].join(" ");
+}
 export async function dismissPrFindings(input, cfg, opts) {
     const resolved = cfg ?? (await loadConfig());
     const json = {

package/dist/automation-catalog.d.ts

@@ -63,7 +63,17 @@ export declare const BEARER_SETTINGS: readonly [{
     readonly label: "Merge queue batch size (pull requests)";
     readonly kind: "count";
     readonly min: 2;
-    readonly max: 8;
+    readonly max: 10;
+}, {
+    readonly key: "merge_queue_lands_alone_paths";
+    readonly flag: "--merge-queue-lands-alone";
+    readonly label: "Merge queue lands-alone paths";
+    readonly kind: "paths";
+    readonly defaults: readonly ["**/migrations/**", "db/migrate/**", ".github/workflows/**"];
+}, {
+    readonly key: "merge_queue_overdrive";
+    readonly flag: "--merge-queue-overdrive";
+    readonly label: "Merge queue overdrive (up to 10 per batch)";
 }, {
     readonly key: "ignored_bot_logins";
     readonly flag: "--ignore-bot";
@@ -95,11 +105,11 @@ export declare const BEARER_SETTINGS_LABELS: Record<BearerSettingsKey, string>;
 /** Omitted kind means boolean for the original toggle rows. */
 export type BearerSettingsValues = {
     [Row in (typeof BEARER_SETTINGS)[number] as Row["key"]]: Row extends {
-        kind: "logins";
+        kind: "logins" | "paths";
     } ? string[] : Row extends {
         kind: "seconds" | "count";
     } ? number : Row extends {
         values: readonly (infer Value)[];
     } ? Value : boolean;
 };
-export declare const BEARER_BOOLEAN_SETTINGS_KEYS: ("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 BEARER_BOOLEAN_SETTINGS_KEYS: ("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")[];

package/dist/automation-catalog.js

@@ -13,7 +13,9 @@ export const BEARER_SETTINGS = [
     { key: "auto_land_default", flag: "--auto-land", label: "Auto land (new stacks)" },
     { key: "auto_land_settle_seconds", flag: "--auto-land-settle", label: "Auto land settle (seconds)", kind: "seconds", min: 15, max: 300 },
     { key: "merge_queue_batch_enabled", flag: "--merge-queue-batch", label: "Merge queue batching" },
-    { key: "merge_queue_batch_size", flag: "--merge-queue-batch-size", label: "Merge queue batch size (pull requests)", kind: "count", min: 2, max: 8 },
+    { key: "merge_queue_batch_size", flag: "--merge-queue-batch-size", label: "Merge queue batch size (pull requests)", kind: "count", min: 2, max: 10 },
+    { key: "merge_queue_lands_alone_paths", flag: "--merge-queue-lands-alone", label: "Merge queue lands-alone paths", kind: "paths", defaults: ["**/migrations/**", "db/migrate/**", ".github/workflows/**"] },
+    { key: "merge_queue_overdrive", flag: "--merge-queue-overdrive", label: "Merge queue overdrive (up to 10 per batch)" },
     { key: "ignored_bot_logins", flag: "--ignore-bot", label: "Ignored bot logins", kind: "logins" },
     { key: "vortex_bot_skip_check", flag: "--vortex-skip-check", label: "Vortex bot skip check", kind: "enum", values: ["none", "neutral"] },
     { key: "vortex_findings_check", flag: "--vortex-findings", label: "Vortex findings check", kind: "enum", values: ["failure", "neutral", "success"] },

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 { 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, 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, 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 { 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,7 @@ 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";

package/dist/client/index.js

@@ -1,6 +1,6 @@
 export { DEFAULT_API, apiBase, clearConfig, configPath, keyDisplay, loadConfig, mergestormHome, resolveApiKey, saveConfig, } 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, 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, 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 { 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,7 @@ 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";

package/dist/commands/browse.d.ts

@@ -27,7 +27,7 @@ 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 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" | "merge_queue_lands_alone_paths" | "merge_queue_overdrive" | "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";

package/dist/commands/dismiss.js

@@ -1,4 +1,4 @@
-import { dismissPrFindings, } from "../api.js";
+import { dismissPrFindings, dismissThreadsLine, } from "../api.js";
 import { loadConfig } from "../config.js";
 import { CommandError, REVIEW_EXIT } from "../errors.js";
 import { stackWatchObligation } from "../stack-watch-obligation.js";
@@ -110,6 +110,9 @@ export function formatDismissResult(result, watch) {
         }
         if (result.remaining.length)
             lines.push("Still open:", ...result.remaining.map(findingLine));
+        const threads = dismissThreadsLine(result);
+        if (threads)
+            lines.push(threads);
     }
     const seam = result.gate.seam;
     if (seam) {

package/dist/commands/memory.d.ts

@@ -0,0 +1,30 @@
+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;
+    repo?: string;
+    kind?: MemoryKind;
+    scope?: MemoryScope;
+    limit?: number;
+};
+export declare function parseMemoryFlags(args: string[], allowed: ReadonlyArray<"repo" | "kind" | "scope" | "limit">): 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,152 @@
+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 = [
+    "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 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.`,
+    "  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");
+}
+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 === "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"]);
+        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}.`]);
+        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.js

@@ -8,6 +8,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";
@@ -203,7 +204,8 @@ export const COMMAND_REGISTRY = [
             "  [--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 +219,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>] [--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",

package/dist/commands/settings.d.ts

@@ -3,7 +3,7 @@ import { type RepoSettings, type RepoSettingsPatch, type SettingsPatch, type Set
  * 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" | "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;
@@ -22,6 +22,7 @@ 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;

package/dist/commands/settings.js

@@ -14,7 +14,25 @@ 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",
 };
+export 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,18 +79,41 @@ 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 and --merge-queue-overdrive 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) {
     if (repos.length === 0)
@@ -149,6 +190,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" });