@mutmutco/cli 4.1.10 → 4.1.12

package/dist/main.cjs

@@ -13152,10 +13152,10 @@ var rollout_plan_default = {
     note: "The v4.0.0 stamp happens at cut time (D6e #4463); until then the candidate is the origin/development head artifacts (built cli/dist + npm pack), identity proven by dist content hash (D6a)."
   },
   baseline: {
-    version: "4.1.10",
-    tag: "v4.1.10",
-    commit: "2a913c6e917e",
-    npm: "@mutmutco/cli@4.1.10"
+    version: "4.1.12",
+    tag: "v4.1.12",
+    commit: "306701c103b7",
+    npm: "@mutmutco/cli@4.1.12"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -13172,14 +13172,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.1.10"
+          v3Target: "v4.1.12"
         }
       ],
       rollbackTrigger: "Any red inside the post-contract soak window: `devops train gate` FAIL attributable to the v4 doors, Hub endpoint health probe failure, a pre-v4 client admitted instead of receiving actionable HTTP 426, or npm consumer install/doctor failure on the v4-only dist.",
       rollback: {
         independent: true,
-        mechanism: "npm dist-tag latest -> 4.1.10 and redeploy the Hub Lambda from tag v4.1.10 (2a913c6e917e); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.1.10 (@mutmutco/cli@4.1.10, tag commit 2a913c6e917e \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.1.12 and redeploy the Hub Lambda from tag v4.1.12 (306701c103b7); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.1.12 (@mutmutco/cli@4.1.12, tag commit 306701c103b7 \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -17338,6 +17338,9 @@ async function completeMainRelease(deps, ctx, meta, deployModel, watch, options,
   let tagPush;
   try {
     await assertComputedReleaseTagStillNext(deps, tag);
+    if (deployModel === "hub-serverless") {
+      await deps.run("node", ["scripts/release-distribution.mjs", "assert-release-lineage", tag.replace(/^v/, ""), "--release-commit", releaseSha]);
+    }
     tagPush = await ensureTagPushed(deps, tag, releaseSha, tagProbe, ctx.repo);
   } catch (e) {
     throw await recoverFailedFold(deps, e, startBranch, preFold.mainSha, resumeCommand);
@@ -24450,6 +24453,9 @@ async function runHotfixRelease(deps, versionInput, options = {}) {
   }
   const required = await discoverRequiredCheckContexts(deps, ctx, "main");
   assertTagAddressableRequiredContexts(deps, required, ctx.repo);
+  if (deployModel === "hub-serverless") {
+    await deps.run("node", ["scripts/release-distribution.mjs", "assert-release-lineage", version, "--release-commit", mergedSha]);
+  }
   const tagPush = await ensureTagPushed(deps, tag, mergedSha);
   const tagPushSince = Date.now();
   const tagNote = tagPush.note;
@@ -33658,6 +33664,27 @@ function selectSafeWorktreeCwd(worktrees, targetPath, options) {
   const exists = options?.pathExists ?? (() => true);
   return worktrees.find((w) => !samePath(w.path, targetPath) && exists(w.path))?.path;
 }
+function formatGitCommandError(e) {
+  if (!(e instanceof Error)) return String(e);
+  const err = e;
+  const stderr = typeof err.stderr === "string" ? err.stderr.trim() : "";
+  const stdout = typeof err.stdout === "string" ? err.stdout.trim() : "";
+  const message = err.message.trim();
+  if (stderr) return stderr;
+  if (message && !/^Command failed:/i.test(message)) return message;
+  if (stdout) return stdout;
+  return message || "git command failed";
+}
+function isWorktreePathRegistered(worktrees, wtPath) {
+  return worktrees.some((w) => samePath(w.path, wtPath));
+}
+function isNotAWorkingTreeMessage(error) {
+  return /is not a working tree/i.test(error);
+}
+function formatWorktreeRemovalFailureDetail(options) {
+  const detail = options.removeError.trim() || "git worktree remove exited nonzero";
+  return `${detail}; registered=${options.registered ? "yes" : "no"}; pathExists=${options.pathExists ? "yes" : "no"}; path=${options.wtPath}`;
+}
 async function resolveMergeBaseTimestampMs(git3, baseRef, branch) {
   try {
     const mergeBase = (await git3(["merge-base", baseRef, branch])).trim();
@@ -33685,14 +33712,52 @@ async function teardownWorktreeStage(worktreePath) {
     return { status: "failed", error: e instanceof Error ? e.message : String(e) };
   }
 }
-async function removeWorktree(wtPath, git3) {
-  try {
-    await git3(["worktree", "remove", "--force", wtPath]);
+async function removeWorktreeWithReconcile(wtPath, git3, listWorktrees, pathExists) {
+  const attemptRemove = async () => {
+    try {
+      await git3(["worktree", "remove", "--force", wtPath]);
+      return void 0;
+    } catch (e) {
+      return formatGitCommandError(e);
+    }
+  };
+  const firstError = await attemptRemove();
+  if (!firstError) {
     await git3(["worktree", "prune"]).catch(() => "");
     return { status: "removed" };
-  } catch (e) {
-    return { status: "failed", error: e instanceof Error ? e.message : String(e) };
   }
+  let worktrees = await listWorktrees().catch(() => []);
+  if (!isWorktreePathRegistered(worktrees, wtPath)) {
+    await git3(["worktree", "prune"]).catch(() => "");
+    return { status: "removed", reason: "reconciled-unregistered" };
+  }
+  const retryError = await attemptRemove();
+  if (!retryError) {
+    await git3(["worktree", "prune"]).catch(() => "");
+    return { status: "removed", reason: "reconciled-after-retry" };
+  }
+  if (isNotAWorkingTreeMessage(retryError) || isNotAWorkingTreeMessage(firstError)) {
+    worktrees = await listWorktrees().catch(() => worktrees);
+    if (!isWorktreePathRegistered(worktrees, wtPath)) {
+      await git3(["worktree", "prune"]).catch(() => "");
+      return { status: "removed", reason: "reconciled-not-a-working-tree" };
+    }
+  }
+  worktrees = await listWorktrees().catch(() => worktrees);
+  const registered = isWorktreePathRegistered(worktrees, wtPath);
+  if (!registered) {
+    await git3(["worktree", "prune"]).catch(() => "");
+    return { status: "removed", reason: "reconciled-unregistered" };
+  }
+  return {
+    status: "failed",
+    error: formatWorktreeRemovalFailureDetail({
+      removeError: retryError || firstError,
+      registered,
+      pathExists: pathExists(wtPath),
+      wtPath
+    })
+  };
 }
 async function cleanupPrMergeLocalBranch(branch, options) {
   const report = { branch };
@@ -33797,7 +33862,12 @@ async function cleanupPrMergeLocalBranch(branch, options) {
     report.localBranch = { name: branch, status: "not-attempted", reason: "archive-failed" };
     return report;
   }
-  const removal = await removeWorktree(wtPath, git3);
+  const removal = await removeWorktreeWithReconcile(
+    wtPath,
+    git3,
+    async () => parseGitWorktreePorcelain(await execGit(["worktree", "list", "--porcelain"])),
+    pathExists
+  );
   if (removal.status === "failed") {
     report.worktree = {
       path: wtPath,
@@ -33813,6 +33883,7 @@ async function cleanupPrMergeLocalBranch(branch, options) {
   report.worktree = {
     path: wtPath,
     status: "removed",
+    ...removal.reason ? { reason: removal.reason } : {},
     artifactsArchive,
     stageTeardown,
     tmpEvidenceCount: tmpEvidence.length
@@ -33831,7 +33902,11 @@ function renderPrMergeCleanupLines(cleanup) {
   if (!wt?.path) return [];
   const lines = [];
   if (wt.status === "removed") {
-    lines.push(`pr merge: removed worktree ${wt.path} \u2014 that directory is gone; cd elsewhere before your next command`);
+    if (wt.reason?.startsWith("reconciled")) {
+      lines.push(`pr merge: worktree ${wt.path} remove reported failure but git no longer registers it \u2014 deleted local branch`);
+    } else {
+      lines.push(`pr merge: removed worktree ${wt.path} \u2014 that directory is gone; cd elsewhere before your next command`);
+    }
   } else if (wt.status === "refused") {
     lines.push(`pr merge: worktree ${wt.path} kept \u2014 ${wt.reason ?? "refused"}${wt.error ? `: ${wt.error}` : ""}`);
     if (wt.tmpEvidenceCount) lines.push(`pr merge: ${wt.tmpEvidenceCount} tmp path(s) newer than branch base would have been destroyed`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "4.1.10",
+  "version": "4.1.12",
   "description": "MMI Future CLI — the org dev toolbox and shared cross-IDE engine for every registry-declared MMI coding surface.",
   "type": "module",
   "license": "UNLICENSED",