@mutmutco/cli 4.3.54 → 4.3.56

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.54",
-    tag: "v4.3.54",
-    commit: "458f69b3b60c",
-    npm: "@mutmutco/cli@4.3.54"
+    version: "4.3.56",
+    tag: "v4.3.56",
+    commit: "497a375fabfc",
+    npm: "@mutmutco/cli@4.3.56"
   },
   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.54"
+          v3Target: "v4.3.56"
         }
       ],
       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.54 and redeploy the Hub Lambda from tag v4.3.54 (458f69b3b60c); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.3.54 (@mutmutco/cli@4.3.54, tag commit 458f69b3b60c \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.3.56 and redeploy the Hub Lambda from tag v4.3.56 (497a375fabfc); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.3.56 (@mutmutco/cli@4.3.56, tag commit 497a375fabfc \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -18897,6 +18916,21 @@ function prodReleaseTargets(model) {
   if (model === "registry-publish") return [{ workflow: "publish.yml", event: "release" }];
   return [];
 }
+function trainObservesShipment(model) {
+  return isCentralDispatchModel(model) || prodReleaseTargets(model).length > 0;
+}
+function shipLegsGreen(deploy, publish) {
+  const green = (s) => s === "complete" || s === "skipped";
+  return green(deploy?.state) && green(publish?.state);
+}
+async function announceShippedRelease(deps, args, model, legs, deferred) {
+  if (!deps.announce) return void 0;
+  if (trainObservesShipment(model) && !shipLegsGreen(legs.deploy, legs.publish)) {
+    const failed = legs.deploy.state === "failed" || legs.publish.state === "failed";
+    return `not announced: deploy/publish ${failed ? "FAILED" : "not proven green"} \u2014 ${deferred}`;
+  }
+  return (await deps.announce(args)).note;
+}
 async function listTargetRun(deps, repo, target, headSha) {
   let rows;
   try {
@@ -22817,6 +22851,9 @@ async function recordRcandDeployLegs(ledger, deps, anchors, deployModel, d, opts
   await recordPhase(ledger, deps, anchors, "alignment", phaseEntry({ state: "skipped", sha, note: "rcand aligns no branch \u2014 alignment rides the release" }), { ...opts, landed });
   return dispatch;
 }
+function releaseAnnounceDeferral(model, summaryFile) {
+  return prodReleaseTargets(model).length > 0 ? `\`mmi-cli devops release --resume --watch${summaryFile ? ` --announce-summary-file ${summaryFile}` : ""}\` announces it once they are green` : "a central deploy is proven only under --watch, so this release stays unannounced";
+}
 async function completeMainRelease(deps, ctx, meta, deployModel, watch, options, tag, releaseSha, startBranch, preFold, tagProbe, branchHints, ledger, alignEarly) {
   const resumeCommand = options.dev ? "mmi-cli devops release --dev --apply" : "mmi-cli devops release --apply";
   const ledgerAnchors = { repo: ctx.repo, tag, tagSha: releaseSha };
@@ -22921,13 +22958,12 @@ ${recovery.note}`), recoveryInput);
     throw partialTrainRecoveryError(e, recoveryInput);
   }
   await recordPhase(ledger, deps, ledgerAnchors, "promotion", phaseEntry({ state: "complete", sha: releaseSha, note: `immutable ${tag} pushed at ${releaseSha.slice(0, 12)}; origin/main fast-forwarded to it` }), { landed: "the immutable tag and the green required-check wall" });
-  deps.warn?.("Release: Creating the release announcement");
+  deps.warn?.("Release: Creating the GitHub Release");
+  const autoRunSince = (deps.now ?? Date.now)();
   const releaseUrl = clean2(await deps.run("gh", ["release", "create", tag, "--target", "main", "--generate-notes", "--latest", "--repo", ctx.repo])) || void 0;
   await verifyPublishedRelease(deps, ctx.repo, tag, "main", releaseSha);
   await recordPhase(ledger, deps, ledgerAnchors, "githubRelease", phaseEntry({ state: "complete", sha: releaseSha, runUrl: releaseUrl, note: `verified GitHub Release ${tag} against ${releaseSha.slice(0, 12)}` }), { landed: "the immutable tag, the green required-check wall, and the origin/main fast-forward" });
-  const announceNote = deps.announce ? (await deps.announce({ repo: ctx.repo, tag, summaryFile: options.announceSummaryFile })).note : void 0;
   let alignment = alignEarly ? await alignEarly() : void 0;
-  const autoRunSince = (deps.now ?? Date.now)();
   const deployDispatch0 = await dispatchDeploy(deps, ctx, "main", "main", deployModel, watch, autoRunSince, releaseSha, "report", meta.publishDir);
   const deployRunRepo = releaseRunRepoFor(deployModel, ctx.repo);
   const failedReleaseRun = deployDispatch0.workflowRuns?.find((run) => run.conclusion === "failure");
@@ -22946,7 +22982,8 @@ ${recovery.note}`), recoveryInput);
     }
   );
   const deployDispatch = await appendJervGatewayReleaseDeploy(deps, ctx.repo, tag, releaseSha, recoveredDeployDispatch);
-  await recordPhase(ledger, deps, ledgerAnchors, "deploy", phaseEntry(deployPhaseInput(deployModel, deployDispatch, { releaseSha })), {
+  const deployLeg = phaseEntry(deployPhaseInput(deployModel, deployDispatch, { releaseSha }));
+  await recordPhase(ledger, deps, ledgerAnchors, "deploy", deployLeg, {
     landed: "the immutable tag, the green required-check wall, the origin/main fast-forward, and the verified GitHub Release"
   });
   const publishDispatch0 = deployDispatch.deployStatus === "success" ? await dispatchPublishIfRequired(deps, ctx, meta, deployModel, "main", tag, watch, "report") : null;
@@ -22962,21 +22999,30 @@ ${recovery.note}`), recoveryInput);
   if (!publishDispatch && deployDispatch.deployStatus !== "success" && meta.publishRequired && (deployModel === "tenant-container" || deployModel === "solo-container")) {
     publishSkipNote = deployDispatch.deployStatus === "failure" ? "box deploy failed - redeploy the box before publishing" : "box deploy not confirmed (run with --watch) - publish after the box deploy lands";
   }
-  await recordPhase(ledger, deps, ledgerAnchors, "publish", phaseEntry(publishPhaseInput(deployModel, deployDispatch, publishDispatch, meta.publishRequired === true, {
+  const publishLeg = phaseEntry(publishPhaseInput(deployModel, deployDispatch, publishDispatch, meta.publishRequired === true, {
     releaseSha,
     repo: ctx.repo,
     ...publishSkipNote !== void 0 ? { skipPublishNote: publishSkipNote } : {}
-  })), {
+  }));
+  await recordPhase(ledger, deps, ledgerAnchors, "publish", publishLeg, {
     landed: "the immutable tag, the green required-check wall, origin/main, the verified GitHub Release, and the dispatched deploy path"
   });
   let dispatch = appendPublishDispatch(deployDispatch, publishDispatch);
   if (publishSkipNote) dispatch = { ...dispatch, note: `${dispatch.note}; tenant-publish.yml skipped (${publishSkipNote})` };
+  const announcing = announceShippedRelease(
+    deps,
+    { repo: ctx.repo, tag, summaryFile: options.announceSummaryFile },
+    deployModel,
+    { deploy: deployLeg, publish: publishLeg },
+    releaseAnnounceDeferral(deployModel, options.announceSummaryFile)
+  );
   if (watch && alignment) {
     alignment = {
       dev: await awaitAlignmentLanded(deps, ctx, alignment.dev, "development"),
       ...alignment.rc ? { rc: await awaitAlignmentLanded(deps, ctx, alignment.rc, "rc") } : {}
     };
   }
+  const announceNote = await announcing;
   return { checks, releaseUrl, announceNote, dispatch, ledgerAnchors, ...alignment ? { alignment } : {} };
 }
 function resumeStateOf(status) {
@@ -23224,6 +23270,7 @@ async function runReleaseResumePipeline(deps, options, prepared) {
 Live origin/tag/Release proof stays authoritative; nothing was written. Inspect ${ledger.path} before retrying.`
     );
   }
+  const shippedBefore = shipLegsGreen(persisted?.phases.deploy, persisted?.phases.publish);
   if (persisted?.lane && persisted.lane !== "release") {
     throw new Error(`release --resume refused: the ${tag} ledger belongs to the ${persisted.lane} lane \u2014 finish it with ${ledgerLaneResumeCommand(persisted)} (#6068). Nothing was written.`);
   }
@@ -23280,8 +23327,8 @@ Nothing was written. Inspect ${ledger.path} (or clear it only after proving the
       deployStatus: historicalDeploy,
       workflowRuns: historicalRows
     });
