@mutmutco/codex-plugin 4.6.47 → 4.6.48

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "mmi",
-  "version": "4.6.47",
+  "version": "4.6.48",
   "mmiCompat": "4.x",
   "description": "MMI workflow skills and org gates delivery.",
   "author": {

package/cli/dist/main.cjs

@@ -28556,10 +28556,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.6.47",
-    tag: "v4.6.47",
-    commit: "4555234d7aa8",
-    npm: "@mutmutco/cli@4.6.47"
+    version: "4.6.48",
+    tag: "v4.6.48",
+    commit: "9f3e651d8643",
+    npm: "@mutmutco/cli@4.6.48"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -28576,14 +28576,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.6.47"
+          v3Target: "v4.6.48"
         }
       ],
       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.6.47 and redeploy the Hub Lambda from tag v4.6.47 (4555234d7aa8); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.6.47 (@mutmutco/cli@4.6.47, tag commit 4555234d7aa8 \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.6.48 and redeploy the Hub Lambda from tag v4.6.48 (9f3e651d8643); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.6.48 (@mutmutco/cli@4.6.48, tag commit 9f3e651d8643 \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -63100,6 +63100,14 @@ function isPathAtOrWithin(path2, worktreePath) {
 function isWindowsCwdLockResidueError(error) {
   return process.platform === "win32" && /\bEPERM\b|access(?: is)? denied/i.test(error);
 }
+function isNodeModulesLockError(error) {
+  return /^(?:EPERM|EACCES|EBUSY)\b/.test(error);
+}
+function deferredNodeModulesLockRemediation(wtPath, branch, prNumber, repo) {
+  const quote = (value) => value.replace(/'/g, "''");
+  const rerun = `mmi-cli devops pr merge ${prNumber ?? "<pr>"}${repo ? ` --repo ${repo}` : ""}`;
+  return `Close the handle on the locked file under '${quote((0, import_node_path49.join)(wtPath, "node_modules"))}', then from the primary checkout re-run cleanup for branch '${quote(branch)}': ${rerun}`;
+}
 function deferredCwdLockRemediation(wtPath) {
   const quote = (path2) => path2.replace(/'/g, "''");
   return `After leaving the directory and closing its handles, remove it only if empty: [System.IO.Directory]::Delete('${quote(wtPath)}', $false)`;
@@ -63416,7 +63424,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" && worktree.status !== "retained-locked" && worktree.status !== "switched-primary");
+  return Boolean(worktree?.path && worktree.status !== "removed" && worktree.status !== "preserved" && worktree.status !== "retained-locked" && worktree.status !== "switched-primary" && worktree.status !== "deferred");
 }
 function prMergeLocalCleanupExitCode(cleanup) {
   return cleanup?.worktree?.status === "failed" || cleanup?.localBranch?.status === "failed" ? 1 : void 0;
@@ -63575,18 +63583,19 @@ async function cleanupPrMergeLocalBranch(branch, options) {
   if (pathExists((0, import_node_path49.join)(wtPath, "node_modules"))) {
     const nmRemoved = await (options.removeRealNodeModules ?? removeWorktreeNodeModules)(wtPath);
     if (!nmRemoved.ok) {
+      const deferred = isNodeModulesLockError(nmRemoved.error) && pathExists(wtPath);
       report.worktree = {
         path: wtPath,
-        status: "failed",
-        reason: "pre-clean-failed",
+        status: deferred ? "deferred" : "failed",
+        reason: deferred ? "node-modules-locked" : "pre-clean-failed",
         error: `real-node_modules cleanup failed before worktree removal: ${nmRemoved.error}`,
         artifactsArchive,
         stageTeardown,
         tmpEvidenceCount: tmpEvidence.length,
         ...unlinkedReparsePoints.length ? { unlinkedReparsePoints } : {},
-        remediation: `Close handles to '${wtPath.replace(/'/g, "''")}' and retry MMI PR landing from the primary checkout`
+        remediation: deferred ? deferredNodeModulesLockRemediation(wtPath, branch, options.prNumber, options.repo) : `Close handles to '${wtPath.replace(/'/g, "''")}' and retry MMI PR landing from the primary checkout`
       };
-      report.localBranch = { name: branch, status: "not-attempted", reason: "worktree-pre-clean-failed" };
+      report.localBranch = { name: branch, status: "not-attempted", reason: deferred ? "worktree-cleanup-deferred" : "worktree-pre-clean-failed" };
       return report;
     }
   }
@@ -63685,6 +63694,8 @@ function renderPrMergeCleanupLines(cleanup) {
     lines2.push(`pr merge: preserved worktree ${wt.path} (--preserve-worktree)`);
   } else if (wt.status === "retained-locked") {
     lines2.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"}`);
+  } else if (wt.status === "deferred") {
+    lines2.push(`pr merge: worktree ${wt.path} cleanup deferred \u2014 a node_modules file is locked${wt.error ? ` (${wt.error})` : ""}; ${wt.remediation ?? "close the handle and re-run pr merge for this PR"}`);
   } else if (wt.status === "switched-primary") {
     const now = wt.switchedTo ? `to ${wt.switchedTo}` : "to the base branch";
     lines2.push(wt.error ? `pr merge: primary checkout ${wt.path} switched ${now} but deleting the merged branch failed \u2014 ${wt.error}; remediate: ${wt.remediation ?? "delete the merged branch manually"}` : `pr merge: primary checkout ${wt.path} held the merged branch \u2014 switched it back ${now} and deleted the branch`);
@@ -65637,6 +65648,8 @@ ${preparation.findings.map((finding) => `[${finding.check}/${finding.state}] ${f
           preserveWorktree: o.preserveWorktree,
           gcAcknowledged: o.gc,
           expectedHeadOid: headRefOid,
+          prNumber: number,
+          repo: repoForPostCleanup,
           pathExists: (p) => (0, import_node_fs54.existsSync)(p),
           // #5899: pin cleanup git calls to the main checkout — the task worktree this process may be
           // standing in is removed mid-cleanup, so a cwd-relative invocation fails with

package/cli/package.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/codex-plugin",
-  "version": "4.6.47",
+  "version": "4.6.48",
   "description": "MMI workflow skills and org gates delivery.",
   "author": {
     "name": "MMI Future",