@mutmutco/cli 3.68.0 → 3.69.0

package/dist/main.cjs

@@ -5003,6 +5003,7 @@ function buildPrMergeResultPayload(input) {
 function buildPrMergeArgs(input) {
   const args = ["pr", "merge", input.number, ...input.repoArgs, input.method];
   if (input.deleteBranch !== false) args.push("--delete-branch");
+  if (input.bodyFile) args.push("--body-file", input.bodyFile);
   if (input.auto) args.push("--auto");
   return args;
 }
@@ -7235,7 +7236,7 @@ function checkGateBudget(files, opts = {}) {
 }
 
 // src/project-model.ts
-var PROJECT_TYPES = ["web-app", "hub-service", "content", "desktop-app", "desktop-game", "non-deployable", "cli-tool", "worker"];
+var PROJECT_TYPES = ["web-app", "hub-service", "content", "desktop-app", "desktop-game", "mobile-app", "non-deployable", "cli-tool", "worker"];
 var DEPLOY_MODELS = ["hub-serverless", "serverless", "tenant-container", "solo-container", "registry-publish", "content", "none"];
 var RELEASE_TRACKS = ["full", "direct", "trunk"];
 var PROJECT_TYPE_SET = new Set(PROJECT_TYPES);
@@ -7272,7 +7273,7 @@ function resolveDeployModel(meta, repo) {
   const projectType = resolveProjectType(meta, repo);
   if (projectType === "content" || meta?.class === "content") return "content";
   if (projectType === "hub-service" || repoIsHub(repo)) return "hub-serverless";
-  if (projectType === "desktop-app" || projectType === "desktop-game" || projectType === "non-deployable") return "none";
+  if (projectType === "desktop-app" || projectType === "desktop-game" || projectType === "mobile-app" || projectType === "non-deployable") return "none";
   if (projectType === "cli-tool") return "registry-publish";
   return "tenant-container";
 }
@@ -8970,7 +8971,7 @@ async function executeWaveLand(plan, deps, opts = { preserveWorktree: true }) {
 }
 
 // src/index.ts
-var import_node_os10 = require("node:os");
+var import_node_os11 = require("node:os");
 
 // src/board.ts
 var import_node_child_process7 = require("node:child_process");
@@ -16548,6 +16549,43 @@ function evaluate(changed, policy, present = () => false) {
 function git(args, cwd) {
   return (0, import_node_child_process10.execFileSync)("git", args, { cwd, encoding: "utf8", maxBuffer: 32 * 1024 * 1024 });
 }
+var COAUTHOR_KEY = "Co-authored-by";
+var GH_MESSAGE_SEPARATOR = /^-{5,}$/;
+var LIFTED_KEYS = new RegExp(`^(?:${TRAILER_KEY}|${COAUTHOR_KEY}):`, "i");
+function parseTrailers(message, cwd) {
+  try {
+    return (0, import_node_child_process10.execFileSync)("git", ["interpret-trailers", "--parse", "--unfold"], {
+      cwd,
+      input: message,
+      encoding: "utf8",
+      maxBuffer: 4 * 1024 * 1024
+    }).split("\n").map((l) => l.trim()).filter(Boolean);
+  } catch {
+    return [];
+  }
+}
+function squashBodyWithOverride(commits, cwd) {
+  const overrides = [];
+  const coauthors = [];
+  const bodies = [];
+  for (const commit of commits) {
+    const message = `${commit.headline}
+
+${commit.body}`.trim();
+    for (const trailer of parseTrailers(message, cwd)) {
+      if (trailer.toLowerCase().startsWith(`${TRAILER_KEY.toLowerCase()}:`)) {
+        if (!overrides.includes(trailer)) overrides.push(trailer);
+      } else if (trailer.toLowerCase().startsWith(`${COAUTHOR_KEY.toLowerCase()}:`)) {
+        if (!coauthors.some((c) => c.toLowerCase() === trailer.toLowerCase())) coauthors.push(trailer);
+      }
+    }
+    const source = commits.length > 1 ? message : commit.body;
+    const kept = source.split("\n").filter((line) => !LIFTED_KEYS.test(line.trim()) && !GH_MESSAGE_SEPARATOR.test(line.trim())).join("\n").trim();
+    if (kept) bodies.push(kept);
+  }
+  if (!overrides.length) return null;
+  return [...bodies, [...overrides, ...coauthors].join("\n")].join("\n\n");
+}
 function resolveBase(cwd, explicit) {
   const candidates = [explicit, process.env.TEST_POLICY_BASE, "origin/development", "origin/main"].filter(Boolean);
   for (const ref of candidates) {
@@ -21350,6 +21388,7 @@ function registerBoardCommands(program3) {
 var import_node_fs27 = require("node:fs");
 var import_promises6 = require("node:fs/promises");
 var import_node_path26 = require("node:path");
+var import_node_os8 = require("node:os");
 var import_node_child_process12 = require("node:child_process");
 
 // src/board-advance.ts
@@ -22258,8 +22297,36 @@ ${err?.stdout ?? ""}`.split("\n").map((line) => line.trim()).find((line) => line
 var defaultGhMergeAutoIo = {
   gh: async (args, timeoutMs) => (await execFileP2("gh", args, { timeout: timeoutMs })).stdout
 };
+async function composeOverrideBodyFile(prNumber, repoArgs, gh) {
+  try {
+    const raw = await gh(["pr", "view", prNumber, ...repoArgs, "--json", "commits"], GC_GH_TIMEOUT_MS2);
+    const commits = JSON.parse(raw).commits ?? [];
+    const body = squashBodyWithOverride(commits.map((c) => ({ headline: c.messageHeadline ?? "", body: c.messageBody ?? "" })), process.cwd());
+    if (!body) return void 0;
+    const dir = (0, import_node_fs27.mkdtempSync)((0, import_node_path26.join)((0, import_node_os8.tmpdir)(), "mmi-squash-body-"));
+    const path2 = (0, import_node_path26.join)(dir, "body.txt");
+    (0, import_node_fs27.writeFileSync)(path2, `${body}
+`, "utf8");
+    return { path: path2, cleanup: () => {
+      try {
+        (0, import_node_fs27.rmSync)(dir, { recursive: true, force: true });
+      } catch {
+      }
+    } };
+  } catch {
+    return void 0;
+  }
+}
 async function ghMergeAutoEnqueue(prNumber, repo, method, io = defaultGhMergeAutoIo) {
   const args = repo ? ["--repo", repo] : [];
+  const overrideBody = await composeOverrideBodyFile(prNumber, args, io.gh);
+  try {
+    return await mergeAutoEnqueueWithBody(prNumber, args, method, io, overrideBody?.path);
+  } finally {
+    overrideBody?.cleanup();
+  }
+}
+async function mergeAutoEnqueueWithBody(prNumber, args, method, io, bodyFile) {
   const headRef = (await io.gh(["pr", "view", prNumber, ...args, "--json", "headRefName", "--jq", ".headRefName"], GC_GH_TIMEOUT_MS2).catch(() => "")).trim();
   const deleteBranch = !isProtectedBranch(headRef);
   const readMergeState = () => readGhPrStateWithRetry(
@@ -22278,7 +22345,7 @@ async function ghMergeAutoEnqueue(prNumber, repo, method, io = defaultGhMergeAut
         return s.ok && s.state === "MERGED";
       },
       reEnqueue: async () => {
-        await io.gh(buildPrMergeArgs({ number: prNumber, repoArgs: args, method, auto: true, deleteBranch }), GH_MUTATION_TIMEOUT_MS);
+        await io.gh(buildPrMergeArgs({ number: prNumber, repoArgs: args, method, auto: true, deleteBranch, bodyFile }), GH_MUTATION_TIMEOUT_MS);
       }
     });
     if (confirmation === "merged") return { mergeStatus: "merged" };
@@ -22286,7 +22353,7 @@ async function ghMergeAutoEnqueue(prNumber, repo, method, io = defaultGhMergeAut
     return { mergeStatus: "failed", error: "auto-merge did not stick \u2014 GitHub reported no autoMergeRequest after enqueue; retry once the PR has a pending check" };
   };
   try {
-    await io.gh(buildPrMergeArgs({ number: prNumber, repoArgs: args, method, auto: true, deleteBranch }), GH_MUTATION_TIMEOUT_MS);
+    await io.gh(buildPrMergeArgs({ number: prNumber, repoArgs: args, method, auto: true, deleteBranch, bodyFile }), GH_MUTATION_TIMEOUT_MS);
   } catch (e) {
     const message = String(e.message || "");
     if (/already been merged/i.test(message)) return { mergeStatus: "merged" };
@@ -22294,7 +22361,7 @@ async function ghMergeAutoEnqueue(prNumber, repo, method, io = defaultGhMergeAut
     if (note) return { mergeStatus: "failed", error: note };
     if (mergeAutoRejectedPrAlreadyClean(message)) {
       try {
-        await io.gh(buildPrMergeArgs({ number: prNumber, repoArgs: args, method, auto: false, deleteBranch }), GH_MUTATION_TIMEOUT_MS);
+        await io.gh(buildPrMergeArgs({ number: prNumber, repoArgs: args, method, auto: false, deleteBranch, bodyFile }), GH_MUTATION_TIMEOUT_MS);
       } catch (e2) {
         const m2 = String(e2.message || "");
         if (/already been merged/i.test(m2)) return { mergeStatus: "merged" };
@@ -22305,7 +22372,7 @@ async function ghMergeAutoEnqueue(prNumber, repo, method, io = defaultGhMergeAut
             return { mergeStatus: "failed", error: `could not confirm PR state after clean-status fallback: ${afterDirect.error}` };
           }
           try {
-            await io.gh(buildPrMergeArgs({ number: prNumber, repoArgs: args, method, auto: true, deleteBranch }), GH_MUTATION_TIMEOUT_MS);
+            await io.gh(buildPrMergeArgs({ number: prNumber, repoArgs: args, method, auto: true, deleteBranch, bodyFile }), GH_MUTATION_TIMEOUT_MS);
           } catch (e3) {
             const m3 = String(e3.message || "");
             if (/already been merged/i.test(m3)) return { mergeStatus: "merged" };
@@ -23829,7 +23896,7 @@ function registerDeployCommands(program3) {
 
 // src/discovery-commands.ts
 var import_node_fs31 = require("node:fs");
-var import_node_os8 = require("node:os");
+var import_node_os9 = require("node:os");
 var import_node_path29 = require("node:path");
 var GC_GH_TIMEOUT_MS3 = 2e4;
 async function collectStatus() {
@@ -24005,7 +24072,7 @@ async function collectOnboardStatus() {
     else if (top) nextCommand = `mmi-cli board claim ${top.number}  # ${top.title}`;
     else nextCommand = "mmi-cli board read \u2014 no claimable items found";
   }
-  const home = (0, import_node_os8.homedir)();
+  const home = (0, import_node_os9.homedir)();
   const plugin = onboardPluginGate({
     readKnown: () => readFileSyncSafe((0, import_node_path29.join)(home, ...KNOWN_MARKETPLACES_RELATIVE), import_node_fs31.readFileSync),
     readSettings: () => readFileSyncSafe((0, import_node_path29.join)(home, ".claude", "settings.json"), import_node_fs31.readFileSync)
@@ -25388,17 +25455,17 @@ function parseOriginRepo(remoteUrl) {
 }
 function ghHostsConfigPath(env, platform2) {
   const sep2 = platform2 === "win32" ? "\\" : "/";
-  const join26 = (...parts) => parts.join(sep2);
+  const join27 = (...parts) => parts.join(sep2);
   const explicit = env.GH_CONFIG_DIR?.trim();
-  if (explicit) return join26(explicit, "hosts.yml");
+  if (explicit) return join27(explicit, "hosts.yml");
   if (platform2 === "win32") {
     const appData = (env.AppData ?? env.APPDATA)?.trim();
-    return appData ? join26(appData, "GitHub CLI", "hosts.yml") : void 0;
+    return appData ? join27(appData, "GitHub CLI", "hosts.yml") : void 0;
   }
   const xdg = env.XDG_CONFIG_HOME?.trim();
-  if (xdg) return join26(xdg, "gh", "hosts.yml");
+  if (xdg) return join27(xdg, "gh", "hosts.yml");
   const home = env.HOME?.trim();
-  return home ? join26(home, ".config", "gh", "hosts.yml") : void 0;
+  return home ? join27(home, ".config", "gh", "hosts.yml") : void 0;
 }
 function parseGhHostsAccounts(yaml, host = "github.com") {
   let hostIndent = null;
@@ -25449,7 +25516,7 @@ function ghAccountCaveat(announcedLogin, accounts) {
 
 // src/doctor-io.ts
 var import_node_fs32 = require("node:fs");
-var import_node_os9 = require("node:os");
+var import_node_os10 = require("node:os");
 var import_node_path30 = require("node:path");
 var import_node_child_process13 = require("node:child_process");
 var import_node_util8 = require("node:util");
@@ -25458,7 +25525,7 @@ var MMI_PLUGIN_ID2 = "mmi@mutmutco";
 function installedClaudePluginVersion() {
   try {
     const file = JSON.parse(
-      (0, import_node_fs32.readFileSync)((0, import_node_path30.join)((0, import_node_os9.homedir)(), ".claude", "plugins", "installed_plugins.json"), "utf8")
+      (0, import_node_fs32.readFileSync)((0, import_node_path30.join)((0, import_node_os10.homedir)(), ".claude", "plugins", "installed_plugins.json"), "utf8")
     );
     const versions = (file.plugins?.[MMI_PLUGIN_ID2] ?? []).map((r) => r.version).filter((v) => Boolean(v));
     if (versions.length === 0) return void 0;
@@ -25567,7 +25634,7 @@ function envHealLockPath(home) {
 async function withEnvHealLock(what, run) {
   try {
     return await withFileLock(
-      envHealLockPath((0, import_node_os10.homedir)()),
+      envHealLockPath((0, import_node_os11.homedir)()),
       { staleMs: ENV_HEAL_LOCK_STALE_MS, maxWaitMs: ENV_HEAL_LOCK_MAX_WAIT_MS, label: "mmi env-heal lock" },
       run
     );
@@ -25662,9 +25729,9 @@ function mmiDoctorDeps(opts = {}) {
     },
     pluginCache: () => {
       const plan = buildPluginCachePlan(
-        (0, import_node_os10.homedir)(),
+        (0, import_node_os11.homedir)(),
         runningPluginVersion(process.env, resolveClientVersion()),
-        pluginCacheFsDeps((0, import_node_os10.homedir)(), () => 0)
+        pluginCacheFsDeps((0, import_node_os11.homedir)(), () => 0)
       );
       return {
         stale: plan.prune,
@@ -25713,7 +25780,7 @@ function mmiDoctorDeps(opts = {}) {
     // which branch it would pick one up from. Two local file reads, no network, fail-soft to no rows.
     marketplaceRows: () => {
       try {
-        const home = (0, import_node_os10.homedir)();
+        const home = (0, import_node_os11.homedir)();
         return marketplaceRows(
           MMI_MARKETPLACE_NAME,
           readFileSyncSafe((0, import_node_path31.join)(home, ...KNOWN_MARKETPLACES_RELATIVE), import_node_fs33.readFileSync),
@@ -27527,44 +27594,50 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
   let remoteDeleteAttempted = false;
   let upgradedToAuto = false;
   let remoteNotAttemptedReason = headIsProtected ? "protected-branch" : void 0;
-  await execFileP2("gh", buildPrMergeArgs({ number, repoArgs, method, auto: o.auto, deleteBranch: !headIsProtected }), { timeout: GH_MUTATION_TIMEOUT_MS }).catch(async (e) => {
-    const message = String(e.message || "");
-    if (/already been merged/i.test(message)) {
-      remoteNotAttemptedReason = "pr-already-merged";
-      return;
-    }
-    const note = timeoutKillNote(e, GH_MUTATION_TIMEOUT_MS);
-    if (note) throw new Error(`gh pr merge ${number}: ${note}`);
-    if (o.auto && mergeAutoRejectedPrAlreadyClean(message)) {
-      await execFileP2("gh", buildPrMergeArgs({ number, repoArgs, method, auto: false, deleteBranch: !headIsProtected }), { timeout: GH_MUTATION_TIMEOUT_MS }).catch((e2) => {
-        const m2 = String(e2.message || "");
-        if (/already been merged/i.test(m2)) {
-          remoteNotAttemptedReason = "pr-already-merged";
-          return;
-        }
-        const note2 = timeoutKillNote(e2, GH_MUTATION_TIMEOUT_MS);
-        if (note2) throw new Error(`gh pr merge ${number}: ${note2}`);
-        if (!ghPrMergeLocalBranchDeleteWarning(m2)) throw e2;
-      });
-      return;
-    }
-    if (!o.auto && basePolicyBlocksImmediateMerge(message)) {
-      console.warn(`pr merge: the base-branch policy blocks an immediate merge \u2014 upgrading to --auto (merges once required checks pass).`);
-      upgradedToAuto = true;
-      await execFileP2("gh", buildPrMergeArgs({ number, repoArgs, method, auto: true, deleteBranch: !headIsProtected }), { timeout: GH_MUTATION_TIMEOUT_MS }).catch((e2) => {
-        const m2 = String(e2.message || "");
-        if (/already been merged/i.test(m2)) {
-          remoteNotAttemptedReason = "pr-already-merged";
-          return;
-        }
-        const note2 = timeoutKillNote(e2, GH_MUTATION_TIMEOUT_MS);
-        if (note2) throw new Error(`gh pr merge ${number}: ${note2}`);
-        if (!ghPrMergeLocalBranchDeleteWarning(m2)) throw e2;
-      });
-      return;
-    }
-    if (!ghPrMergeLocalBranchDeleteWarning(message)) throw e;
-  });
+  const overrideBody = await composeOverrideBodyFile(number, repoArgs, async (a, t) => (await execFileP2("gh", a, { timeout: t })).stdout);
+  const bodyFile = overrideBody?.path;
+  try {
+    await execFileP2("gh", buildPrMergeArgs({ number, repoArgs, method, auto: o.auto, deleteBranch: !headIsProtected, bodyFile }), { timeout: GH_MUTATION_TIMEOUT_MS }).catch(async (e) => {
+      const message = String(e.message || "");
+      if (/already been merged/i.test(message)) {
+        remoteNotAttemptedReason = "pr-already-merged";
+        return;
+      }
+      const note = timeoutKillNote(e, GH_MUTATION_TIMEOUT_MS);
+      if (note) throw new Error(`gh pr merge ${number}: ${note}`);
+      if (o.auto && mergeAutoRejectedPrAlreadyClean(message)) {
+        await execFileP2("gh", buildPrMergeArgs({ number, repoArgs, method, auto: false, deleteBranch: !headIsProtected, bodyFile }), { timeout: GH_MUTATION_TIMEOUT_MS }).catch((e2) => {
+          const m2 = String(e2.message || "");
+          if (/already been merged/i.test(m2)) {
+            remoteNotAttemptedReason = "pr-already-merged";
+            return;
+          }
+          const note2 = timeoutKillNote(e2, GH_MUTATION_TIMEOUT_MS);
+          if (note2) throw new Error(`gh pr merge ${number}: ${note2}`);
+          if (!ghPrMergeLocalBranchDeleteWarning(m2)) throw e2;
+        });
+        return;
+      }
+      if (!o.auto && basePolicyBlocksImmediateMerge(message)) {
+        console.warn(`pr merge: the base-branch policy blocks an immediate merge \u2014 upgrading to --auto (merges once required checks pass).`);
+        upgradedToAuto = true;
+        await execFileP2("gh", buildPrMergeArgs({ number, repoArgs, method, auto: true, deleteBranch: !headIsProtected, bodyFile }), { timeout: GH_MUTATION_TIMEOUT_MS }).catch((e2) => {
+          const m2 = String(e2.message || "");
+          if (/already been merged/i.test(m2)) {
+            remoteNotAttemptedReason = "pr-already-merged";
+            return;
+          }
+          const note2 = timeoutKillNote(e2, GH_MUTATION_TIMEOUT_MS);
+          if (note2) throw new Error(`gh pr merge ${number}: ${note2}`);
+          if (!ghPrMergeLocalBranchDeleteWarning(m2)) throw e2;
+        });
+        return;
+      }
+      if (!ghPrMergeLocalBranchDeleteWarning(message)) throw e;
+    });
+  } finally {
+    overrideBody?.cleanup();
+  }
   const stateRead = await readGhPrStateWithRetry(
     () => execFileP2("gh", ["pr", "view", number, ...repoArgs, "--json", "state", "--jq", ".state"], { timeout: GC_GH_TIMEOUT_MS2 }).then((r) => r.stdout)
   );
@@ -28052,13 +28125,13 @@ function stagingApplyFsGuard(home) {
 }
 program2.command("plugin-prune").description(`prune stale cached MMI plugin versions (keeps running + newest, ${PLUGIN_CACHE_KEEP} total) and orphaned temp_git_* staging dirs; dry-run unless --apply (#2903, #2990)`).option("--apply", "actually delete the stale version dirs + orphaned staging dirs (default: report only)").option("--json", "machine-readable output").action((o) => {
   const plan = buildPluginCachePlan(
-    (0, import_node_os10.homedir)(),
+    (0, import_node_os11.homedir)(),
     runningPluginVersion(process.env, resolveClientVersion()),
-    pluginCacheFsDeps((0, import_node_os10.homedir)(), directoryBytes),
+    pluginCacheFsDeps((0, import_node_os11.homedir)(), directoryBytes),
     { withBytes: true }
   );
   const anythingToDelete = plan.prune.length > 0 || plan.staging.length > 0;
-  const result = o.apply && anythingToDelete ? applyPluginCachePlan(plan, (p) => (0, import_node_fs33.rmSync)(p, { recursive: true, force: true }), stagingApplyFsGuard((0, import_node_os10.homedir)())) : void 0;
+  const result = o.apply && anythingToDelete ? applyPluginCachePlan(plan, (p) => (0, import_node_fs33.rmSync)(p, { recursive: true, force: true }), stagingApplyFsGuard((0, import_node_os11.homedir)())) : void 0;
   const warnings = plan.prune.length > 0 ? [CONCURRENT_SESSION_WARNING] : [];
   if (o.json) console.log(JSON.stringify({ ...plan, warnings, applied: result ?? null }));
   else console.log(renderPluginCachePlan(plan, result));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "3.68.0",
+  "version": "3.69.0",
   "description": "MMI Future CLI — the org dev toolbox (board, registry, keyless secrets, release train, bootstrap, doctor) and the cross-IDE engine the plugin's session-start hook drives.",
   "type": "module",
   "license": "UNLICENSED",