@mutmutco/hub 4.3.38 → 4.3.40

package/dist/index.cjs

@@ -60,6 +60,7 @@ __export(index_exports, {
   progressiveRow: () => progressiveRow,
   readLaunchTarget: () => readLaunchTarget,
   readPending: () => readPending,
+  reconcile: () => reconcile,
   reconcileCursorUserHooks: () => reconcileCursorUserHooks,
   releaseSharedDocLock: () => releaseSharedDocLock,
   reportFooterLines: () => reportFooterLines,
@@ -146,8 +147,8 @@ function readLease(path) {
     return null;
   }
 }
-function withLease(path, fn) {
-  const deadline = Date.now() + LEASE_WAIT_MS;
+function withLease(path, fn, waitMs = LEASE_WAIT_MS) {
+  const deadline = Date.now() + waitMs;
   for (; ; ) {
     const attempt = tryAcquire(path);
     if (typeof attempt === "object") {
@@ -158,9 +159,9 @@ function withLease(path, fn) {
       }
     }
     if (Date.now() >= deadline) {
-      throw new UpdaterBusy(`another updater holds ${path} (waited ${LEASE_WAIT_MS}ms) \u2014 deferring`);
+      throw new UpdaterBusy(`another updater holds ${path} (waited ${waitMs}ms) \u2014 deferring`);
     }
-    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 500);
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, Math.min(500, Math.max(1, deadline - Date.now())));
   }
 }
 function appendJournal(path, event) {
@@ -2030,6 +2031,7 @@ function reconcile(options) {
   };
   try {
     say("acquiring single-writer lease");
+    const leaseWaitMs = Number(env.MMI_UPDATER_LEASE_WAIT_MS) || void 0;
     return withLease(paths.leasePath, () => {
       if (!options.dryRun) {
         const pendingBefore = readPending(paths);
@@ -2143,9 +2145,16 @@ function reconcile(options) {
         }
       }
       return summary;
-    });
+    }, leaseWaitMs);
   } catch (error) {
-    if (error instanceof UpdaterBusy || error instanceof GateEnvError) {
+    if (error instanceof UpdaterBusy) {
+      journal({ kind: "reconcile", verdict: "defer", detail: error.message });
+      summary.exit = 0;
+      summary.deferred = true;
+      summary.detail = error.message;
+      return summary;
+    }
+    if (error instanceof GateEnvError) {
       journal({ kind: "reconcile", verdict: "defer", detail: error.message });
       summary.exit = 1;
       summary.detail = error.message;
@@ -2941,7 +2950,7 @@ function formatReconcileReport(summary, options = {}) {
     total: rows.length
   };
   if (!summary.target) {
-    if (summary.exit >= 1 && summary.detail) {
+    if ((summary.exit >= 1 || summary.deferred) && summary.detail) {
       out.push("MMI Hub \u2014 cannot update now");
       out.push(...noteLines("  " + paint("failed", "blocked"), headline(summary.detail, width), width));
       out.push(...noteLines("  fix:", retryHint(summary.detail), width));
@@ -3291,6 +3300,7 @@ if (typeof require !== "undefined" && require.main === module) {
   progressiveRow,
   readLaunchTarget,
   readPending,
+  reconcile,
   reconcileCursorUserHooks,
   releaseSharedDocLock,
   reportFooterLines,

package/package.json

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