@mutmutco/cli 3.59.0 → 3.60.0

package/dist/main.cjs

@@ -37,7 +37,8 @@ __export(index_exports, {
   gcPlan: () => gcPlan,
   isOrgRegisteredRepo: () => isOrgRegisteredRepo,
   registryClientDeps: () => registryClientDeps,
-  repoSlug: () => repoSlug
+  repoSlug: () => repoSlug,
+  shouldMarkWorktreeActivity: () => shouldMarkWorktreeActivity
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -14032,16 +14033,17 @@ async function rollDevelopmentForward(deps, ctx, tag) {
 }
 async function enqueueAlignmentAutoMerge(deps, ctx, prNumber, prUrl, openedNote) {
   const base = { status: "pr-pending", prNumber, prUrl };
-  const manual = `${openedNote} \u2014 land it with \`mmi-cli pr merge ${prNumber ?? "<number>"} --auto --merge\``;
+  const retryCommand = `mmi-cli pr merge ${prNumber ?? "<number>"} --auto --merge`;
+  const manual = `${openedNote} \u2014 land it with \`${retryCommand}\``;
   if (deps.mergeAuto && prNumber !== void 0) {
     try {
       const res = await deps.mergeAuto(String(prNumber), ctx.repo);
       if (res.mergeStatus !== "failed") {
         return { ...base, autoMergeEnqueued: true, note: `${openedNote} \u2014 auto-merge enqueued (merges when checks pass)` };
       }
-      deps.warn?.(`alignment PR #${prNumber} auto-merge enqueue failed (${res.error ?? "unknown error"}) \u2014 land it manually`);
+      deps.warn?.(`alignment PR #${prNumber} auto-merge not armed (${res.error ?? "unknown error"}) \u2014 re-run: ${retryCommand}`);
     } catch (e) {
-      deps.warn?.(`alignment PR #${prNumber} auto-merge enqueue threw (${e instanceof Error ? e.message : String(e)}) \u2014 land it manually`);
+      deps.warn?.(`alignment PR #${prNumber} auto-merge enqueue threw (${e instanceof Error ? e.message : String(e)}) \u2014 re-run: ${retryCommand}`);
     }
   }
   return { ...base, note: manual };
@@ -21792,11 +21794,17 @@ function lookupWorktreeOwner(primaryRoot, path2) {
 function recordWorktreeOwner(primaryRoot, entry) {
   writeOwners(primaryRoot, upsertWorktreeOwner(readOwners(primaryRoot), entry));
 }
-function touchWorktreeOwner(primaryRoot, path2, at = /* @__PURE__ */ new Date()) {
+var WORKTREE_TOUCH_MIN_INTERVAL_MS = 5 * 6e4;
+function touchWorktreeOwner(primaryRoot, path2, at = /* @__PURE__ */ new Date(), minIntervalMs = 0) {
   const entries = readOwners(primaryRoot);
   const owner = findWorktreeOwner(entries, path2);
-  if (!owner) return;
+  if (!owner) return false;
+  if (minIntervalMs > 0) {
+    const last = Date.parse(owner.lastSeenAt);
+    if (Number.isFinite(last) && at.getTime() - last < minIntervalMs) return false;
+  }
   writeOwners(primaryRoot, upsertWorktreeOwner(entries, { ...owner, lastSeenAt: at.toISOString() }));
+  return true;
 }
 function dropWorktreeOwner(primaryRoot, path2) {
   const entries = readOwners(primaryRoot);
@@ -22161,7 +22169,10 @@ async function ghMergeAutoEnqueue(prNumber, repo, method, io = defaultGhMergeAut
     if (!basePolicyBlocksImmediateMerge(message)) {
       return { mergeStatus: "failed", error: ghFailureReason(e) };
     }
-    return { mergeStatus: "failed", error: `merge blocked: ${ghFailureReason(e)} \u2014 ensure checks are green` };
+    return {
+      mergeStatus: "failed",
+      error: `${ghFailureReason(e)} \u2014 auto-merge could not be armed yet (the PR's required checks have not registered); re-run the same --auto merge once they appear`
+    };
   }
   return confirmEnqueueOutcome();
 }
@@ -25630,9 +25641,23 @@ function appActorDeps() {
     fetch: (url, init) => fetch(url, init)
   };
 }
+function shouldMarkWorktreeActivity(commandPath3) {
+  return commandPath3.split(" ")[0] !== "worktree";
+}
+async function markWorktreeActivity(commandPath3) {
+  try {
+    if (!shouldMarkWorktreeActivity(commandPath3)) return;
+    if (!isLinkedWorktree(process.cwd())) return;
+    const primaryRoot = await primaryCheckoutRoot(process.cwd());
+    if (primaryRoot) touchWorktreeOwner(primaryRoot, process.cwd(), /* @__PURE__ */ new Date(), WORKTREE_TOUCH_MIN_INTERVAL_MS);
+  } catch {
+  }
+}
 program2.hook("preAction", async (_thisCommand, actionCommand) => {
+  const commandPath3 = commandPathOf(actionCommand);
+  await markWorktreeActivity(commandPath3);
   try {
-    await activateAppActor(commandPathOf(actionCommand), process.env, () => mintInstallationToken(appActorDeps()));
+    await activateAppActor(commandPath3, process.env, () => mintInstallationToken(appActorDeps()));
   } catch (e) {
     if (e instanceof AppActorError) return fail(e.message);
     throw e;
@@ -27867,5 +27892,6 @@ program2.parseAsync(process.argv).then(() => finishCliRun()).catch((e) => failGr
   gcPlan,
   isOrgRegisteredRepo,
   registryClientDeps,
-  repoSlug
+  repoSlug,
+  shouldMarkWorktreeActivity
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "3.59.0",
+  "version": "3.60.0",
   "description": "MMI Future CLI — the org dev toolbox (board, registry, keyless secrets, release train, bootstrap, doctor) and the cross-IDE engine the plugin's session-start hook drives.",
   "type": "module",
   "license": "UNLICENSED",