@mutmutco/cli 3.47.0 → 3.48.1

package/dist/main.cjs

@@ -4547,12 +4547,37 @@ function isAgentScratchPath(path2) {
   const normalized = path2.replace(/\\/g, "/").trim();
   return /^tmp_[^/]+$/.test(normalized);
 }
+var PUSH_WALL_AGENT_CONFIG_DIRS = [".claude/", ".cursor/rules/", ".codex/", ".agents/"];
+function isUncommittableAgentConfigPath(path2) {
+  const normalized = path2.replace(/\\/g, "/").trim();
+  return PUSH_WALL_AGENT_CONFIG_DIRS.some((dir) => normalized === dir || normalized === dir.slice(0, -1) || normalized.startsWith(dir) || normalized.includes(`/${dir}`));
+}
+function splitPorcelainLine(line) {
+  return { status: line.slice(0, 2), path: line.slice(3).split(" -> ")[0]?.trim() ?? "" };
+}
+function isExemptPorcelainLine(status, path2) {
+  if (isAgentScratchPath(path2)) return true;
+  return status === "??" && isUncommittableAgentConfigPath(path2);
+}
+function porcelainBlockingPaths(porcelain) {
+  const blocking = [];
+  for (const line of porcelain.split("\n")) {
+    if (!line.trim()) continue;
+    const { status, path: path2 } = splitPorcelainLine(line);
+    if (path2 !== "" && !isExemptPorcelainLine(status, path2)) blocking.push(path2);
+  }
+  return blocking;
+}
 function porcelainHasBlockingChanges(porcelain) {
-  return porcelain.split("\n").some((line) => {
-    if (!line.trim()) return false;
-    const path2 = line.slice(3).split(" -> ")[0]?.trim() ?? "";
-    return path2 !== "" && !isAgentScratchPath(path2);
-  });
+  return porcelainBlockingPaths(porcelain).length > 0;
+}
+var BLOCKING_PATH_PREVIEW_LIMIT = 10;
+function describeBlockingPaths(porcelain) {
+  const paths = porcelainBlockingPaths(porcelain);
+  if (paths.length === 0) return "";
+  const shown = paths.slice(0, BLOCKING_PATH_PREVIEW_LIMIT);
+  const rest = paths.length - shown.length;
+  return ` \u2014 blocking: ${shown.join(", ")}${rest > 0 ? `, \u2026 and ${rest} more` : ""}`;
 }
 
 // src/local-train-sync.ts
