@mushi-mushi/cli 0.30.6 → 0.32.0

package/dist/{chunk-YAF2NATT.js → chunk-3YMPNCJ4.js}

@@ -2,7 +2,7 @@
 import {
   MUSHI_CLI_VERSION,
   MUSHI_MCP_PIN_SPEC
-} from "./chunk-D7ZVFRYW.js";
+} from "./chunk-XIB5NTHP.js";
 import {
   CLOUD_API_ENDPOINT,
   assertEndpoint,

package/dist/{chunk-BNO37ZO5.js → chunk-7PSMATX3.js}

@@ -1,6 +1,6 @@
 import {
   MUSHI_CLI_VERSION
-} from "./chunk-QR6NCHXT.js";
+} from "./chunk-MARVQVJC.js";
 import {
   assertEndpoint,
   normalizeEndpoint

package/dist/chunk-MARVQVJC.js

@@ -0,0 +1,8 @@
+// src/version.ts
+var MUSHI_CLI_VERSION = true ? "0.32.0" : "0.0.0-dev";
+var MUSHI_MCP_PIN_SPEC = "@mushi-mushi/mcp@0.28.0";
+
+export {
+  MUSHI_CLI_VERSION,
+  MUSHI_MCP_PIN_SPEC
+};

package/dist/chunk-XIB5NTHP.js

@@ -0,0 +1,10 @@
+#!/usr/bin/env node
+
+// src/version.ts
+var MUSHI_CLI_VERSION = true ? "0.32.0" : "0.0.0-dev";
+var MUSHI_MCP_PIN_SPEC = "@mushi-mushi/mcp@0.28.0";
+
+export {
+  MUSHI_CLI_VERSION,
+  MUSHI_MCP_PIN_SPEC
+};

package/dist/{connect-D7FYRBAP.js → connect-JWNAYQEU.js}

@@ -2,8 +2,8 @@
 import {
   resolveSdkEnvKey,
   runConnect
-} from "./chunk-YAF2NATT.js";
-import "./chunk-D7ZVFRYW.js";
+} from "./chunk-3YMPNCJ4.js";
+import "./chunk-XIB5NTHP.js";
 import "./chunk-LGGE3LH7.js";
 import "./chunk-KOBEOGNF.js";
 export {

package/dist/{connect-YKI7VZMP.js → connect-MINIBKHX.js}

@@ -6,10 +6,10 @@ import {
   saveConfig,
   savedSdkKeyFor,
   waitForIngestReady
-} from "./chunk-BNO37ZO5.js";
+} from "./chunk-7PSMATX3.js";
 import {
   MUSHI_MCP_PIN_SPEC
-} from "./chunk-QR6NCHXT.js";
+} from "./chunk-MARVQVJC.js";
 import {
   detectFramework,
   envVarsToWrite,

package/dist/index.js

@@ -54,11 +54,11 @@ import {
   syncKeychainAfterKeyChange,
   trySaveKeyToKeychain,
   writeMcpServerEntry
-} from "./chunk-YAF2NATT.js";
+} from "./chunk-3YMPNCJ4.js";
 import {
   MUSHI_CLI_VERSION,
   MUSHI_MCP_PIN_SPEC
-} from "./chunk-D7ZVFRYW.js";
+} from "./chunk-XIB5NTHP.js";
 import {
   CLOUD_API_ENDPOINT,
   CLOUD_MCP_OAUTH_URL,
@@ -1546,7 +1546,7 @@ async function checkOnboardingStatus(config, _consoleBase, cwd, doFetch = global
 }
 async function checkVersionDrift(cwd, doFetch) {
   const checks = [];
-  const { MUSHI_CLI_VERSION: MUSHI_CLI_VERSION2 } = await import("./version-NJJQDMYO.js");
+  const { MUSHI_CLI_VERSION: MUSHI_CLI_VERSION2 } = await import("./version-AX72RMKE.js");
   if (MUSHI_CLI_VERSION2 === "0.0.0-dev") return checks;
   const parse2 = (v) => {
     const m = v.replace(/^[~^]/, "").match(/^(\d+)\.(\d+)\.(\d+)/);
@@ -2470,7 +2470,7 @@ async function maybeOfferConnect(credentials, options, _consoleBase) {
   if (p.isCancel(answer) || !answer) return;
   const endpoint = resolveCloudEndpoint(options.endpoint);
   try {
-    const { runConnect: runConnect2 } = await import("./connect-D7FYRBAP.js");
+    const { runConnect: runConnect2 } = await import("./connect-JWNAYQEU.js");
     const saved = loadConfig();
     const result = await runConnect2(
       {
@@ -4521,6 +4521,9 @@ Examples:
     "--method <method>",
     "GitHub merge method: squash (default), merge, or rebase",
     "squash"
+  ).option(
+    "--override",
+    'Not available here: the CLI signs in with an API key, and only a person in the Mushi console can override an Opus "hold" (with a reason)'
   ).option("--json", "Machine-readable JSON output").action(async (fixId, opts) => {
     const config = loadConfig();
     if (!config.apiKey) {
@@ -4531,6 +4534,12 @@ Examples:
       console.error("No endpoint configured. Run `mushi init`");
       process.exit(1);
     }
+    if (opts.override) {
+      console.error(
+        'Overriding an Opus "hold" needs a person in the Mushi console: open the fix, read the findings, and choose Merge anyway with a reason. The CLI signs in with an API key, which cannot override (ADR 0030).'
+      );
+      process.exit(1);
+    }
     const method = opts.method;
     if (!["squash", "merge", "rebase"].includes(method)) {
       console.error("--method must be squash, merge, or rebase");
@@ -4545,6 +4554,9 @@ Examples:
         console.log(JSON.stringify({ ok: false, error: result.error }, null, 2));
       } else {
         console.error("Merge failed:", result.error.message);
+        if (result.error.code === "REVIEW_HOLD") {
+          console.error(`Read the review: mushi fixes review ${fixId} --show. To merge anyway, override the hold in the Mushi console (with a reason).`);
+        }
       }
       process.exit(1);
     }
@@ -4558,6 +4570,46 @@ Examples:
     } else {
       console.log(`Merged successfully. Report status: ${data.reportStatus ?? "fixed"}`);
     }
+    if (data.review) {
+      console.log(`${data.review.label}${data.review.overridden ? " (overridden)" : ""}`);
+    }
+  });
+  function printReview(review) {
+    console.log(review.label);
+    if (review.reason) console.log(review.reason);
+    if (review.summary) console.log(`
+${review.summary}`);
+    for (const f of review.findings) {
+      const where = f.file === "(general)" ? "" : ` ${f.file}${f.line ? `:${f.line}` : ""}`;
+      console.log(`  - ${f.severity}${where}: ${f.issue} Fix: ${f.suggested_fix}`);
+    }
+    for (const r of review.removesBehavior) console.log(`  - removes: ${r}`);
+    if (review.needsHumanDecision) console.log(`Needs your decision: ${review.needsHumanDecision}`);
+    if (review.commentUrl) console.log(`On GitHub: ${review.commentUrl}`);
+  }
+  fixes.command("review <fixId>").description("Re-run the Opus review of a fix PR (ADR 0030), or show the current one with --show").option("--show", "Show the current review instead of starting a new one").option("--json", "Machine-readable JSON output").action(async (fixId, opts) => {
+    const config = loadConfig();
+    if (!config.apiKey) {
+      console.error("Run `mushi login` first");
+      process.exit(1);
+    }
+    if (!config.endpoint) {
+      console.error("No endpoint configured. Run `mushi init`");
+      process.exit(1);
+    }
+    const result = opts.show ? await apiCall(`/v1/admin/fixes/${fixId}/timeline`, config) : await apiCall(`/v1/admin/fixes/${fixId}/review`, config, { method: "POST" });
+    if (!result.ok) {
+      if (opts.json) console.log(JSON.stringify({ ok: false, error: result.error }, null, 2));
+      else console.error(opts.show ? "Could not read the review:" : "Review not started:", result.error.message);
+      process.exit(1);
+    }
+    const review = result.data?.review;
+    if (opts.json) {
+      console.log(JSON.stringify({ ok: true, review: review ?? null }, null, 2));
+      return;
+    }
+    if (!opts.show) console.log("Review queued. It takes a few minutes; check with --show.");
+    if (review) printReview(review);
   });
   fixes.command("refresh-ci <fixId>").description("Pull latest GitHub Actions check-run status for a fix attempt (on-demand ci-sync)").option("--json", "Machine-readable JSON output").action(async (fixId, opts) => {
     const config = loadConfig();
@@ -5322,6 +5374,31 @@ Approve: mushi tdd approve <id>`);
   });
 }
 
+// src/spend-down.ts
+function wholeNumber(raw, flag, min, max) {
+  const n = Number(raw);
+  if (!Number.isInteger(n) || n < min || n > max) throw new Error(`${flag} must be a whole number from ${min} to ${max}`);
+  return n;
+}
+function spendDownBody(flags) {
+  if (flags.on && flags.off) throw new Error("Pass --on or --off, not both");
+  const body = {};
+  if (flags.on) body.enabled = true;
+  if (flags.off) body.enabled = false;
+  if (flags.expires !== void 0) body.creditsExpireAt = flags.expires;
+  if (flags.model !== void 0) body.model = flags.model === "" ? null : flags.model;
+  if (flags.perDay !== void 0) body.dailyLimit = wholeNumber(flags.perDay, "--per-day", 1, 200);
+  if (flags.windowDays !== void 0) body.windowDays = wholeNumber(flags.windowDays, "--window-days", 1, 90);
+  return Object.keys(body).length > 0 ? body : null;
+}
+function spendDownStatusLine(k) {
+  const name = `${k.label ?? "(no label)"} ${k.keyHint ?? ""}`.trim();
+  const expires = k.creditsExpireAt ? k.creditsExpireAt.slice(0, 10) : "not set";
+  const model = k.model ?? "app default";
+  const apps = k.projects.length > 0 ? k.projects.map((p3) => p3.name).join(", ") : "none";
+  return `${name} [${k.scope}] ${k.state} \xB7 ${k.dispatchedToday}/${k.dailyLimit} today \xB7 credits expire ${expires} \xB7 model ${model} \xB7 pays for ${apps} \u2014 ${k.id}`;
+}
+
 // src/commands/keys.ts
 function registerKeysCommands(program2) {
   const keys = program2.command("keys").description("Manage API key pool (BYOK)");
@@ -5501,6 +5578,59 @@ function registerKeysCommands(program2) {
     );
     console.log(`  ${res.data.validation.detail}`);
   });
+  keys.command("spend-down [key-id]").description(
+    "Spend down expiring Cursor credits on open bugs (ADR 0028): show status, or set it for one key"
+  ).option("--on", "Turn spend-down on (needs --expires once)").option("--off", "Turn spend-down off").option("--expires <date>", "When the credits expire, YYYY-MM-DD").option("--model <spec>", "Cursor model, e.g. 'grok-4.7?reasoning_effort=xhigh&context=500k' ('' = app default)").option("--per-day <n>", "Fixes per day across the apps this key pays for (1-200)").option("--window-days <n>", "Start this many days before the credits expire (1-90)").option("--json", "Output as JSON (alias for -o json)").action(async (keyId, opts) => {
+    const config = loadConfig();
+    if (!config.apiKey || !config.projectId) {
+      console.error("Run `mushi login` first");
+      process.exit(1);
+    }
+    let body;
+    try {
+      body = spendDownBody(opts);
+    } catch (err) {
+      console.error(`Error: ${err.message}`);
+      process.exit(1);
+    }
+    if (keyId && body) {
+      const res2 = await apiCall(
+        `/v1/admin/byok/keys/${encodeURIComponent(keyId)}/spend-down`,
+        config,
+        { method: "PATCH", body: JSON.stringify(body) }
+      );
+      if (!res2.ok) {
+        console.error(`Error: ${res2.error.message}`);
+        process.exit(1);
+      }
+      console.log(
+        `\u2713 Spend-down ${res2.data.enabled ? "on" : "off"}${res2.data.creditsExpireAt ? `, credits expire ${res2.data.creditsExpireAt.slice(0, 10)}` : ""} \u2014 id: ${res2.data.id}`
+      );
+      return;
+    }
+    if (keyId && !body) {
+      console.error("Nothing to change: pass --on, --off, --expires, --model, --per-day or --window-days");
+      process.exit(1);
+    }
+    const res = await apiCall(
+      `/v1/admin/byok/spend-down?project_id=${encodeURIComponent(config.projectId)}`,
+      config
+    );
+    if (!res.ok) {
+      console.error(`Error: ${res.error.message}`);
+      process.exit(1);
+    }
+    printResult(res.data, {
+      json: opts.json,
+      render(d) {
+        if (d.keys.length === 0) {
+          console.log("No Cursor key for this project. Add one with `mushi keys add --provider cursor`.");
+          return;
+        }
+        for (const k of d.keys) console.log(spendDownStatusLine(k));
+      }
+    });
+  });
   keys.command("remove <key-id>").description("Permanently remove one pooled key and its Vault secret").action(async (keyId) => {
     const config = loadConfig();
     if (!config.apiKey || !config.projectId) {

package/dist/init.js

@@ -25,10 +25,10 @@ import {
   saveConfig,
   savedSdkKeyFor,
   trySaveKeyToKeychain
-} from "./chunk-BNO37ZO5.js";
+} from "./chunk-7PSMATX3.js";
 import {
   MUSHI_CLI_VERSION
-} from "./chunk-QR6NCHXT.js";
+} from "./chunk-MARVQVJC.js";
 import {
   FRAMEWORKS,
   detectFramework,
@@ -2058,7 +2058,7 @@ async function maybeOfferConnect(credentials, options, _consoleBase) {
   if (p.isCancel(answer) || !answer) return;
   const endpoint = resolveCloudEndpoint(options.endpoint);
   try {
-    const { runConnect } = await import("./connect-YKI7VZMP.js");
+    const { runConnect } = await import("./connect-MINIBKHX.js");
     const saved = loadConfig();
     const result = await runConnect(
       {

package/dist/{version-NJJQDMYO.js → version-AX72RMKE.js}

@@ -2,7 +2,7 @@
 import {
   MUSHI_CLI_VERSION,
   MUSHI_MCP_PIN_SPEC
-} from "./chunk-D7ZVFRYW.js";
+} from "./chunk-XIB5NTHP.js";
 export {
   MUSHI_CLI_VERSION,
   MUSHI_MCP_PIN_SPEC

package/dist/version.d.ts

@@ -14,6 +14,6 @@ declare const MUSHI_CLI_VERSION: string;
  * setup refreshes the pin. Synced to packages/mcp/package.json by
  * `scripts/sync-mcp-pin.mjs` — never hand-edit the version.
  */
-declare const MUSHI_MCP_PIN_SPEC = "@mushi-mushi/mcp@0.26.1";
+declare const MUSHI_MCP_PIN_SPEC = "@mushi-mushi/mcp@0.28.0";
 
 export { MUSHI_CLI_VERSION, MUSHI_MCP_PIN_SPEC };

package/dist/version.js

@@ -1,7 +1,7 @@
 import {
   MUSHI_CLI_VERSION,
   MUSHI_MCP_PIN_SPEC
-} from "./chunk-QR6NCHXT.js";
+} from "./chunk-MARVQVJC.js";
 export {
   MUSHI_CLI_VERSION,
   MUSHI_MCP_PIN_SPEC

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mushi-mushi/cli",
-  "version": "0.30.6",
+  "version": "0.32.0",
   "license": "MIT",
   "description": "Mushi CLI: SDK setup, MCP wiring, bug triage. The bug mediator for AI-built apps: plain-English diagnosis + a ready fix, in your editor.",
   "bin": {

package/dist/chunk-D7ZVFRYW.js

@@ -1,10 +0,0 @@
-#!/usr/bin/env node
-
-// src/version.ts
-var MUSHI_CLI_VERSION = true ? "0.30.6" : "0.0.0-dev";
-var MUSHI_MCP_PIN_SPEC = "@mushi-mushi/mcp@0.26.1";
-
-export {
-  MUSHI_CLI_VERSION,
-  MUSHI_MCP_PIN_SPEC
-};

package/dist/chunk-QR6NCHXT.js

@@ -1,8 +0,0 @@
-// src/version.ts
-var MUSHI_CLI_VERSION = true ? "0.30.6" : "0.0.0-dev";
-var MUSHI_MCP_PIN_SPEC = "@mushi-mushi/mcp@0.26.1";
-
-export {
-  MUSHI_CLI_VERSION,
-  MUSHI_MCP_PIN_SPEC
-};