@mutmutco/cli 4.1.11 → 4.1.13

package/dist/main.cjs

@@ -13152,10 +13152,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.1.11",
-    tag: "v4.1.11",
-    commit: "97f4b2119c1d",
-    npm: "@mutmutco/cli@4.1.11"
+    version: "4.1.13",
+    tag: "v4.1.13",
+    commit: "91a8a172eda6",
+    npm: "@mutmutco/cli@4.1.13"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -13172,14 +13172,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.1.11"
+          v3Target: "v4.1.13"
         }
       ],
       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.1.11 and redeploy the Hub Lambda from tag v4.1.11 (97f4b2119c1d); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.1.11 (@mutmutco/cli@4.1.11, tag commit 97f4b2119c1d \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.1.13 and redeploy the Hub Lambda from tag v4.1.13 (91a8a172eda6); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.1.13 (@mutmutco/cli@4.1.13, tag commit 91a8a172eda6 \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -15938,9 +15938,13 @@ async function withCheckoutRestoredAfterRelease(deps, result, startBranch) {
   return { ...result, checkout, ...localSync ? { localSync } : {} };
 }
 var HUB_REPO3 = "mutmutco/MMI-Hub";
+var JERV_HUB_REPO = "mutmutco/Jerv-Hub";
 function isHubControlRepo(repo) {
   return repo.toLowerCase() === HUB_REPO3.toLowerCase();
 }
+function isJervHubRepo(repo) {
+  return repo.toLowerCase() === JERV_HUB_REPO.toLowerCase();
+}
 function supportsReleaseAbort(_repo, meta, _branchHints) {
   return DEPLOY_MODELS.includes(meta.deployModel);
 }
@@ -16653,6 +16657,42 @@ function appendPublishDispatch(deploy, publish) {
     deployStatus: deploy.deployStatus === "failure" || publish.deployStatus === "failure" ? "failure" : deploy.deployStatus === "pending" || publish.deployStatus === "pending" ? "pending" : "success"
   };
 }
+async function appendJervGatewayReleaseDeploy(deps, repo, tag, tagSha, dispatch) {
+  if (!isJervHubRepo(repo)) return dispatch;
+  if (dispatch.deployStatus !== "success") {
+    return {
+      ...dispatch,
+      note: `${dispatch.note}; Jerv Gateway deploy deferred until package publication is proven green`
+    };
+  }
+  try {
+    const output = await deps.run("bash", ["scripts/jerv-gateway-release-deploy.sh", "--tag", tag]);
+    const receipt = output.trim().split(/\r?\n/).reverse().map((line) => {
+      try {
+        return JSON.parse(line);
+      } catch {
+        return null;
+      }
+    }).find((value) => value?.schema === "jerv-gateway/release-deploy-v1");
+    if (!receipt || receipt.tag !== tag || receipt.commit !== tagSha || receipt.status !== "healthy") {
+      throw new Error("helper receipt did not match the released tag and commit");
+    }
+    return {
+      ...dispatch,
+      note: `${dispatch.note}; Jerv Gateway deployed ${tagSha.slice(0, 12)} and passed health checks`,
+      workflowRuns: [...dispatch.workflowRuns ?? [], { workflow: "jerv-gateway", conclusion: "success" }],
+      deployStatus: "success"
+    };
+  } catch (error) {
+    const detail = (error instanceof Error ? error.message : String(error)).split(/\r?\n/, 1)[0].slice(0, 240);
+    return {
+      ...dispatch,
+      note: `${dispatch.note}; Jerv Gateway deploy FAILED (${detail})`,
+      workflowRuns: [...dispatch.workflowRuns ?? [], { workflow: "jerv-gateway", conclusion: "failure" }],
+      deployStatus: "failure"
+    };
+  }
+}
 async function watchOwnWorkflowRuns(deps, repo, targets, since, headSha, enumerateSha = false) {
   const workflowRuns = [];
   for (const target of targets) {
@@ -17338,6 +17378,9 @@ async function completeMainRelease(deps, ctx, meta, deployModel, watch, options,
   let tagPush;
   try {
     await assertComputedReleaseTagStillNext(deps, tag);
+    if (deployModel === "hub-serverless") {
+      await deps.run("node", ["scripts/release-distribution.mjs", "assert-release-lineage", tag.replace(/^v/, ""), "--release-commit", releaseSha]);
+    }
     tagPush = await ensureTagPushed(deps, tag, releaseSha, tagProbe, ctx.repo);
   } catch (e) {
     throw await recoverFailedFold(deps, e, startBranch, preFold.mainSha, resumeCommand);
@@ -17363,6 +17406,7 @@ async function completeMainRelease(deps, ctx, meta, deployModel, watch, options,
   const deployDispatch = await dispatchDeploy(deps, ctx, "main", "main", deployModel, watch, autoRunSince, releaseSha, "report", meta.publishDir);
   const publishDispatch = deployDispatch.deployStatus === "success" ? await dispatchPublishIfRequired(deps, ctx, meta, deployModel, "main", tag, watch, "report") : null;
   let dispatch = appendPublishDispatch(deployDispatch, publishDispatch);
+  dispatch = await appendJervGatewayReleaseDeploy(deps, ctx.repo, tag, releaseSha, dispatch);
   if (!publishDispatch && deployDispatch.deployStatus !== "success" && meta.publishRequired && (deployModel === "tenant-container" || deployModel === "solo-container")) {
     const reason = deployDispatch.deployStatus === "failure" ? "box deploy failed \u2014 redeploy the box before publishing" : "box deploy not confirmed (run with --watch) \u2014 publish after the box deploy lands";
     dispatch = {
@@ -17501,9 +17545,14 @@ async function runReleaseResume(deps, options = {}) {
     const rcAlignment2 = !directTrack && branchHints.hasRcBranch ? await alignRcForward(deps, ctx, tag) : void 0;
     if (rcAlignment2) steps2.push(`rc alignment: ${rcAlignment2.status}`);
     const historicalDeploy = await deriveHistoricalDeployStatus(deps, ctx, deployModel, tagSha);
+    const dispatch2 = await appendJervGatewayReleaseDeploy(deps, ctx.repo, tag, tagSha, {
+      note: `historical ${deployModel} deploy/publish status: ${historicalDeploy}`,
+      deployStatus: historicalDeploy
+    });
+    if (isJervHubRepo(ctx.repo)) steps2.push(dispatch2.note);
     const state2 = resumeStateOf(deriveTrainFollowUpStatus({
       projectInfo: "ok",
-      deploy: deployFollowUpOutcome(historicalDeploy),
+      deploy: deployFollowUpOutcome(dispatch2.deployStatus),
       rcRetirement: "ok",
       alignment: alignmentFollowUpOutcome(devRollForward2, rcAlignment2),
       foldPort: "ok"
@@ -17516,6 +17565,7 @@ async function runReleaseResume(deps, options = {}) {
       steps: steps2,
       devRollForward: devRollForward2,
       rcAlignment: rcAlignment2,
+      dispatch: dispatch2,
       note: state2 === "failed" ? `release ${tag} was already published, but its deploy/publish on the release SHA FAILED \u2014 re-run the failed job (do NOT re-tag); the protected alignment PRs were reused` : state2 === "pending" ? `release ${tag} was already published; reused its protected alignment PRs, but a deploy/publish or alignment follow-up is unresolved \u2014 watch it to completion` : `release ${tag} was already published; alignment is complete and the deploy on the release SHA is proven green`
     };
   }
@@ -17548,7 +17598,8 @@ async function runReleaseResume(deps, options = {}) {
   const autoRunSince = (deps.now ?? Date.now)();
   const deployDispatch = await dispatchDeploy(deps, ctx, "main", "main", deployModel, watch, autoRunSince, tagSha, "report", meta.publishDir);
   const publishDispatch = deployDispatch.deployStatus === "success" ? await dispatchPublishIfRequired(deps, ctx, meta, deployModel, "main", tag, watch, "report") : null;
-  const dispatch = appendPublishDispatch(deployDispatch, publishDispatch);
+  let dispatch = appendPublishDispatch(deployDispatch, publishDispatch);
+  dispatch = await appendJervGatewayReleaseDeploy(deps, ctx.repo, tag, tagSha, dispatch);
   steps.push(`dispatched the ${deployModel} deploy path`);
   const devRollForward = await rollDevelopmentForward(deps, ctx, tag);
   steps.push(`development roll-forward: ${devRollForward.status}`);
@@ -24450,6 +24501,9 @@ async function runHotfixRelease(deps, versionInput, options = {}) {
   }
   const required = await discoverRequiredCheckContexts(deps, ctx, "main");
   assertTagAddressableRequiredContexts(deps, required, ctx.repo);
+  if (deployModel === "hub-serverless") {
+    await deps.run("node", ["scripts/release-distribution.mjs", "assert-release-lineage", version, "--release-commit", mergedSha]);
+  }
   const tagPush = await ensureTagPushed(deps, tag, mergedSha);
   const tagPushSince = Date.now();
   const tagNote = tagPush.note;
@@ -33658,6 +33712,27 @@ function selectSafeWorktreeCwd(worktrees, targetPath, options) {
   const exists = options?.pathExists ?? (() => true);
   return worktrees.find((w) => !samePath(w.path, targetPath) && exists(w.path))?.path;
 }
+function formatGitCommandError(e) {
+  if (!(e instanceof Error)) return String(e);
+  const err = e;
+  const stderr = typeof err.stderr === "string" ? err.stderr.trim() : "";
+  const stdout = typeof err.stdout === "string" ? err.stdout.trim() : "";
+  const message = err.message.trim();
+  if (stderr) return stderr;
+  if (message && !/^Command failed:/i.test(message)) return message;
+  if (stdout) return stdout;
+  return message || "git command failed";
+}
+function isWorktreePathRegistered(worktrees, wtPath) {
+  return worktrees.some((w) => samePath(w.path, wtPath));
+}
+function isNotAWorkingTreeMessage(error) {
+  return /is not a working tree/i.test(error);
+}
+function formatWorktreeRemovalFailureDetail(options) {
+  const detail = options.removeError.trim() || "git worktree remove exited nonzero";
+  return `${detail}; registered=${options.registered ? "yes" : "no"}; pathExists=${options.pathExists ? "yes" : "no"}; path=${options.wtPath}`;
+}
 async function resolveMergeBaseTimestampMs(git3, baseRef, branch) {
   try {
     const mergeBase = (await git3(["merge-base", baseRef, branch])).trim();
@@ -33685,14 +33760,52 @@ async function teardownWorktreeStage(worktreePath) {
     return { status: "failed", error: e instanceof Error ? e.message : String(e) };
   }
 }
-async function removeWorktree(wtPath, git3) {
-  try {
-    await git3(["worktree", "remove", "--force", wtPath]);
+async function removeWorktreeWithReconcile(wtPath, git3, listWorktrees, pathExists) {
+  const attemptRemove = async () => {
+    try {
+      await git3(["worktree", "remove", "--force", wtPath]);
+      return void 0;
+    } catch (e) {
+      return formatGitCommandError(e);
+    }
+  };
+  const firstError = await attemptRemove();
+  if (!firstError) {
     await git3(["worktree", "prune"]).catch(() => "");
     return { status: "removed" };
-  } catch (e) {
-    return { status: "failed", error: e instanceof Error ? e.message : String(e) };
   }
+  let worktrees = await listWorktrees().catch(() => []);
+  if (!isWorktreePathRegistered(worktrees, wtPath)) {
+    await git3(["worktree", "prune"]).catch(() => "");
+    return { status: "removed", reason: "reconciled-unregistered" };
+  }
+  const retryError = await attemptRemove();
+  if (!retryError) {
+    await git3(["worktree", "prune"]).catch(() => "");
+    return { status: "removed", reason: "reconciled-after-retry" };
+  }
+  if (isNotAWorkingTreeMessage(retryError) || isNotAWorkingTreeMessage(firstError)) {
+    worktrees = await listWorktrees().catch(() => worktrees);
+    if (!isWorktreePathRegistered(worktrees, wtPath)) {
+      await git3(["worktree", "prune"]).catch(() => "");
+      return { status: "removed", reason: "reconciled-not-a-working-tree" };
+    }
+  }
+  worktrees = await listWorktrees().catch(() => worktrees);
+  const registered = isWorktreePathRegistered(worktrees, wtPath);
+  if (!registered) {
+    await git3(["worktree", "prune"]).catch(() => "");
+    return { status: "removed", reason: "reconciled-unregistered" };
+  }
+  return {
+    status: "failed",
+    error: formatWorktreeRemovalFailureDetail({
+      removeError: retryError || firstError,
+      registered,
+      pathExists: pathExists(wtPath),
+      wtPath
+    })
+  };
 }
 async function cleanupPrMergeLocalBranch(branch, options) {
   const report = { branch };
@@ -33797,7 +33910,12 @@ async function cleanupPrMergeLocalBranch(branch, options) {
     report.localBranch = { name: branch, status: "not-attempted", reason: "archive-failed" };
     return report;
   }
-  const removal = await removeWorktree(wtPath, git3);
+  const removal = await removeWorktreeWithReconcile(
+    wtPath,
+    git3,
+    async () => parseGitWorktreePorcelain(await execGit(["worktree", "list", "--porcelain"])),
+    pathExists
+  );
   if (removal.status === "failed") {
     report.worktree = {
       path: wtPath,
@@ -33813,6 +33931,7 @@ async function cleanupPrMergeLocalBranch(branch, options) {
   report.worktree = {
     path: wtPath,
     status: "removed",
+    ...removal.reason ? { reason: removal.reason } : {},
     artifactsArchive,
     stageTeardown,
     tmpEvidenceCount: tmpEvidence.length
@@ -33831,7 +33950,11 @@ function renderPrMergeCleanupLines(cleanup) {
   if (!wt?.path) return [];
   const lines = [];
   if (wt.status === "removed") {
-    lines.push(`pr merge: removed worktree ${wt.path} \u2014 that directory is gone; cd elsewhere before your next command`);
+    if (wt.reason?.startsWith("reconciled")) {
+      lines.push(`pr merge: worktree ${wt.path} remove reported failure but git no longer registers it \u2014 deleted local branch`);
+    } else {
+      lines.push(`pr merge: removed worktree ${wt.path} \u2014 that directory is gone; cd elsewhere before your next command`);
+    }
   } else if (wt.status === "refused") {
     lines.push(`pr merge: worktree ${wt.path} kept \u2014 ${wt.reason ?? "refused"}${wt.error ? `: ${wt.error}` : ""}`);
     if (wt.tmpEvidenceCount) lines.push(`pr merge: ${wt.tmpEvidenceCount} tmp path(s) newer than branch base would have been destroyed`);
@@ -43087,10 +43210,11 @@ var GH_RUN_WATCH_TIMEOUT_MS = 20 * 6e4;
 var NODE_PREPARE_TIMEOUT_MS = 10 * 6e4;
 var NODE_VERIFY_TIMEOUT_MS = 5 * 6e4;
 var NPM_TRAIN_TIMEOUT_MS = 6e4;
+var JERV_GATEWAY_DEPLOY_TIMEOUT_MS = 20 * 6e4;
 function trainApplyDeps() {
   return {
     run: async (file, args) => {
-      const timeout = file === "node" && args[1] === "prepare" ? NODE_PREPARE_TIMEOUT_MS : file === "node" && args[1] === "verify" ? NODE_VERIFY_TIMEOUT_MS : file === "npm" ? NPM_TRAIN_TIMEOUT_MS : file !== "gh" ? GIT_TIMEOUT_MS : args[0] === "run" && args[1] === "watch" ? GH_RUN_WATCH_TIMEOUT_MS : GH_TRAIN_TIMEOUT_MS;
+      const timeout = file === "node" && args[1] === "prepare" ? NODE_PREPARE_TIMEOUT_MS : file === "node" && args[1] === "verify" ? NODE_VERIFY_TIMEOUT_MS : file === "npm" ? NPM_TRAIN_TIMEOUT_MS : file === "bash" && args[0] === "scripts/jerv-gateway-release-deploy.sh" ? JERV_GATEWAY_DEPLOY_TIMEOUT_MS : file !== "gh" ? GIT_TIMEOUT_MS : args[0] === "run" && args[1] === "watch" ? GH_RUN_WATCH_TIMEOUT_MS : GH_TRAIN_TIMEOUT_MS;
       try {
         return isWin2 && file === "npm" ? (await execFileP2("cmd.exe", ["/c", "npm", ...args], { timeout })).stdout : (await execFileP2(file, args, { timeout })).stdout;
       } catch (e) {

package/package.json

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