+    const phaseInputs = phaseInputsFromRunRows(deployModel, dispatch2.workflowRuns ?? historicalRows, tagSha, { repo: ctx.repo });
     if (persisted) {
-      const phaseInputs = phaseInputsFromRunRows(deployModel, dispatch2.workflowRuns ?? historicalRows, tagSha, { repo: ctx.repo });
       if (persisted.phases.deploy.superseded !== true) {
         await recordPhase(ledger, deps, anchors, "deploy", phaseEntry(phaseInputs.deploy), { strict: true, landed: "the verified GitHub Release and origin/main at the immutable tag SHA" });
       }
@@ -23290,6 +23337,13 @@ Nothing was written. Inspect ${ledger.path} (or clear it only after proving the
       await recordPhase(ledger, deps, anchors, "promotion", phaseEntry({ state: "complete", sha: tagSha, note: "re-verified live: origin/main contains the immutable tag SHA" }), { strict: true, landed: "nothing beyond the already-public release" });
     }
     if (isJervHubRepo(ctx.repo)) steps2.push(dispatch2.note);
+    const announceNote2 = persisted && !shippedBefore && persisted.phases.deploy.superseded !== true && prodReleaseTargets(deployModel).length > 0 ? await announceShippedRelease(
+      deps,
+      { repo: ctx.repo, tag, summaryFile: options.announceSummaryFile },
+      deployModel,
+      phaseInputs,
+      releaseAnnounceDeferral(deployModel, options.announceSummaryFile)
+    ) : void 0;
     if (persisted) {
       await recordPhase(ledger, deps, anchors, "alignment", phaseEntry(alignmentPhaseEntry(devRollForward2, rcAlignment2)), { strict: true, landed: "the released, verified, deploy-resolved release (alignment PRs reused/landed)" });
     }
@@ -23307,6 +23361,7 @@ Nothing was written. Inspect ${ledger.path} (or clear it only after proving the
       state: state2,
       resumed: true,
       steps: steps2,
+      ...announceNote2 ? { announceNote: announceNote2 } : {},
       devRollForward: devRollForward2,
       rcAlignment: rcAlignment2,
       dispatch: dispatch2,
@@ -23363,16 +23418,15 @@ ${recovery.note}`), recoveryInput);
   await runGitPush(deps, ["push", "origin", `${tagSha}:refs/heads/main`]);
   steps.push(`pushed ${tagSha.slice(0, 12)} to origin/main`);
   await recordPhase(ledger, deps, anchors, "promotion", phaseEntry({ state: "complete", sha: tagSha, note: `resumed: ${tagSha.slice(0, 12)} pushed to origin/main (tag preserved, never re-cut)` }), { strict: ledgerMode === "strict", landed: "the immutable tag and the re-proven required-check wall" });
-  deps.warn?.("Release: Creating the release announcement");
+  deps.warn?.("Release: Creating the GitHub Release");
+  const autoRunSince = (deps.now ?? Date.now)();
   const releaseUrl = clean2(await deps.run("gh", ["release", "create", tag, "--target", "main", "--generate-notes", "--latest", "--repo", ctx.repo])) || void 0;
   steps.push(`created the GitHub Release for ${tag}`);
   await verifyPublishedRelease(deps, ctx.repo, tag, "main", tagSha);
   steps.push("verified the Release published against the tagged commit");
   await recordPhase(ledger, deps, anchors, "githubRelease", phaseEntry({ state: "complete", sha: tagSha, runUrl: releaseUrl, note: "verified the Release published against the tagged commit" }), { strict: ledgerMode === "strict", landed: "the immutable tag, the re-proven wall, and the origin/main push" });
-  const announceNote = deps.announce ? (await deps.announce({ repo: ctx.repo, tag, summaryFile: options.announceSummaryFile })).note : void 0;
   let devRollForward = await rollDevelopmentForward(deps, ctx, tag);
   let rcAlignment = !directTrack && branchHints.hasRcBranch ? await alignRcForward(deps, ctx, tag) : void 0;
-  const autoRunSince = (deps.now ?? Date.now)();
   const deployDispatch0 = await dispatchDeploy(deps, ctx, "main", "main", deployModel, watch, autoRunSince, tagSha, "report", meta.publishDir);
   const recoveredDeployDispatch = await recoverFailedDispatchPhase(
     deps,
@@ -23389,7 +23443,8 @@ ${recovery.note}`), recoveryInput);
   );
   const deployDispatch = await appendJervGatewayReleaseDeploy(deps, ctx.repo, tag, tagSha, recoveredDeployDispatch);
   steps.push(`dispatched the ${deployModel} deploy path`);