@@ -9403,6 +9428,12 @@ var MANAGED_GITIGNORE_LINES = [
   "docs/superpowers/",
   ".playwright-mcp/",
   ".claude/worktrees/",
+  // #3425: local agent config the org push wall (`mmi-no-agent-files-org`) forbids committing, at any
+  // depth — leaving it untracked is the ONLY legal state, so it is pure `git status` noise. Only the two
+  // dirs no repo has cause to track: `.claude/` is excluded because MMI-Hub tracks `.claude/settings.json`,
+  // and `.cursor/rules/` because a repo may want its rules tracked despite the wall.
+  ".codex/",
+  ".agents/",
   // #2321 doctrine: the canonical worktree home is the SIBLING `../mmi-worktrees/<branch>` (outside the tree,
   // via `mmi-cli worktree create`), so a repo-local `.worktrees/` is NOT un-ignored org-wide — `mmi-cli
   // doctor` flags one explicitly instead (buildRepoLocalWorktreeCheck) rather than baking the fallback path
@@ -12042,7 +12073,12 @@ function consolidateCommandNamespaces(program3) {
 
 // src/version-lag.ts
 var VERSION_LABEL = "installed plugin/adapter cache freshness";
-var VERSION_FIX = "update the MMI plugin via /plugin; standalone npm CLI: npm install -g @mutmutco/cli@latest";
+function cliUpdateCommand(target) {
+  return `npm install -g @mutmutco/cli@${target ?? "latest"}`;
+}
+function versionFix(target) {
+  return `update the MMI plugin via /plugin; standalone npm CLI: ${cliUpdateCommand(target)}`;
+}
 function parseVersion(v) {
   const [coreRaw, prereleaseRaw = ""] = v.replace(/^v/, "").split("-", 2);
   const core = coreRaw.split(".").slice(0, 3).map((part) => {
@@ -12084,7 +12120,7 @@ function buildVersionLagReport(input) {
     return {
       ok: false,
       label: VERSION_LABEL,
-      fix: VERSION_FIX,
+      fix: versionFix(input.releasedVersion),
       currentVersion: input.currentVersion,
       repoVersion: input.repoVersion,
       releasedVersion: input.releasedVersion,
@@ -12095,7 +12131,7 @@ function buildVersionLagReport(input) {
     return {
       ok: false,
       label: VERSION_LABEL,
-      fix: VERSION_FIX,
+      fix: versionFix(),
       currentVersion: input.currentVersion,
       repoVersion: input.repoVersion,
       releasedVersion: input.releasedVersion,
@@ -12105,7 +12141,7 @@ function buildVersionLagReport(input) {
   return {
     ok: true,
     label: VERSION_LABEL,
-    fix: VERSION_FIX,
+    fix: versionFix(),
     currentVersion: input.currentVersion,
     repoVersion: input.repoVersion,
     releasedVersion: input.releasedVersion
@@ -12119,7 +12155,7 @@ function parseNpmVersion(stdout) {
   return /^\d+\.\d+\.\d+(-[0-9A-Za-z.-]+)?$/.test(v) ? v : void 0;
 }
 function staleTrainCliMessage(report, commandName) {
-  return `running mmi-cli ${report.currentVersion} is stale against released ${report.releasedVersion}; this is recoverable \u2014 run \`npm install -g @mutmutco/cli@latest\` to update to ${report.releasedVersion} (a standalone CLI shadows a plugin-provided mmi-cli on PATH and needs no Claude restart), then rerun ${commandName} so it uses the current train path. This gate runs before any train mutation, so this invocation changed nothing; any partial train state (local merge, pushed tag) is from an earlier run and the rerun resumes it safely`;
+  return `running mmi-cli ${report.currentVersion} is stale against released ${report.releasedVersion}; this is recoverable \u2014 run \`${cliUpdateCommand(report.releasedVersion)}\` to update to ${report.releasedVersion} (a standalone CLI shadows a plugin-provided mmi-cli on PATH and needs no Claude restart), then rerun ${commandName} so it uses the current train path. This gate runs before any train mutation, so this invocation changed nothing; any partial train state (local merge, pushed tag) is from an earlier run and the rerun resumes it safely`;
 }
 function versionAutoUpdateAction(report, releasedSource) {
   if (report.ok || report.staleAgainst !== "released") return "none";
@@ -12774,7 +12810,9 @@ function commandAuthorityLabel(owner) {
 }
 async function requireCleanTree(deps) {
   const status = await deps.run("git", ["status", "--porcelain"]);
-  if (porcelainHasBlockingChanges(status)) throw new Error("working tree must be clean before train apply");
+  if (porcelainHasBlockingChanges(status)) {
+    throw new Error(`working tree must be clean before train apply${describeBlockingPaths(status)}`);
+  }
 }
 async function requireBranch(deps, branch) {
   const current = clean2(await deps.run("git", ["rev-parse", "--abbrev-ref", "HEAD"]));
@@ -14468,6 +14506,24 @@ async function deriveHotfixVersion(deps) {
 function hotfixBranch(tag) {
   return `hotfix/${tag}`;
 }
+async function restoreAfterFailedPort(deps, opts) {
+  const { startBranch, branch, created } = opts;
+  if (!startBranch || startBranch === "HEAD" || startBranch === branch) {
+    return `Local state left as-is (could not determine the branch to return to).`;
+  }
+  try {
+    await deps.run("git", ["checkout", startBranch]);
+  } catch {
+    return `Could NOT return to ${startBranch} \u2014 the checkout is still on ${branch} (origin/main content); switch back before editing anything.`;
+  }
+  if (!created) return `Returned to ${startBranch}; the pre-existing local ${branch} was left in place.`;
+  try {
+    await deps.run("git", ["branch", "-D", branch]);
+    return `Returned to ${startBranch} and removed the local ${branch}.`;
+  } catch {
+    return `Returned to ${startBranch}; the local ${branch} could not be removed \u2014 delete it by hand.`;
+  }
+}
 async function resolveHotfixDeployModel(deps, ctx) {
   const load = await loadProjectMeta(deps, ctx);
   const meta = requireProjectMetaForTrain(load, ctx.repo);
@@ -14538,7 +14594,9 @@ async function runHotfixStart(deps, options) {
   const ctx = await buildTrainApplyContext(deps);
   const deployModel = await resolveHotfixDeployModel(deps, ctx);
   const status = await deps.run("git", ["status", "--porcelain"]);
-  if (porcelainHasBlockingChanges(status)) throw new Error("working tree must be clean before hotfix start");
+  if (porcelainHasBlockingChanges(status)) {
+    throw new Error(`working tree must be clean before hotfix start${describeBlockingPaths(status)}`);
+  }
   await deps.run("git", ["fetch", "origin", "--tags"]);
   const { tag, version } = await deriveHotfixVersion(deps);
   const branch = hotfixBranch(tag);
@@ -14564,12 +14622,17 @@ async function runHotfixStart(deps, options) {
     await deps.run("git", ["pull", "--ff-only", "origin", branch]);
     notes.push(`branch ${branch} already on origin \u2014 reused (cherry-pick/bump assumed present; PR step resumes)`);
   } else {
+    const startBranch = clean3(await deps.run("git", ["rev-parse", "--abbrev-ref", "HEAD"]));
+    const preexistingLocal = clean3(await deps.run("git", ["branch", "--list", branch]));
     await deps.run("git", ["checkout", "-B", branch, "origin/main"]);
     try {
       await deps.run("git", ["cherry-pick", "-x", sha]);
     } catch (e) {
       await deps.run("git", ["cherry-pick", "--abort"]);
-      throw new Error(`cherry-pick of ${label} onto ${branch} conflicted \u2014 aborted; resolve by hand on a manual hotfix branch, keeping the -x trailer (${e.message ?? e})`);
+      const recovery = await restoreAfterFailedPort(deps, { startBranch, branch, created: !preexistingLocal });
+      throw new Error(
+        `cherry-pick of ${label} onto ${branch} conflicted \u2014 aborted; nothing was pushed. Land the conflict resolution on development through a normal PR, then rerun \`mmi-cli hotfix start --from <that PR's merge sha>\` \u2014 never hand-resolve the port onto main. ${recovery} (${e.message ?? e})`
+      );
     }
     notes.push(`cherry-picked ${label} onto ${branch} (from origin/main, -x trailer recorded)`);
     if (deployModel === "hub-serverless") {
@@ -14651,7 +14714,9 @@ async function runHotfixRelease(deps, versionInput, options = {}) {
   const deployModel = await resolveHotfixDeployModel(deps, ctx);
   const { tag, version } = normalizeHotfixVersion(versionInput);
   const status = await deps.run("git", ["status", "--porcelain"]);
-  if (porcelainHasBlockingChanges(status)) throw new Error("working tree must be clean before hotfix release");
+  if (porcelainHasBlockingChanges(status)) {
+    throw new Error(`working tree must be clean before hotfix release${describeBlockingPaths(status)}`);
+  }
   await deps.run("git", ["fetch", "origin", "--tags"]);
   const pr2 = await findHotfixPr(deps, ctx, tag);
   if (!pr2) throw new Error(`no hotfix PR found for ${tag} (head ${hotfixBranch(tag)}, base main) \u2014 run mmi-cli hotfix start first`);
@@ -21810,10 +21875,11 @@ async function fetchNpmReleasedVersion() {
   }
 }
 var NPM_INSTALL_TIMEOUT_MS = 12e4;
-async function npmSelfUpdateCli() {
+async function npmSelfUpdateCli(target) {
+  const command = cliUpdateCommand(target);
   try {
-    await runHostBin("npm", ["install", "-g", "@mutmutco/cli@latest"], { timeout: NPM_INSTALL_TIMEOUT_MS });
-    return { ok: true, detail: "npm install -g @mutmutco/cli@latest exited 0" };
+    await runHostBin("npm", ["install", "-g", `@mutmutco/cli@${target ?? "latest"}`], { timeout: NPM_INSTALL_TIMEOUT_MS });
+    return { ok: true, detail: `${command} exited 0` };
   } catch (e) {
     return { ok: false, detail: e.message.trim().slice(0, 200).replace(/\s+/g, " ") };
   }
@@ -23318,7 +23384,7 @@ async function runDoctorClean(opts, io, deps) {
   const cliInput = { currentVersion: deps.currentCliVersion(), releasedVersion: released };
   const cliReport = buildVersionLagReport(cliInput);
   if (apply && deps.updateCli && versionAutoUpdateAction(cliReport) === "npm") {
-    const heal = await deps.updateCli();
+    const heal = await deps.updateCli(cliReport.releasedVersion);
     const healEvidence = [`running:  ${cliReport.currentVersion}`, `published: ${cliReport.releasedVersion}`, `heal: ${heal.detail}`];
     checks.push(heal.ok ? {
       ok: true,
@@ -23328,7 +23394,7 @@ async function runDoctorClean(opts, io, deps) {
     } : {
       ok: false,
       label: `mmi-cli ${cliReport.currentVersion} \u2192 ${cliReport.releasedVersion}`,
-      fix: `self-update failed (${heal.detail}) \u2014 run \`npm install -g @mutmutco/cli@latest\``,
+      fix: `self-update failed (${heal.detail}) \u2014 run \`${cliUpdateCommand(cliReport.releasedVersion)}\``,
       verbose: healEvidence
     });
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "3.47.0",
+  "version": "3.48.1",
   "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",