@mutmutco/cli 3.14.0 → 3.16.0

package/dist/main.cjs

@@ -6299,30 +6299,54 @@ async function registerDeferredWorktree(store, entry) {
   return { entries, newlyRegistered: true };
 }
 async function sweepDeferredWorktrees(store, deps) {
-  if (!store) return { removed: [], stillDeferred: [] };
+  if (!store) return { removed: [], stillDeferred: [], skipped: [] };
   const entries = await store.read();
-  if (!entries.length) return { removed: [], stillDeferred: [] };
+  if (!entries.length) return { removed: [], stillDeferred: [], skipped: [] };
+  let live;
+  try {
+    live = parseWorktreePorcelain(await deps.git(["worktree", "list", "--porcelain"]));
+  } catch {
+    live = [];
+  }
   const removed = [];
   const stillDeferred = [];
+  const skipped = [];
   for (const entry of entries) {
+    const current = live.find((w) => samePath(w.path, entry.path));
+    if (current && current.branch !== entry.branch) {
+      skipped.push(entry);
+      continue;
+    }
+    if (current) {
+      const dirty = (await deps.git(["-C", entry.path, "status", "--porcelain"]).catch(() => "dirty") || "").trim().length > 0;
+      if (dirty) {
+        stillDeferred.push(entry);
+        continue;
+      }
+    }
     const outcome = await removeWorktreeWithRecovery(entry.path, deps);
     if (outcome.status === "removed") removed.push(entry.path);
     else stillDeferred.push(entry);
   }
   await store.write(stillDeferred);
-  return { removed, stillDeferred };
+  return { removed, stillDeferred, skipped };
 }
 async function sweepDeferredWorktreesWithRetry(store, deps, opts = {}) {
   const attempts = opts.attempts ?? 4;
   const backoff = opts.backoffMs ?? [500, 2e3, 5e3, 1e4];
   const sleep = opts.sleep ?? defaultSleep;
-  let last = { removed: [], stillDeferred: [] };
+  const removed = [];
+  const skipped = [];
+  let stillDeferred = [];
   for (let i = 0; i < attempts; i++) {
-    last = await sweepDeferredWorktrees(store, deps);
-    if (!last.stillDeferred.length) return last;
+    const result = await sweepDeferredWorktrees(store, deps);
+    removed.push(...result.removed);
+    skipped.push(...result.skipped);
+    stillDeferred = result.stillDeferred;
+    if (!stillDeferred.length) break;
     if (i < attempts - 1) await sleep(backoff[Math.min(i, backoff.length - 1)]);
   }
-  return last;
+  return { removed, stillDeferred, skipped };
 }
 var defaultSleep = (ms) => new Promise((resolve5) => setTimeout(resolve5, ms));
 async function removeWorktreeWithRecovery(wtPath, deps) {
@@ -6456,6 +6480,9 @@ function basePolicyBlocksImmediateMerge(message) {
 function ghPrMergeLocalBranchDeleteWarning(message) {
   return /used by worktree|cannot delete branch/i.test(message);
 }
+function mergeAutoRejectedPrAlreadyClean(message) {
+  return /clean status \(enablePullRequestAutoMerge\)|is in clean status/i.test(message);
+}
 async function checkRemoteBranchExists(branch, deps, options = {}) {
   if (!branch) return void 0;
   try {
@@ -11313,6 +11340,17 @@ async function preflight(deps, ctx, stage2, meta) {
     throw new Error(`${ctx.repo} is not Hub-deployed (deployModel=none) \u2014 the release train does not apply; use the project's own release path`);
   }
   await deps.runSelf(["secrets", "preflight", "--stage", stage2, "--repo", ctx.repo]);
+  if (stage2 === "main" && (model === "registry-publish" || meta.publishRequired === true)) {
+    const publishDir = typeof meta.publishDir === "string" && meta.publishDir.trim() ? meta.publishDir.trim() : ".";
+    const publishArgs = ["publish", ...publishDir !== "." ? [`./${publishDir}`] : [], "--dry-run", "--ignore-scripts"];
+    try {
+      await deps.run("npm", publishArgs);
+    } catch (e) {
+      throw new Error(
+        `${ctx.repo}: pre-tag publish dry run failed for '${publishDir}' (npm ${publishArgs.join(" ")}) \u2014 refusing to tag a release that would fail to publish (#2753). Fix the publish surface (deleted dir, malformed package.json, missing files), then rerun. Underlying error: ${e instanceof Error ? e.message : String(e)}`
+      );
+    }
+  }
   return model;
 }
 async function preflightMergeToMain(deps, deployModel, remoteRef, blockingPrefix, realignMessage) {
@@ -18584,6 +18622,15 @@ function parseLinkedIssues(body) {
   }
   return [...refs].sort((a, b) => Number(a.slice(1)) - Number(b.slice(1)));
 }
+function parseClosingIssues(body) {
+  const refs = /* @__PURE__ */ new Set();
+  const re = /\b(?:close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)\s+#(\d+)\b/gi;
+  let m;
+  while ((m = re.exec(body)) !== null) {
+    refs.add(`#${m[1]}`);
+  }
+  return [...refs].sort((a, b) => Number(a.slice(1)) - Number(b.slice(1)));
+}
 function assertPositiveInt(label, n) {
   const num = Number(n);
   if (!Number.isInteger(num) || num <= 0) {
@@ -19114,6 +19161,18 @@ function checkClaudePlugin(probe) {
   }
   return { ok: true, label: installed ? `Claude plugin ${installed}` : "Claude plugin" };
 }
+function checkTrainSync(result) {
+  const problems = result.branches.filter((b) => b.status === "skipped" && (b.reason === "diverged" || b.reason === "ff-failed"));
+  if (problems.length) {
+    return { ok: false, label: "train branches", fix: problems.map((b) => b.note).join("; ") };
+  }
+  const moved = result.branches.filter((b) => b.status === "synced");
+  return {
+    ok: true,
+    label: "train branches",
+    detail: moved.length ? `fast-forwarded ${moved.map((b) => b.branch).join(", ")}` : void 0
+  };
+}
 function planGitignore(current) {
   const { content, changed } = upsertManagedGitignoreBlock(current);
   return changed ? { ok: false, content } : { ok: true };
@@ -19152,6 +19211,11 @@ async function runDoctorClean(opts, io, deps) {
   checks.push(plugin);
   if (!plugin.ok) restartPending = true;
   if (isOrgRepo && !opts.fast && !opts.banner) {
+    try {
+      checks.push(checkTrainSync(await deps.syncTrain()));
+    } catch (e) {
+      checks.push({ ok: false, label: "train branches", fix: `sync failed \u2014 ${e instanceof Error ? e.message : String(e)}` });
+    }
     const repoRoot2 = await deps.repoRoot();
     try {
       const plan = await deps.gcPlan("origin", 200);
@@ -19286,6 +19350,27 @@ function repoFromSelector2(selector) {
 async function loadConfigForBoardSelector(selector, repoOption) {
   return loadConfigForRepo(repoFromSelector2(selector) ?? repoOption);
 }
+async function advanceClosedIssuesToDone(prNumber, repoOption) {
+  const repoArgs = repoOption ? ["--repo", repoOption] : [];
+  let body;
+  try {
+    body = (await execFileP2("gh", ["pr", "view", prNumber, ...repoArgs, "--json", "body", "--jq", ".body"], { timeout: GC_GH_TIMEOUT_MS5 })).stdout;
+  } catch {
+    return void 0;
+  }
+  const closing = parseClosingIssues(body ?? "");
+  if (closing.length === 0) return void 0;
+  const results = [];
+  for (const ref of closing) {
+    try {
+      const moved = await moveBoardItem({ config: await loadConfigForBoardSelector(ref, repoOption), selector: ref, status: "Done", repo: repoOption, allowPartial: true });
+      results.push(moved.partial ? { issue: ref, moved: false, error: moved.warning } : { issue: ref, moved: true });
+    } catch (e) {
+      results.push({ issue: ref, moved: false, error: e.message });
+    }
+  }
+  return results;
+}
 function renderGcApplyResult(result) {
   const lines = ["gc apply result:"];
   lines.push(`  branches removed: ${result.removedBranches.length ? result.removedBranches.join(", ") : "none"}`);
@@ -19394,6 +19479,7 @@ async function applyGcPlan(plan, remote) {
   }
   return result;
 }
+var execFileGitRun = async (file, args) => (await execFileP2(file, args, { timeout: GIT_TIMEOUT_MS })).stdout;
 function mmiDoctorDeps() {
   return {
     githubLogin,
@@ -19408,7 +19494,10 @@ function mmiDoctorDeps() {
     repoRoot,
     gcPlan,
     applyGcPlan,
-    executeScratchGc: (root, o) => executeScratchGc(root, { apply: o.apply })
+    executeScratchGc: (root, o) => executeScratchGc(root, { apply: o.apply }),
+    // #2759: same fetch+ff-only sync SessionStart runs, wired here too so an on-demand `mmi-cli doctor`
+    // self-heals a checkout a long-running session left stale.
+    syncTrain: () => syncLocalTrainBranches(execFileGitRun)
   };
 }
 async function requireFreshTrainCli(commandName) {
@@ -19567,10 +19656,11 @@ gcCmd.command("sweep-deferred").description("retry IDE-locked deferred worktree
       worktreeRemoveDeps(async (args) => (await execFileP2("git", args, { timeout: GIT_TIMEOUT_MS })).stdout)
     );
     if (o.json) return console.log(JSON.stringify(result));
-    if (!o.quiet || result.removed.length || result.stillDeferred.length) {
+    if (!o.quiet || result.removed.length || result.stillDeferred.length || result.skipped.length) {
       if (result.removed.length) console.log(`gc sweep-deferred: removed ${result.removed.length} worktree(s)`);
       if (result.stillDeferred.length) console.log(`gc sweep-deferred: ${result.stillDeferred.length} still queued (will retry on next session)`);
-      if (!result.removed.length && !result.stillDeferred.length) console.log("gc sweep-deferred: nothing queued");
+      if (result.skipped.length) console.log(`gc sweep-deferred: ${result.skipped.length} dropped (repurposed for different work since queued, left untouched)`);
+      if (!result.removed.length && !result.stillDeferred.length && !result.skipped.length) console.log("gc sweep-deferred: nothing queued");
     }
   } catch (e) {
     fail(`gc sweep-deferred: ${e.message}`);
@@ -20922,6 +21012,21 @@ async function ghMergeAutoEnqueue(prNumber, repo, method) {
     if (/already been merged/i.test(message)) return { mergeStatus: "merged" };
     const note = timeoutKillNote(e, GH_MUTATION_TIMEOUT_MS);
     if (note) return { mergeStatus: "failed", error: note };
+    if (mergeAutoRejectedPrAlreadyClean(message)) {
+      try {
+        await execFileP2("gh", buildPrMergeArgs({ number: prNumber, repoArgs: args, method, auto: false }), { timeout: GH_MUTATION_TIMEOUT_MS });
+      } catch (e2) {
+        const m2 = String(e2.message || "");
+        if (/already been merged/i.test(m2)) return { mergeStatus: "merged" };
+        if (!ghPrMergeLocalBranchDeleteWarning(m2)) return { mergeStatus: "failed", error: m2.split("\n")[0] };
+      }
+      const stateRead2 = await readMergeState();
+      if (stateRead2.ok && stateRead2.state === "MERGED") return { mergeStatus: "merged" };
+      return {
+        mergeStatus: "failed",
+        error: stateRead2.ok ? "direct merge did not land after clean-status fallback" : `could not confirm PR state after clean-status fallback: ${stateRead2.error}`
+      };
+    }
     if (ghPrMergeLocalBranchDeleteWarning(message)) {
       const stateRead2 = await readMergeState();
       if (stateRead2.ok && stateRead2.state === "MERGED") return { mergeStatus: "merged" };
@@ -21161,7 +21266,7 @@ pr.command("merge <number>").description("merge a PR (squash by default) and cle
   const remoteBefore = await remoteBranchExists2(headRef);
   let remoteDeleteAttempted = false;
   let remoteNotAttemptedReason;
-  await execFileP2("gh", buildPrMergeArgs({ number, repoArgs, method, auto: o.auto }), { timeout: GH_MUTATION_TIMEOUT_MS }).catch((e) => {
+  await execFileP2("gh", buildPrMergeArgs({ number, repoArgs, method, auto: o.auto }), { timeout: GH_MUTATION_TIMEOUT_MS }).catch(async (e) => {
     const message = String(e.message || "");
     if (/already been merged/i.test(message)) {
       remoteNotAttemptedReason = "pr-already-merged";
@@ -21169,6 +21274,19 @@ pr.command("merge <number>").description("merge a PR (squash by default) and cle
     }
     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 }), { 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)) {
       throw new Error(`gh pr merge ${number}: the base-branch policy blocks an immediate merge \u2014 re-run with --auto to merge once required checks pass.`);
     }
@@ -21217,14 +21335,18 @@ pr.command("merge <number>").description("merge a PR (squash by default) and cle
       }
     };
   }
-  console.log(JSON.stringify(buildPrMergeResultPayload({
-    number,
-    branch: headRef,
-    method: method.slice(2),
-    remoteBranch,
-    localCleanup,
-    housekeeping
-  })));
+  const boardAdvance = await advanceClosedIssuesToDone(number, o.repo);
+  console.log(JSON.stringify({
+    ...buildPrMergeResultPayload({
+      number,
+      branch: headRef,
+      method: method.slice(2),
+      remoteBranch,
+      localCleanup,
+      housekeeping
+    }),
+    ...boardAdvance ? { boardAdvance } : {}
+  }));
 });
 registerQueryCommands(program2);
 registerWorktreeCommands(program2);
@@ -22491,8 +22613,7 @@ program2.command("session-start").description("run the SessionStart verbs (whoam
     // release pushed to origin (incl. the deferred main -> development alignment merge). Bounded git,
     // fail-soft, silent unless a branch moved.
     syncTrain: async (io) => {
-      const gitRun = async (file, args) => (await execFileP2(file, args, { timeout: GIT_TIMEOUT_MS })).stdout;
-      const result = await syncLocalTrainBranches(gitRun, { warn: (m) => io.err(`[mmi-hook] train sync: ${m}`) });
+      const result = await syncLocalTrainBranches(execFileGitRun, { warn: (m) => io.err(`[mmi-hook] train sync: ${m}`) });
       const line = localTrainSyncBannerLine(result);
       if (line) io.log(line);
     },

package/package.json

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