-  await recordPhase(ledger, deps, anchors, "deploy", phaseEntry(deployPhaseInput(deployModel, deployDispatch, { releaseSha: tagSha })), {
+  const deployLeg = phaseEntry(deployPhaseInput(deployModel, deployDispatch, { releaseSha: tagSha }));
+  await recordPhase(ledger, deps, anchors, "deploy", deployLeg, {
     strict: ledgerMode === "strict",
     landed: "the immutable tag, the re-proven wall, the origin/main push, and the verified GitHub Release"
   });
@@ -23402,15 +23457,24 @@ ${recovery.note}`), recoveryInput);
     publishDispatch0,
     { repo: releaseRunRepoFor(deployModel, ctx.repo), sha: tagSha, watched: isCentralDispatchModel(deployModel), workflow: isCentralDispatchModel(deployModel) ? "tenant-publish.yml" : "publish.yml" }
   ) : null;
-  await recordPhase(ledger, deps, anchors, "publish", phaseEntry(publishPhaseInput(deployModel, deployDispatch, publishDispatch, meta.publishRequired === true, { releaseSha: tagSha, repo: ctx.repo })), {
+  const publishLeg = phaseEntry(publishPhaseInput(deployModel, deployDispatch, publishDispatch, meta.publishRequired === true, { releaseSha: tagSha, repo: ctx.repo }));
+  await recordPhase(ledger, deps, anchors, "publish", publishLeg, {
     strict: ledgerMode === "strict",
     landed: "the immutable tag, the re-proven wall, origin/main, the verified GitHub Release, and the dispatched deploy path"
   });
   const dispatch = appendPublishDispatch(deployDispatch, publishDispatch);
+  const announcing = announceShippedRelease(
+    deps,
+    { repo: ctx.repo, tag, summaryFile: options.announceSummaryFile },
+    deployModel,
+    { deploy: deployLeg, publish: publishLeg },
+    releaseAnnounceDeferral(deployModel, options.announceSummaryFile)
+  );
   if (watch) {
     devRollForward = await awaitAlignmentLanded(deps, ctx, devRollForward, "development");
     if (rcAlignment) rcAlignment = await awaitAlignmentLanded(deps, ctx, rcAlignment, "rc");
   }
+  const announceNote = await announcing;
   steps.push(`development roll-forward: ${devRollForward.status}`);
   if (rcAlignment) steps.push(`rc alignment: ${rcAlignment.status}`);
   const followUp = deriveTrainFollowUpStatus({
@@ -43454,15 +43518,11 @@ ${decision.note}`);
   );
   await recordHotfixPhase(ledger, anchors, "promotion", { state: "complete", sha: mergedSha, note: `immutable ${tag} pushed at ${mergedSha.slice(0, 12)}; origin/main already carries it (merged hotfix PR #${pr.number})` }, "the immutable tag and the green required-check wall");
   let releaseNote;
