@mutmutco/cli 3.134.0 → 3.135.0

package/dist/main.cjs

@@ -5313,9 +5313,10 @@ function resolveActiveWorkspaceRoot(deps = {}) {
 var import_node_path8 = require("node:path");
 function win32LongPath(p, platform2 = process.platform) {
   if (platform2 !== "win32") return p;
-  if (p.startsWith("\\\\?\\")) return p;
-  if (p.startsWith("\\\\")) return `\\\\?\\UNC\\${p.slice(2)}`;
-  return `\\\\?\\${p}`;
+  const normalized = p.replace(/\//g, "\\");
+  if (normalized.startsWith("\\\\?\\")) return normalized;
+  if (normalized.startsWith("\\\\")) return `\\\\?\\UNC\\${normalized.slice(2)}`;
+  return `\\\\?\\${normalized}`;
 }
 function normalizeGithubRemote(url) {
   const raw = url.trim();
@@ -14199,10 +14200,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: "3.134.0",
-    tag: "v3.134.0",
-    commit: "15870712ab5a",
-    npm: "@mutmutco/cli@3.134.0"
+    version: "3.135.0",
+    tag: "v3.135.0",
+    commit: "3d9fbd6f4628",
+    npm: "@mutmutco/cli@3.135.0"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -14219,14 +14220,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v3.134.0"
+          v3Target: "v3.135.0"
         }
       ],
       rollbackTrigger: "Any red inside the post-cut soak window: `devops train gate` FAIL attributable to the v4 doors, Hub endpoint health probe failure, a v3 client refused while the compat window must still admit it (SUPPORTED_MINOR_WINDOW=2, MIN_CLIENT_VERSION 0.0.0 \u2014 D6a), or npm consumer install/doctor failure on the v4 dist.",
       rollback: {
         independent: true,
-        mechanism: "npm dist-tag latest -> 3.134.0 and redeploy the Hub Lambda from tag v3.134.0 (15870712ab5a); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v3.134.0 (@mutmutco/cli@3.134.0, tag commit 15870712ab5a \u2014 the preserved latest-v3 distribution, D6b)"
+        mechanism: "npm dist-tag latest -> 3.135.0 and redeploy the Hub Lambda from tag v3.135.0 (3d9fbd6f4628); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v3.135.0 (@mutmutco/cli@3.135.0, tag commit 3d9fbd6f4628 \u2014 the preserved latest-v3 distribution, D6b)"
       }
     },
     {
@@ -40938,23 +40939,46 @@ pr.command("land <number>").description("agent merge path (#1440): train probe \
       if (trimmed) {
         try {
           result.cleanup = JSON.parse(trimmed);
-          const wt = result.cleanup.worktree;
-          if (wt?.status === "deferred") spawnDeferredGcSweep();
+          const childCleanup = result.cleanup;
+          result.cleanupStatus = childCleanup.cleanupStatus === "clean" ? "clean" : "deferred";
+          if (childCleanup.worktree?.status === "deferred" || childCleanup.worktree?.status === "failed") spawnDeferredGcSweep();
         } catch {
           result.cleanupError = "cleanup output was not JSON";
+          result.cleanupStatus = "deferred";
         }
       }
     } catch (e) {
-      result.cleanupError = String(e.message || "pr merge cleanup failed");
+      const err = e;
+      const childStdout = (err.stdout ?? "").trim();
+      const childStderr = (err.stderr ?? "").trim().split("\n")[0];
+      let parsed;
+      try {
+        parsed = childStdout ? JSON.parse(childStdout) : void 0;
+      } catch {
+        parsed = void 0;
+      }
+      if (parsed && typeof parsed === "object") {
+        result.cleanup = parsed;
+        const wt = parsed.worktree;
+        if (wt?.status === "deferred" || wt?.status === "failed") spawnDeferredGcSweep();
+        result.cleanupError = childStderr || "post-merge cleanup did not complete";
+      } else {
+        result.cleanupError = childStderr || String(err.message || "pr merge cleanup failed");
+        spawnDeferredGcSweep();
+      }
+      result.cleanupStatus = "deferred";
     }
   }
   if (o.json) printLine(JSON.stringify(result));
   else {
     printLine(`pr land: ${result.status}${result.error ? ` \u2014 ${result.error}` : ""}`);
     for (const line of renderPrLandCleanupLines(result.cleanup)) printLine(line);
-    if (result.cleanupError) printLine(`pr land cleanup: ${result.cleanupError}`);
+    if (result.cleanupError) {
+      printLine(`pr land: ${result.status} \u2014 post-merge cleanup DEFERRED (${result.cleanupError})`);
+      printLine(`pr land: sweep the deferred cleanup with: mmi-cli worktree gc sweep-deferred`);
+    }
   }
-  if (result.status === "failed" || result.cleanupError) process.exitCode = 1;
+  if (result.status === "failed") process.exitCode = 1;
 });
 jsonParity(pr.command("merge <number>").description("merge a PR (squash by default) and clean up its branch + worktree \u2014 no leftover local branch; on no-ci repos run pr ci-policy / checks-wait first (#1432)").option("--squash", "squash merge (default)").option("--merge", "create a merge commit").option("--rebase", "rebase merge").option("--repo <owner/repo>", "target repo (defaults to the current repo)").option("--auto", "enable auto-merge \u2014 merge once the base-branch policy is satisfied (use for policy-gated repos)").option("--wait", `wait for checks to reach a terminal passing verdict before merging (default budget ${PR_CHECKS_TIMEOUT_MS / 6e4}m)`).option("--preserve-worktree", "keep the local PR worktree/stage/branch for an active multi-issue batch (#1888)").option("--force", "acknowledge and merge past a remaining prunable/severe scratch housekeeping block (advisory kept plans/ never blocks, #3012) or a negated-closing-keyword (#3718) or ambiguous-cross-repo-closing (#4279) refusal")).action(async (number, o) => {
   const method = o.rebase ? "--rebase" : o.merge ? "--merge" : "--squash";

package/package.json

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