@mutmutco/cli 4.3.3 → 4.3.4

package/dist/main.cjs

@@ -15375,10 +15375,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.3.3",
-    tag: "v4.3.3",
-    commit: "851ec4c56e34",
-    npm: "@mutmutco/cli@4.3.3"
+    version: "4.3.4",
+    tag: "v4.3.4",
+    commit: "cd7d0dd9cc3a",
+    npm: "@mutmutco/cli@4.3.4"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -15395,14 +15395,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.3.3"
+          v3Target: "v4.3.4"
         }
       ],
       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.3.3 and redeploy the Hub Lambda from tag v4.3.3 (851ec4c56e34); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.3.3 (@mutmutco/cli@4.3.3, tag commit 851ec4c56e34 \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.3.4 and redeploy the Hub Lambda from tag v4.3.4 (cd7d0dd9cc3a); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.3.4 (@mutmutco/cli@4.3.4, tag commit cd7d0dd9cc3a \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -35429,6 +35429,10 @@ function ghPrMergeLocalBranchDeleteWarning(message) {
 function mergeAutoRejectedPrAlreadyClean(message) {
   return /clean status \(enablePullRequestAutoMerge\)|is in clean status/i.test(message);
 }
+function mergeRejectedBaseBranchModified(message) {
+  return /base branch was modified\. review and try the merge again/i.test(message);
+}
+var PR_MERGE_BASE_RACE_RETRY_DELAY_MS = 3e3;
 function assertRemoteBranchPreservedOnMerge(repo, deleteBranchOnMerge) {
   if (deleteBranchOnMerge === false) return;
   throw new Error(
@@ -35709,14 +35713,16 @@ async function deleteMergedRemoteBranch(options) {
   if (options.existedBefore === false) {
     const exists2 = await options.branchExists(options.branch);
     if (exists2 === false) return { branch: options.branch, existedBefore: false, attempted: false, status: "already-gone" };
-    return {
-      branch: options.branch,
-      existedBefore: false,
-      attempted: false,
-      status: "failed",
-      error: exists2 ? `origin reports ${options.branch} after merge` : `could not verify absence of origin/${options.branch}`,
-      remediation
-    };
+    if (exists2 !== true) {
+      return {
+        branch: options.branch,
+        existedBefore: false,
+        attempted: false,
+        status: "failed",
+        error: `could not verify absence of origin/${options.branch}`,
+        remediation
+      };
+    }
   }
   try {
     await options.execGit(["push", "origin", "--delete", options.branch]);
@@ -36389,6 +36395,22 @@ function samePath(a, b) {
   const nb = normPath2(b);
   return process.platform === "win32" ? na.toLowerCase() === nb.toLowerCase() : na === nb;
 }
+function isPathAtOrWithin(path2, worktreePath) {
+  if (!path2) return false;
+  const candidate = normPath2(path2);
+  const target = normPath2(worktreePath);
+  const normalize = (value) => process.platform === "win32" ? value.toLowerCase() : value;
+  const normalizedCandidate = normalize(candidate);
+  const normalizedTarget = normalize(target);
+  return normalizedCandidate === normalizedTarget || normalizedCandidate.startsWith(`${normalizedTarget}/`);
+}
+function isWindowsCwdLockResidueError(error) {
+  return process.platform === "win32" && /\bEPERM\b|access(?: is)? denied/i.test(error);
+}
+function deferredCwdLockRemediation(primaryRoot, wtPath) {
+  const quote = (path2) => path2.replace(/'/g, "''");
+  return `After this command exits: Set-Location -LiteralPath '${quote(primaryRoot)}'; Remove-Item -LiteralPath '${quote(wtPath)}' -Recurse -Force`;
+}
 function selectPrMergeCleanupWorktree(branch, before, after, startingPath) {
   if (!branch) return void 0;
   const current = after.find((w) => w.branch === branch)?.path;
@@ -36559,7 +36581,7 @@ async function removeWorktreeWithReconcile(wtPath, git3, listWorktrees, pathExis
 }
 function isPrMergeWorktreePartial(cleanup) {
   const worktree = cleanup?.worktree;
-  return Boolean(worktree?.path && worktree.status !== "removed" && worktree.status !== "preserved");
+  return Boolean(worktree?.path && worktree.status !== "removed" && worktree.status !== "preserved" && worktree.status !== "retained-locked");
 }
 function prMergeLocalCleanupExitCode(cleanup) {
   return cleanup?.worktree?.status === "failed" || cleanup?.localBranch?.status === "failed" ? 1 : void 0;
@@ -36731,11 +36753,17 @@ async function cleanupPrMergeLocalBranch(branch, options) {
     if (residue.ok) {
       report.worktree.residue = "swept";
     } else {
-      report.worktree.status = "failed";
-      report.worktree.reason = "residue-remains";
       report.worktree.residue = "left";
       report.worktree.residueError = residue.error;
-      report.worktree.remediation = `Remove-Item -LiteralPath '${wtPath.replace(/'/g, "''")}' -Force`;
+      if (isWindowsCwdLockResidueError(residue.error) && isPathAtOrWithin(options.startingPath, wtPath)) {
+        report.worktree.status = "retained-locked";
+        report.worktree.reason = "parent-cwd-lock";
+        report.worktree.remediation = deferredCwdLockRemediation(options.primaryRoot, wtPath);
+      } else {
+        report.worktree.status = "failed";
+        report.worktree.reason = "residue-remains";
+        report.worktree.remediation = `Remove-Item -LiteralPath '${wtPath.replace(/'/g, "''")}' -Force`;
+      }
     }
   }
   try {
@@ -36764,8 +36792,10 @@ function renderPrMergeCleanupLines(cleanup) {
     lines.push(`pr merge: worktree ${wt.path} removal failed${wt.error ? ` \u2014 ${wt.error}` : ""}`);
   } else if (wt.status === "preserved") {
     lines.push(`pr merge: preserved worktree ${wt.path} (--preserve-worktree)`);
+  } else if (wt.status === "retained-locked") {
+    lines.push(`pr merge: worktree ${wt.path} cleanup deferred \u2014 its Windows parent shell still holds the cwd; ${wt.remediation ?? "exit the shell and remove the residue from the primary checkout"}`);
   }
-  if (wt.residue === "left") {
+  if (wt.residue === "left" && wt.status !== "retained-locked") {
     lines.push(`pr merge: worktree ${wt.path} registration is gone but residue remains \u2014 ${wt.residueError ?? wt.path}; remediate: ${wt.remediation ?? wt.path}`);
   }
   if (wt.artifactsArchive?.status === "archived" && wt.artifactsArchive.path) {
@@ -37979,6 +38009,21 @@ ${list}`);
           });
           return;
         }
+        if (!o.auto && mergeRejectedBaseBranchModified(message)) {
+          console.warn(`pr merge: the base branch was modified by a concurrent merge \u2014 waiting ${PR_MERGE_BASE_RACE_RETRY_DELAY_MS / 1e3}s and retrying PR #${number}'s merge once (#6052).`);
+          await new Promise((resolve7) => setTimeout(resolve7, PR_MERGE_BASE_RACE_RETRY_DELAY_MS));
+          await execFileP("gh", buildPrMergeArgs({ number, repoArgs, method, auto: false, deleteBranch: false, 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 && mergeAutoRejectedPrAlreadyClean(message)) {
           await execFileP("gh", buildPrMergeArgs({ number, repoArgs, method, auto: false, deleteBranch: false, bodyFile }), { timeout: GH_MUTATION_TIMEOUT_MS }).catch((e2) => {
             const m2 = String(e2.message || "");

package/package.json

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