-  let announceNote;
   if (releaseExists) {
     releaseNote = `Release ${tag} already exists \u2014 resumed without recreating`;
   } else {
     await deps.run("gh", ["release", "create", tag, "--repo", ctx.repo, "--target", "main", "--generate-notes", "--latest"]);
     releaseNote = `Release ${tag} created (target main)`;
-    if (deps.announce) {
-      announceNote = (await deps.announce({ repo: ctx.repo, tag, summaryFile: options.announceSummaryFile })).note;
-    }
   }
   await recordHotfixPhase(ledger, anchors, "githubRelease", { state: "complete", sha: mergedSha, note: releaseNote }, "the immutable tag, the green wall, and origin/main");
   const runs = [];
@@ -43535,6 +43595,13 @@ ${decision.note}`);
   );
   await recordHotfixPhase(ledger, anchors, "deploy", ledgerInputs.deploy, "the immutable tag, the green wall, origin/main, and the GitHub Release");
   await recordHotfixPhase(ledger, anchors, "publish", ledgerInputs.publish, "the immutable tag, the green wall, origin/main, the GitHub Release, and the deploy path");
+  const announceNote = releaseExists ? void 0 : await announceShippedRelease(
+    deps,
+    { repo: ctx.repo, tag, summaryFile: options.announceSummaryFile },
+    deployModel,
+    ledgerInputs,
+    "a hotfix is announced only by the run that proves it shipped, so this one stays unannounced"
+  );
   let verifyNote;
   if (deployModel === "hub-serverless") {
     const previousRef = clean3(await deps.run("git", ["rev-parse", "--abbrev-ref", "HEAD"]));

package/package.json

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