@mutmutco/cli 3.111.0 → 3.112.0

package/dist/main.cjs

@@ -7686,14 +7686,27 @@ function validateDeadWorktreeDirCleanup(planned, inspected) {
   }
   return { ok: true };
 }
-function validateDeadWorktreeDirContent(planned, inspected) {
+function describeLeftoverEntries(entries) {
+  const shown = entries.slice(0, 8);
+  const more = entries.length > shown.length ? `, +${entries.length - shown.length} more` : "";
+  return `${shown.join(", ")}${more}`;
+}
+function validateDeadWorktreeDirContent(planned, inspected, options = {}) {
   if (!inspected.entries) return { ok: false, reason: inspected.error ?? "unable to inspect directory contents" };
   const entries = inspected.entries.filter(Boolean);
   if (planned.reason === "orphaned-folder") {
-    return entries.length === 0 ? { ok: true } : { ok: false, reason: "orphaned worktree directory still contains files" };
+    if (entries.length === 0 || options.force) return { ok: true };
+    return {
+      ok: false,
+      reason: `orphaned worktree directory still contains files: ${describeLeftoverEntries(entries)} \u2014 re-run with --force to remove anyway`
+    };
   }
   if (planned.reason === "dangling-gitdir") {
-    return entries.length === 1 && entries[0] === ".git" ? { ok: true } : { ok: false, reason: "dangling worktree directory still contains files" };
+    if (entries.length === 1 && entries[0] === ".git" || options.force) return { ok: true };
+    return {
+      ok: false,
+      reason: `dangling worktree directory (git registration already severed) still contains files: ${describeLeftoverEntries(entries)} \u2014 re-run with --force to remove anyway`
+    };
   }
   return { ok: false, reason: "unknown dead worktree cleanup kind" };
 }
@@ -13252,7 +13265,10 @@ async function fetchTrainAuthority(repo, deps) {
       headers: { Authorization: `Bearer ${token}` }
     });
     if (res.status === 426) return { ok: false, error: upgradeRequiredError(res, await res.json().catch(() => null)) };
-    if (!res.ok) return { ok: false, error: `train-authority HTTP ${res.status}` };
+    if (!res.ok) {
+      const detail = (await res.json().catch(() => null))?.error;
+      return { ok: false, error: detail ? `train-authority HTTP ${res.status}: ${detail}` : `train-authority HTTP ${res.status}` };
+    }
     const body = await res.json();
     if (typeof body?.train !== "boolean" || !body.role) return { ok: false, error: "malformed train-authority response" };
     return { ok: true, authority: body };
