@mutmutco/cli 4.3.53 → 4.3.55

package/dist/main.cjs

@@ -4777,7 +4777,22 @@ async function isFastForward(run, ancestor, descendant) {
     return false;
   }
 }
-async function syncOneBranch(run, branch, currentBranch2, warn) {
+async function checkedOutWorktrees(run) {
+  const map = /* @__PURE__ */ new Map();
+  let out = "";
+  try {
+    out = await run("git", ["worktree", "list", "--porcelain"]);
+  } catch {
+    return map;
+  }
+  let path2 = "";
+  for (const line of out.split(/\r?\n/)) {
+    if (line.startsWith("worktree ")) path2 = line.slice("worktree ".length);
+    else if (line.startsWith("branch refs/heads/") && path2) map.set(line.slice("branch refs/heads/".length), path2);
+  }
+  return map;
+}
+async function syncOneBranch(run, branch, currentBranch2, worktrees, warn) {
   const localSha = await revParse(run, `refs/heads/${branch}`);
   if (!localSha) {
     return { branch, status: "skipped", reason: "no-local-branch", note: `${branch}: no local branch \u2014 skipped` };
@@ -4794,13 +4809,16 @@ async function syncOneBranch(run, branch, currentBranch2, warn) {
     warn?.(note);
     return { branch, status: "skipped", reason: "diverged", note };
   }
+  const linked = branch === currentBranch2 ? void 0 : worktrees.get(branch);
+  const inTree = linked ? ["-C", linked] : [];
   try {
-    if (branch === currentBranch2) {
-      const porcelain = await run("git", ["status", "--porcelain"]);
+    if (branch === currentBranch2 || linked) {
+      const porcelain = await run("git", [...inTree, "status", "--porcelain"]);
       if (porcelainHasBlockingChanges(porcelain)) {
-        return { branch, status: "skipped", reason: "current-dirty", note: `${branch}: checked out with local changes \u2014 skipped (commit/stash, then rerun)` };
+        const where = linked ? ` in worktree ${linked}` : "";
+        return { branch, status: "skipped", reason: "current-dirty", note: `${branch}: checked out${where} with local changes \u2014 skipped (commit/stash, then rerun)` };
       }
-      await run("git", ["merge", "--ff-only", `origin/${branch}`]);
+      await run("git", [...inTree, "merge", "--ff-only", `origin/${branch}`]);
     } else {
       await run("git", ["fetch", "origin", `${branch}:${branch}`]);
     }
@@ -4828,9 +4846,10 @@ async function syncLocalTrainBranches(run, options = {}) {
   } catch {
     currentBranch2 = "";
   }
+  const worktrees = await checkedOutWorktrees(run);
   const results = [];
   for (const branch of branches) {
-    results.push(await syncOneBranch(run, branch, currentBranch2, options.warn));
+    results.push(await syncOneBranch(run, branch, currentBranch2, worktrees, options.warn));
   }
   return { branches: results, changed: results.some((r) => r.status === "synced") };
 }
@@ -15858,10 +15877,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.53",
-    tag: "v4.3.53",
-    commit: "8877c0336b18",
-    npm: "@mutmutco/cli@4.3.53"
+    version: "4.3.55",
+    tag: "v4.3.55",
+    commit: "7f7f602ac9bc",
+    npm: "@mutmutco/cli@4.3.55"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -15878,14 +15897,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.3.53"
+          v3Target: "v4.3.55"
         }
       ],
       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.53 and redeploy the Hub Lambda from tag v4.3.53 (8877c0336b18); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.3.53 (@mutmutco/cli@4.3.53, tag commit 8877c0336b18 \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.3.55 and redeploy the Hub Lambda from tag v4.3.55 (7f7f602ac9bc); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.3.55 (@mutmutco/cli@4.3.55, tag commit 7f7f602ac9bc \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {

package/package.json

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