@mushi-mushi/cli 0.15.0 → 0.16.0

package/README.md

@@ -215,6 +215,77 @@ mushi fixes tail --report-id 11111111-2222-3333-4444-555555555555
 Exits automatically when the job reaches a terminal status (`completed`,
 `failed`, `cancelled`, `skipped`).
 
+### `mushi fixes merge <fixId>`
+
+Squash-merge (or merge/rebase) the fix PR on GitHub and run the same post-merge
+bookkeeping as the admin console: `merged_at`, report → **Fixed**, reporter
+notification, `fix.applied` webhooks.
+
+```bash
+mushi fixes merge 75199dde-f726-404a-b5f7-be17bf7a3a46
+mushi fixes merge <fixId> --method squash    # default
+mushi fixes merge <fixId> --method merge
+mushi fixes merge <fixId> --method rebase
+mushi fixes merge <fixId> --json
+```
+
+Requires an admin API key with `mcp:write` scope and a connected GitHub App or PAT.
+Draft PRs are auto-readied via GraphQL before merge.
+
+### `mushi fixes refresh-ci <fixId>`
+
+Pull the latest GitHub Actions check-run status on demand (same as **Refresh CI
+status** in the console). Useful when webhooks drop or you just pushed to the PR
+branch.
+
+```bash
+mushi fixes refresh-ci <fixId>
+mushi fixes refresh-ci <fixId> --json
+```
+
+---
+
+## QA coverage & TDD
+
+```bash
+mushi stories map --url https://your-app.com --wait
+mushi tdd gen <storyId> --mode review
+mushi tdd pending
+mushi tdd approve <qaStoryId>
+mushi tdd improve
+mushi qa stories
+mushi qa runs <storyId>
+mushi qa run <storyId>
+mushi qa audit
+```
+
+---
+
+## Skill pipelines
+
+```bash
+mushi skills list [--category workflow] [--search "fix"]
+mushi skills show workflow-fix-and-ship
+mushi skills sync
+
+mushi pipeline start <reportId> --skill workflow-fix-and-ship [--mode cloud|handoff]
+mushi pipeline watch <runId-or-prefix>
+mushi pipeline checkin <runId-or-prefix> --step 0 --status passed
+```
+
+---
+
+## Integrations & BYOK
+
+```bash
+mushi integrations list
+mushi integrations test slack|sentry|github
+mushi keys list
+MUSHI_BYOK_KEY=sk-ant-... mushi keys add --provider anthropic --label "Backup"
+mushi slack status
+mushi slack test
+```
+
 ## Security notes
 
 - `~/.mushirc` is written with mode `0o600` on Unix. Legacy configs with looser permissions are tightened on load.

package/dist/chunk-BCTHNCIY.js

@@ -0,0 +1,6 @@
+// src/version.ts
+var MUSHI_CLI_VERSION = true ? "0.16.0" : "0.0.0-dev";
+
+export {
+  MUSHI_CLI_VERSION
+};

package/dist/index.js

@@ -598,7 +598,7 @@ function getFrameworkFromPkg(pkg) {
 }
 
 // src/version.ts
-var MUSHI_CLI_VERSION = true ? "0.15.0" : "0.0.0-dev";
+var MUSHI_CLI_VERSION = true ? "0.16.0" : "0.0.0-dev";
 
 // src/init.ts
 var ENV_FILES = [".env.local", ".env"];
@@ -3302,6 +3302,79 @@ fixes.command("tail").description(
     }
   }
 });
+fixes.command("merge <fixId>").description(
+  "Squash-merge the fix PR on GitHub and mark the report Fixed (same as console merge)"
+).option(
+  "--method <method>",
+  "GitHub merge method: squash (default), merge, or rebase",
+  "squash"
+).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 method = opts.method;
+  if (!["squash", "merge", "rebase"].includes(method)) {
+    console.error("--method must be squash, merge, or rebase");
+    process.exit(1);
+  }
+  const result = await apiCall(`/v1/admin/fixes/${fixId}/merge`, config, {
+    method: "POST",
+    body: JSON.stringify({ mergeMethod: method })
+  });
+  if (!result.ok) {
+    if (opts.json) {
+      console.log(JSON.stringify({ ok: false, error: result.error }, null, 2));
+    } else {
+      console.error("Merge failed:", result.error.message);
+    }
+    process.exit(1);
+  }
+  const data = result.data ?? {};
+  if (opts.json) {
+    console.log(JSON.stringify({ ok: true, ...data }, null, 2));
+    return;
+  }
+  if (data.alreadyMerged) {
+    console.log(`PR was already merged. Report status: ${data.reportStatus ?? "unknown"}`);
+  } else {
+    console.log(`Merged successfully. Report status: ${data.reportStatus ?? "fixed"}`);
+  }
+});
+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();
+  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 = await apiCall(`/v1/admin/fixes/${fixId}/refresh-ci`, config, { method: "POST" });
+  if (!result.ok) {
+    if (opts.json) {
+      console.log(JSON.stringify({ ok: false, error: result.error }, null, 2));
+    } else {
+      console.error("CI refresh failed:", result.error.message);
+    }
+    process.exit(1);
+  }
+  const data = result.data ?? {};
+  if (opts.json) {
+    console.log(JSON.stringify({ ok: true, ...data }, null, 2));
+    return;
+  }
+  const status = data.check_run_status ?? "unknown";
+  const conclusion = data.check_run_conclusion ?? "\u2014";
+  const updated = data.check_run_updated_at ? new Date(data.check_run_updated_at).toISOString() : "\u2014";
+  console.log(`CI status: ${status} \xB7 conclusion: ${conclusion} \xB7 updated: ${updated}`);
+});
 var stories = program.command("stories").description("TDD story mapping and test generation");
 stories.command("map").description("Crawl a live app URL and automatically discover user stories (writes inventory proposal)").requiredOption("--url <url>", "Live app URL to crawl (e.g. https://your-app.vercel.app)").option("--max-pages <n>", "Max pages to crawl", "20").option("--provider <p>", "Crawl provider: firecrawl (default) or browserbase", "firecrawl").option("--cursor-refine", "Open a Cursor Cloud PR to refine the draft against repo code").option("--wait", "Wait for the crawl to complete and print results").action(async (opts) => {
   const config = loadConfig();

package/dist/init.js

@@ -8,7 +8,7 @@ import {
 } from "./chunk-NYPX5KXR.js";
 import {
   MUSHI_CLI_VERSION
-} from "./chunk-UTST6AEP.js";
+} from "./chunk-BCTHNCIY.js";
 
 // src/init.ts
 import * as p from "@clack/prompts";

package/dist/version.js

@@ -1,6 +1,6 @@
 import {
   MUSHI_CLI_VERSION
-} from "./chunk-UTST6AEP.js";
+} from "./chunk-BCTHNCIY.js";
 export {
   MUSHI_CLI_VERSION
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mushi-mushi/cli",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "license": "MIT",
   "description": "CLI for Mushi Mushi — `mushi init` wizard installs the right SDK for your framework, plus report triage and pipeline health commands",
   "bin": {

package/dist/chunk-UTST6AEP.js

@@ -1,6 +0,0 @@
-// src/version.ts
-var MUSHI_CLI_VERSION = true ? "0.15.0" : "0.0.0-dev";
-
-export {
-  MUSHI_CLI_VERSION
-};