@@ -15618,10 +15634,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.111.0",
-    tag: "v3.111.0",
-    commit: "ef48be2432be",
-    npm: "@mutmutco/cli@3.111.0"
+    version: "3.112.0",
+    tag: "v3.112.0",
+    commit: "e6eaa0103b25",
+    npm: "@mutmutco/cli@3.112.0"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -15638,14 +15654,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v3.111.0"
+          v3Target: "v3.112.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.111.0 and redeploy the Hub Lambda from tag v3.111.0 (ef48be2432be); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v3.111.0 (@mutmutco/cli@3.111.0, tag commit ef48be2432be \u2014 the preserved latest-v3 distribution, D6b)"
+        mechanism: "npm dist-tag latest -> 3.112.0 and redeploy the Hub Lambda from tag v3.112.0 (e6eaa0103b25); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v3.112.0 (@mutmutco/cli@3.112.0, tag commit e6eaa0103b25 \u2014 the preserved latest-v3 distribution, D6b)"
       }
     },
     {
@@ -32802,7 +32818,7 @@ async function applyGcPlan(plan, remote, opts = {}) {
         result.failed.push(`${wt.path}: skipped dead-dir removal (${stillValid.reason})`);
         continue;
       }
-      const contentSafe = validateDeadWorktreeDirContent(wt, inspectDeadWorktreeDirContent(wt.path));
+      const contentSafe = validateDeadWorktreeDirContent(wt, inspectDeadWorktreeDirContent(wt.path), { force: opts.force });
       if (!contentSafe.ok) {
         result.failed.push(`${wt.path}: skipped dead-dir removal (${contentSafe.reason})`);
         continue;
@@ -33780,6 +33796,17 @@ function landSteps(branch, hasWorktree, hasStage) {
   steps.push("prune worktree metadata");
   return steps;
 }
+function describeLandUnresolvableWorktree(inspection) {
+  if (inspection.gitType === "missing") {
+    return "this directory has no .git at all \u2014 its worktree registration is gone";
+  }
+  if (inspection.gitType === "file" && inspection.gitDirExists === false) {
+    const match = /^gitdir:\s*(.+)\s*$/im.exec(inspection.gitFileContent ?? "");
+    const gitdir = match?.[1]?.trim();
+    return `this directory's .git points at ${gitdir ? `'${gitdir}'` : "its admin dir"}, which no longer exists \u2014 its worktree registration was severed`;
+  }
+  return void 0;
+}
 function orphanLandSteps(lostBranch, hasStage) {
   const steps = [];
   if (hasStage) steps.push("stop spawned dev stage");
@@ -34012,7 +34039,17 @@ function registerWorktreeCommands(program3) {
     if (o.apply && o.dryRun) return fail("worktree land: choose either --dry-run or --apply");
     const apply = Boolean(o.apply);
     try {
-      const wtPath = (await execFileP2("git", ["rev-parse", "--show-toplevel"], { timeout: GIT_TIMEOUT_MS })).stdout.trim();
+      let wtPath;
+      try {
+        wtPath = (await execFileP2("git", ["rev-parse", "--show-toplevel"], { timeout: GIT_TIMEOUT_MS })).stdout.trim();
+      } catch (e) {
+        const reason = describeLandUnresolvableWorktree(inspectSiblingWorktreeDir(process.cwd(), ""));
+        if (!reason) throw e;
+        return fail(
+          `worktree land: ${reason}. It cannot be landed from inside itself \u2014 cd to the primary checkout and run \`mmi-cli worktree gc --apply\` (add --force if this directory still holds leftover files) to clear it.`,
+          { code: ERROR_CODES.ERR_BAD_ENUM }
+        );
+      }
       const headBorn = await execFileP2("git", ["-C", wtPath || ".", "rev-parse", "--verify", "--quiet", "HEAD"], { timeout: GIT_TIMEOUT_MS }).then(() => true).catch(() => false);
       const symbolicBranch = (await execFileP2(
         "git",
@@ -39759,7 +39796,7 @@ gcCmd.command("sweep-deferred").description("retry IDE-locked deferred worktree
     process.exit(process.exitCode ?? 0);
   });
 });
-gcCmd.option("--dry-run", "show what would be deleted (default)").option("--apply", "delete only the listed clean merged/closed PR local+remote branches, linked worktrees, and stale tracking refs").option("--json", "machine-readable output").option("--scratch", "prune safe local scratch (#1864) instead of git branches/refs; local plans are surfaced advisory-only, never auto-pruned").option("--remote <name>", "remote name", "origin").option("--limit <n>", "PRs to read PER BRANCH ? an effort bound, not a correctness one: merge state is resolved per branch, so no branch is ever skipped for being old (#4227)", "200").option("--force", "remove worktrees even when the ownership registry shows another session created or worked in them recently (#3580)").option("--root <path>", "sweep an explicitly named worktrees root instead of the authoritative ../mmi-worktrees (#3471) ? descends into this repo container when present; ownership, dead-dir, and content guards still apply").action(async (o) => {
+gcCmd.option("--dry-run", "show what would be deleted (default)").option("--apply", "delete only the listed clean merged/closed PR local+remote branches, linked worktrees, and stale tracking refs").option("--json", "machine-readable output").option("--scratch", "prune safe local scratch (#1864) instead of git branches/refs; local plans are surfaced advisory-only, never auto-pruned").option("--remote <name>", "remote name", "origin").option("--limit <n>", "PRs to read PER BRANCH ? an effort bound, not a correctness one: merge state is resolved per branch, so no branch is ever skipped for being old (#4227)", "200").option("--force", "remove worktrees even when the ownership registry shows another session created or worked in them recently (#3580), or when a dead worktree directory still holds leftover files (#4779)").option("--root <path>", "sweep an explicitly named worktrees root instead of the authoritative ../mmi-worktrees (#3471) ? descends into this repo container when present; ownership, dead-dir, and content guards still apply").action(async (o) => {
   if (o.apply && o.dryRun) return fail("worktree gc: choose either --dry-run or --apply");
   if (o.scratch) {
     try {

package/package.json

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