@mutmutco/hub 4.2.2 → 4.2.4

package/dist/index.cjs

@@ -66,8 +66,10 @@ __export(index_exports, {
   retryHint: () => retryHint,
   schedulePendingWatcher: () => schedulePendingWatcher,
   schedulerStatus: () => schedulerStatus,
+  selfDist: () => selfDist,
   sharedDocLockPath: () => sharedDocLockPath,
   sharedDocLockTimeoutReceipt: () => sharedDocLockTimeoutReceipt,
+  shouldHandOff: () => shouldHandOff,
   startSpinner: () => startSpinner,
   systemdServiceUnit: () => systemdServiceUnit,
   systemdTimerUnit: () => systemdTimerUnit,
@@ -81,6 +83,7 @@ __export(index_exports, {
   writePending: () => writePending
 });
 module.exports = __toCommonJS(index_exports);
+var import_node_child_process12 = require("node:child_process");
 var import_node_fs19 = require("node:fs");
 var import_node_path15 = require("node:path");
 
@@ -1208,11 +1211,16 @@ function cliArm(options) {
 }
 
 // src/arm-self.ts
+var SELF_PACKAGE = "@mutmutco/hub";
+var SELF_DIST_REL = "dist/index.cjs";
+function selfDist(env) {
+  return globalDist(env, SELF_PACKAGE, SELF_DIST_REL);
+}
 function selfArm(options) {
   return npmGlobalArm({
     surface: "updater",
-    packageName: "@mutmutco/hub",
-    distRel: "dist/index.cjs",
+    packageName: SELF_PACKAGE,
+    distRel: SELF_DIST_REL,
     ...options
   });
 }
@@ -2671,6 +2679,11 @@ function reap(options) {
 
 // src/reconcile.ts
 var CANDIDATE_BOUND_DEFAULT = 12;
+function shouldHandOff(self, options) {
+  if (options.dryRun || options.guard) return false;
+  if (!options.dist) return false;
+  return self.verdict === "ok" && Boolean(self.from) && self.from !== self.to;
+}
 function reconcile(options) {
   const env = options.env ?? process.env;
   const say = (line) => {
@@ -2685,7 +2698,7 @@ function reconcile(options) {
     const stamped = options.dryRun ? { ...event, dryRun: true } : event;
     if (!appendJournal(paths.journalPath, { ts: (/* @__PURE__ */ new Date()).toISOString(), run, ...stamped })) summary.journalOk = false;
   };
-  const summary = { run, target: null, gate: null, atomicity: null, cli: null, updater: null, plugins: [], reap: [], surfaces: [], journalOk: true, exit: 0 };
+  const summary = { run, target: null, gate: null, atomicity: null, cli: null, updater: null, plugins: [], reap: [], surfaces: [], journalOk: true, reexec: null, exit: 0 };
   const recordArm = (arm) => {
     if (arm.verdict === "fail") arm.repeatFailure = journalSurfaceRepeatedFail(paths.journalPath, arm.surface, run);
     journal({ kind: "arm", surface: arm.surface, from: arm.from, to: arm.to, verdict: arm.verdict, detail: arm.detail, compat: arm.compat });
@@ -2750,6 +2763,18 @@ function reconcile(options) {
       }
       say(`target v${summary.target} (${summary.gate})`);
       options.onTargetResolved?.(summary.target, summary.gate);
+      say("updater: self-bootstrap");
+      const self = selfArm({ target: summary.target, dryRun: options.dryRun, paths, env });
+      summary.updater = self;
+      recordArm(self);
+      say(`updater: ${self.verdict}${self.detail ? " \u2014 " + self.detail : ""}`);
+      const handoffDist = selfDist(env);
+      if (shouldHandOff(self, { dryRun: options.dryRun, dist: handoffDist, guard: env.MMI_UPDATER_REEXEC })) {
+        summary.reexec = { dist: handoffDist, target: summary.target, from: self.from };
+        journal({ kind: "reexec", surface: "updater", from: self.from, to: summary.target, verdict: "ok", detail: `handing off to ${handoffDist} \u2014 the remaining surfaces converge under ${summary.target}` });
+        say(`updater: handing off to ${summary.target}`);
+        return summary;
+      }
       say(`cli: converging to v${summary.target}`);
       const cli = cliArm({ target: summary.target, dryRun: options.dryRun, paths, env });
       summary.cli = cli;
@@ -2773,11 +2798,6 @@ function reconcile(options) {
           journal({ kind: "surface", surface: probe.id, present: true, verdict: "skip", detail: `present, its converge arm has not landed yet (target ${summary.target})` });
         }
       }
-      say("updater: self-bootstrap");
-      const self = selfArm({ target: summary.target, dryRun: options.dryRun, paths, env });
-      summary.updater = self;
-      recordArm(self);
-      say(`updater: ${self.verdict}${self.detail ? " \u2014 " + self.detail : ""}`);
       return summary;
     });
   } catch (error) {
@@ -3487,6 +3507,7 @@ function stripAnsi(text) {
 }
 function collectRows(summary) {
   const rows = [];
+  if (summary.updater) rows.push(classify(summary.updater));
   if (summary.cli) rows.push(classify(summary.cli));
   for (const arm of summary.plugins) rows.push(classify(arm));
   for (const surface of summary.surfaces) {
@@ -3494,7 +3515,6 @@ function collectRows(summary) {
       rows.push({ name: surface.id, from: null, to: summary.target ?? "?", kind: "pending", note: "arm not landed", detail: "", repeatFailure: false });
     }
   }
-  if (summary.updater) rows.push(classify(summary.updater));
   return rows;
 }
 function headline(detail, width) {
@@ -3543,7 +3563,7 @@ function reportFooterLines(summary, options = {}) {
     out.push("");
     out.push(...noteLines(
       "  note: ",
-      `hub moved ${self.from} \u2192 ${self.to} after the surfaces above ran, so they used ${self.from} logic \u2014 rerun \`mmi-hub update\` to bring them to ${self.to}`,
+      `hub moved ${self.from} \u2192 ${self.to} while the surfaces above were converging, so they used ${self.from} logic \u2014 rerun \`mmi-hub update\` to bring them to ${self.to}`,
       width
     ));
   }
@@ -3688,6 +3708,24 @@ function printReconcile(summary, json, dryRun = false) {
     journalPath: statePaths(process.env).journalPath
   }));
 }
+function handOff(reexec, args, json) {
+  if (!json) {
+    process.stdout.write(`  updater  ${reexec.from ?? "absent"} \u2192 ${reexec.target}    updated \u2014 rerunning under ${reexec.target}
+
+`);
+  }
+  const child = (0, import_node_child_process12.spawnSync)(process.execPath, [reexec.dist, ...args], {
+    stdio: "inherit",
+    windowsHide: true,
+    env: { ...process.env, MMI_UPDATER_REEXEC: "1" }
+  });
+  if (child.error || typeof child.status !== "number") {
+    process.stderr.write(`mmi-hub: could not run the updated updater at ${reexec.dist} \u2014 ${child.error?.message ?? "no exit status"}; rerun \`mmi-hub update\`
+`);
+    return 1;
+  }
+  return child.status;
+}
 function runUpdate(args, json) {
   const dryRun = args.includes("--dry-run");
   const verbose = args.includes("--verbose");
@@ -3745,11 +3783,24 @@ function main(args = process.argv.slice(2)) {
   }
   if (command === "update") {
     const { summary, rendered } = runUpdate(args, json);
+    if (summary.reexec) return handOff(summary.reexec, args, json);
     if (!rendered) printReconcile(summary, json, args.includes("--dry-run"));
     return summary.exit;
   }
   if (command === "install") {
     const { summary, rendered } = runUpdate(args, json);
+    if (summary.reexec) {
+      const handedOff = handOff(summary.reexec, ["update", ...args.filter((arg) => arg !== "install")], json);
+      const scheduled = installTask();
+      if (!json) {
+        process.stdout.write(scheduled.ok ? `  Auto-update on \u2014 hourly task "MMI Fleet Updater".
+` : `  Auto-update NOT enabled \u2014 ${scheduled.detail}
+`);
+      } else {
+        process.stdout.write(JSON.stringify({ convergence: summary, autoupdate: scheduled }, null, 2) + "\n");
+      }
+      return Math.max(handedOff, scheduled.ok ? 0 : 1);
+    }
     const schedule = installTask();
     if (json) {
       process.stdout.write(JSON.stringify({ convergence: summary, autoupdate: schedule }, null, 2) + "\n");
@@ -3826,8 +3877,10 @@ if (typeof require !== "undefined" && require.main === module) {
   retryHint,
   schedulePendingWatcher,
   schedulerStatus,
+  selfDist,
   sharedDocLockPath,
   sharedDocLockTimeoutReceipt,
+  shouldHandOff,
   startSpinner,
   systemdServiceUnit,
   systemdTimerUnit,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/hub",
-  "version": "4.2.2",
+  "version": "4.2.4",
   "description": "Install and maintain the MMI CLI and every present host surface from one release-gated Hub command.",
   "type": "module",
   "license": "UNLICENSED",