instar 1.3.627 → 1.3.629

package/dashboard/subscriptions.js

@@ -471,6 +471,17 @@ export function renderAccountMatrix(doc, target, poolScope, pendingScope, transi
         const word = c.state === 'offline' ? 'unknown' : MATRIX_CELL_WORD[c.state];
         const glyph = MATRIX_CELL_GLYPH[c.state] || '';
         td.appendChild(el(doc, 'span', 'sub-matrix-glyph', `${glyph} ${word}`.trim()));
+        // An in-progress (◷) cell gets a tappable Cancel so a mis-tapped setup can be
+        // reversed (abandon the login + tear down its pane). Emitted on the DURABLE
+        // re-rendered cell (not just the live sign-in DOM) so it survives the poll loop.
+        // The login id === accountId for a matrix login; the relay routes to self/peer.
+        if (c.state === 'in-progress') {
+          const cancelBtn = el(doc, 'button', 'sub-matrix-cancel', 'Cancel');
+          cancelBtn.setAttribute('data-matrix-cancel', '1');
+          cancelBtn.setAttribute('data-account-id', sanitizeForDisplay(c.accountId, 'label'));
+          cancelBtn.setAttribute('data-machine-id', sanitizeForDisplay(c.machineId, 'label'));
+          td.appendChild(cancelBtn);
+        }
       }
       tr.appendChild(td);
     }
@@ -503,6 +514,7 @@ const URLS = {
   // uses, with peers merged); start-cell is the PIN-gated "Set up" orchestrator over the chain.
   accountsPool: '/subscription-pool?scope=pool',
   startCell: '/subscription-pool/matrix/start-cell', // POST (PIN-gated) — start a cell's sign-in
+  cancel: '/subscription-pool/follow-me/cancel', // POST (Bearer, no PIN) — cancel an in-flight cell (relay → self/peer)
 };
 
 export function createController(opts) {
@@ -711,6 +723,8 @@ export function createController(opts) {
       if (confirmBtn && els.matrix.contains(confirmBtn)) { onConfirmTap(confirmBtn); return; }
       const codeBtn = t.closest('[data-matrix-code-submit]');
       if (codeBtn && els.matrix.contains(codeBtn)) { onCodeTap(codeBtn); return; }
+      const cancelBtn = t.closest('[data-matrix-cancel]');
+      if (cancelBtn && els.matrix.contains(cancelBtn)) { onCancelTap(cancelBtn); return; }
     });
   }
 
@@ -848,6 +862,42 @@ export function createController(opts) {
     })();
   }
 
+  // Cancel an in-flight cell: POST the Bearer-only cancel relay (self/peer), abandoning
+  // the login + tearing down its pane. No PIN (mirrors the code-submit step — a PIN can't
+  // cross the mesh). Reversible: the cell frees up to re-tap "Set up". Guarded by a native
+  // confirm where available (degrades to proceed under jsdom/headless).
+  function onCancelTap(btn) {
+    const cell = matrixCellOf(btn);
+    if (!cell) return;
+    const accountId = btn.getAttribute('data-account-id');
+    const machineId = btn.getAttribute('data-machine-id');
+    if (!accountId || !machineId) { setCellStatus(cell, 'Couldn’t prepare this — please refresh.'); return; }
+    const view = doc.defaultView;
+    if (view && typeof view.confirm === 'function') {
+      let ok = true;
+      try { ok = view.confirm('Cancel this in-progress setup?'); } catch (e) { ok = true; }
+      if (!ok) return;
+    }
+    setCellStatus(cell, 'Cancelling…');
+    btn.setAttribute('disabled', '1');
+    void (async () => {
+      try {
+        const r = await postJson(URLS.cancel, { machineId, id: accountId });
+        if (r.ok && r.json && (r.json.cancelled || r.json.alreadyTerminal)) {
+          delete state.matrixTransient[`${accountId}::${machineId}`];
+          setCellStatus(cell, 'Cancelled — you can set this up again.');
+        } else {
+          const msg = (r.json && (r.json.error || r.json.reason)) ? (r.json.error || r.json.reason) : `failed (${r.status})`;
+          setCellStatus(cell, `Couldn’t cancel: ${msg}`);
+          btn.removeAttribute('disabled');
+        }
+      } catch (e) {
+        setCellStatus(cell, 'Couldn’t reach the server — try again.');
+        btn.removeAttribute('disabled');
+      }
+    })();
+  }
+
   function reschedule() {
     if (!state.active) return;
     if (state.timerId != null) cancel(state.timerId);

package/dist/commands/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/commands/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAoCH,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAS3D,OAAO,EAAE,eAAe,EAAiC,MAAM,iCAAiC,CAAC;AAwBjG,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAkH7D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAsBtD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC1C,OAAO,CAUT;AAyID,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAy4CD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,eAAe,EACzB,cAAc,EAAE,cAAc,EAC9B,YAAY,CAAC,EAAE,YAAY,EAC3B,WAAW,CAAC,EAAE,WAAW,EACzB,WAAW,CAAC,EAAE,WAAW,EACzB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,EAGvE,UAAU,CAAC,EAAE,MAAM,OAAO,8BAA8B,EAAE,WAAW,GAAG,IAAI,EAK5E,qBAAqB,CAAC,EAAE,MAAM,OAAO,gCAAgC,EAAE,kBAAkB,GAAG,IAAI,EAKhG,mBAAmB,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,GACpD,IAAI,CA8eN;AA2lBD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAi8etE;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDzE;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuD5E"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/commands/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAoCH,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAS3D,OAAO,EAAE,eAAe,EAAiC,MAAM,iCAAiC,CAAC;AAwBjG,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAkH7D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAsBtD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC1C,OAAO,CAUT;AAyID,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAy4CD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,eAAe,EACzB,cAAc,EAAE,cAAc,EAC9B,YAAY,CAAC,EAAE,YAAY,EAC3B,WAAW,CAAC,EAAE,WAAW,EACzB,WAAW,CAAC,EAAE,WAAW,EACzB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,EAGvE,UAAU,CAAC,EAAE,MAAM,OAAO,8BAA8B,EAAE,WAAW,GAAG,IAAI,EAK5E,qBAAqB,CAAC,EAAE,MAAM,OAAO,gCAAgC,EAAE,kBAAkB,GAAG,IAAI,EAKhG,mBAAmB,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,GACpD,IAAI,CA8eN;AA2lBD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAy8etE;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDzE;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuD5E"}

package/dist/commands/server.js

@@ -3931,6 +3931,15 @@ export async function startServer(options) {
                         return dead;
                     },
                     onEpochAdvance: (epoch) => coordinator.emit('leaseEpochChange', epoch),
+                    // F2 (multi-machine-lease-self-heal staleHolderTakeover) — DARK by default.
+                    // Resolved LIVE each call so a config flip needs no restart; off ⇒ canAcquire
+                    // is byte-for-byte the legacy behavior.
+                    staleHolderTakeover: () => {
+                        const sht = config.multiMachine?.leaseSelfHeal?.staleHolderTakeover;
+                        if (!sht?.enabled)
+                            return null;
+                        return { enabled: true, nonRenewalMissedObservations: sht.nonRenewalMissedObservations ?? 6 };
+                    },
                     onSelfSuspend: (reason) => console.log(pc.yellow(`  [lease] self-suspend: ${reason}`)),
                     onEscalate: (info) => console.log(pc.yellow(`  [lease] split-brain escalation: ${info.reason} (holder ${info.holder})`)),
                     logger: (m) => console.log(pc.dim(m)),