@serfab/cadre-core 1.14.0 → 1.16.0

package/dist/strand-peer-redial.js

@@ -0,0 +1,236 @@
+/**
+ * A running strand node redialing the strand's other members itself, when it holds a
+ * connection to none of them, with the dial budget the host's declared link gives a
+ * relayed connection.
+ *
+ * Why. Below cadre-core the only thing that redials a strand peer is FRET's maintenance:
+ * its pings and neighbour announcements open the connection themselves (`dial: true`) under
+ * a fixed 2 000 ms limit on the whole call (`MAINTENANCE_RPC_TIMEOUT_MS` in `p2p-fret`'s
+ * `fret-service.ts`). Opening a relayed connection takes longer than that on a slow link:
+ * about 9 s on a 20 ms per-frame cap with a 70%-busy event loop
+ * (`joiner-first-commit-over-slow-relay`, whose slow-restart arm reproduces this), where
+ * {@link relayedDialBudgetMs} allows 21.5 s at the default declaration. Each such redial is
+ * cut off part-way through the handshake, from both sides, for as long as the link stays that
+ * slow. And after a restart nothing else dials a strand peer: a cross-party strand's launch
+ * seed is empty, and cadre-core's address passes only fill the address book. Two phones that
+ * restarted then never reconnect, and a write either made alone never reaches the other.
+ *
+ * What it does. One loop per strand runtime, started in `StrandInstanceManager`'s runtime
+ * build and stopped with the runtime (stop, quiesce, failed build), so a hibernating strand
+ * never dials. Each look at the node:
+ * - a member connected: nothing to do; look again in {@link STRAND_REDIAL_CHECK_MS}, or as
+ *   soon as a peer disconnects.
+ * - no member connected and none known: likewise nothing (a founder alone, a storage replica
+ *   before anyone arrives).
+ * - no member connected and some known: dial every known member at once
+ *   ({@link dialPeerAddrs}, direct addresses before relayed ones), each address with the
+ *   relayed-dial budget. A round that connects to one goes back to watching; one that does
+ *   not waits a backoff starting at that budget and doubling to
+ *   {@link STRAND_REDIAL_MAX_BACKOFF_MS}.
+ *
+ * Who is known: every peer the node's FRET table holds a verified signed address record for
+ * (`strand-fret-addrs.ts`), plus the launch seed (sibling strand addresses and a formation's
+ * carried addresses). Who counts as connected: a peer FRET labels `'member'` (it has seen it
+ * speak this strand's protocols), or a seed peer. Neither ever includes a configured relay, a
+ * peer FRET labels `'foreign'`, or a peer the revocation gate refuses. The relay matters most:
+ * the strand node is connected to it throughout and FRET files it with a record like any
+ * peer, so counting it would leave this loop idle exactly when it is needed.
+ *
+ * NOTE: this compensates for FRET's 2 000 ms maintenance dial limit, which cannot open a
+ * relayed connection on a slow link (upstream half:
+ * `blocked/fret-maintenance-ping-dial-budget-below-a-relayed-dial`). If FRET's maintenance
+ * dial ever takes a limit derived from the declared link, this loop becomes a backstop and
+ * may be deleted, as `peer-join-backfill.ts` says of itself.
+ */
+import debug from 'debug';
+import { relayedDialBudgetMs } from './link-budget.js';
+import { CONTROL_COHORT_DIAL_ADDRESS_ATTEMPTS, SelfRelayOnlyError, dialPeerAddrs } from './peer-dial.js';
+import { groupAddrsByPeerId } from './peer-addr-book.js';
+import { strandFretMembership, strandFretPeerAddrs } from './strand-fret-addrs.js';
+import { defaultTimeoutScheduler } from './timeout-scheduler.js';
+const log = debug('sereus:cadre:strand-redial');
+/**
+ * Gap between looks while a member is connected or none is known. While a member is
+ * connected a look reads FRET's labels and the connection list and checks no signature
+ * ({@link strandFretMembership}); a disconnect also triggers a look at once.
+ */
+export const STRAND_REDIAL_CHECK_MS = 5000;
+/**
+ * Ceiling on the wait between failed rounds. A member that is gone for good is dialed this
+ * often for as long as FRET keeps its record (up to 14 days after it was last confirmed).
+ */
+export const STRAND_REDIAL_MAX_BACKOFF_MS = 5 * 60000;
+/**
+ * The timings at a declared link round trip: {@link relayedDialBudgetMs} per address, the
+ * same whole-budget count per member as the control cohort's dials (dead direct addresses
+ * a record lists ahead of the relayed one that works), and a first backoff of one per-address
+ * budget.
+ */
+export function strandRedialTimings(linkRoundTripMs) {
+    const perAddressMs = relayedDialBudgetMs(linkRoundTripMs);
+    return {
+        budget: { perAddressMs, totalMs: CONTROL_COHORT_DIAL_ADDRESS_ATTEMPTS * perAddressMs },
+        minBackoffMs: perAddressMs,
+        maxBackoffMs: STRAND_REDIAL_MAX_BACKOFF_MS,
+        checkMs: STRAND_REDIAL_CHECK_MS
+    };
+}
+/** Start the loop; its first look runs at once. */
+export function superviseStrandPeerRedial(deps, timings) {
+    return new StrandPeerRedialLoop(deps, timings);
+}
+class StrandPeerRedialLoop {
+    constructor(deps, timings) {
+        this.deps = deps;
+        this.timings = timings;
+        this.timer = null;
+        /**
+         * Whether the pending wait is a plain gap between looks, which a disconnect cuts short. A
+         * backoff after a failed round is not cut short, or a flapping relay connection would turn
+         * the backoff into a dial on every flap; and while a look or round runs there is no wait.
+         */
+        this.watching = false;
+        this.stopped = false;
+        this.onDisconnect = () => {
+            if (this.watching && !this.stopped) {
+                this.cancelTimer();
+                void this.tick();
+            }
+        };
+        this.scheduler = deps.scheduler ?? defaultTimeoutScheduler;
+        this.seed = groupAddrsByPeerId([...deps.seed]);
+        this.selfId = deps.node.peerId.toString();
+        this.backoffMs = timings.minBackoffMs;
+        deps.node.addEventListener('peer:disconnect', this.onDisconnect);
+        void this.tick();
+    }
+    stop() {
+        if (this.stopped) {
+            return;
+        }
+        this.stopped = true;
+        this.cancelTimer();
+        this.deps.node.removeEventListener('peer:disconnect', this.onDisconnect);
+    }
+    async tick() {
+        if (this.stopped) {
+            return;
+        }
+        this.watching = false;
+        let outcome = 'watch';
+        try {
+            outcome = await this.lookAndDial();
+        }
+        catch (error) {
+            // A node torn down under the look throws from its table export or connection list.
+            log('strand %s: redial look failed (looking again in %dms): %o', this.deps.label, this.timings.checkMs, error);
+        }
+        if (this.stopped) {
+            return;
+        }
+        this.watching = outcome === 'watch';
+        const waitMs = outcome === 'watch' ? this.resetBackoff() : this.nextBackoff();
+        this.timer = this.scheduler.setTimeout(() => {
+            this.timer = null;
+            void this.tick();
+        }, waitMs);
+    }
+    /**
+     * One look, and a round of dials when it finds no member connected but some known. A node
+     * whose own party was removed dials nobody: the strand keeps running for the session, but a
+     * removed party must not keep dialing the strand's peers (`CadreNode.forgetRevokedJoin`).
+     */
+    async lookAndDial() {
+        if (this.deps.isRevoked?.(this.selfId) === true) {
+            return 'watch';
+        }
+        const membership = strandFretMembership(this.deps.node);
+        if (this.memberConnected(membership)) {
+            return 'watch';
+        }
+        const known = await this.knownMembers(membership);
+        if (known.size === 0 || this.stopped) {
+            return 'watch';
+        }
+        log('strand %s: no member connected; dialing %d known member(s)', this.deps.label, known.size);
+        if (await this.dialAny(known)) {
+            log('strand %s: reconnected to a member', this.deps.label);
+            return 'watch';
+        }
+        log('strand %s: no known member answered; next round in %dms', this.deps.label, this.backoffMs);
+        return 'retry';
+    }
+    /** The gap between looks, with the backoff started over. */
+    resetBackoff() {
+        this.backoffMs = this.timings.minBackoffMs;
+        return this.timings.checkMs;
+    }
+    /**
+     * The wait after a round that reached no member, doubling the next one up to the cap.
+     *
+     * NOTE: a round whose dials failed within milliseconds (a relay connection that is still
+     * closing, the member's relay reservation not back yet) waits as long as one whose dials ran
+     * out their budget. In `joiner-first-commit-over-slow-relay`'s third arm that first wait is what
+     * leaves the joiner writable with no member connected. If reconnecting within seconds of a cut
+     * ever matters, retry a round that failed that fast after a short delay instead.
+     *
+     * NOTE: one such fast failure is `ConnectionClosedError: The connection muxer is "closed"`. A
+     * relay that aborts its connection to this node cannot tell it so (`@libp2p/websockets`'
+     * listener resets with close code 1006, which the `ws` package refuses to send;
+     * `blocked/report-libp2p-websockets-buffered-amount`, second arm), so this node keeps a dead
+     * relay connection until its own monitor drops it, up to 65 s, and every relayed dial reuses
+     * it. If rounds keep failing that way, close a relay connection whose muxer is closed before
+     * the next round instead of waiting it out.
+     */
+    nextBackoff() {
+        const waitMs = this.backoffMs;
+        this.backoffMs = Math.min(waitMs * 2, this.timings.maxBackoffMs);
+        return waitMs;
+    }
+    eligible(peerId) {
+        return peerId !== this.selfId && !this.deps.excluded.has(peerId) && this.deps.isRevoked?.(peerId) !== true;
+    }
+    /** Whether an open connection reaches a peer FRET has seen speak this strand's protocols, or a seed peer. */
+    memberConnected(membership) {
+        return this.deps.node.getConnections().some((connection) => {
+            const peerId = connection.remotePeer.toString();
+            return this.eligible(peerId) && (membership.get(peerId) === 'member' || this.seed.has(peerId));
+        });
+    }
+    /** The members to dial, each with its candidate addresses: verified FRET records first, then the seed's. */
+    async knownMembers(membership) {
+        const { peers } = await strandFretPeerAddrs(this.deps.node);
+        const known = new Map();
+        for (const [peerId, addrs] of [...peers, ...this.seed]) {
+            if (!this.eligible(peerId) || membership.get(peerId) === 'foreign') {
+                continue;
+            }
+            known.set(peerId, unionAddrs(known.get(peerId) ?? [], addrs));
+        }
+        return known;
+    }
+    /** Dial every member in `known` at once; resolves to whether any connected. */
+    async dialAny(known) {
+        const members = [...known];
+        const outcomes = await Promise.allSettled(members.map(([peerId, addrs]) => dialPeerAddrs(this.deps.node, peerId, addrs, this.timings.budget, `strand ${this.deps.label} redial of ${peerId}`)));
+        outcomes.forEach((outcome, i) => {
+            if (outcome.status === 'rejected') {
+                const reason = outcome.reason instanceof SelfRelayOnlyError ? 'reachable only by relaying through this node' : outcome.reason;
+                log('strand %s: redial of %s failed: %o', this.deps.label, members[i][0], reason);
+            }
+        });
+        return outcomes.some((outcome) => outcome.status === 'fulfilled');
+    }
+    cancelTimer() {
+        if (this.timer !== null) {
+            this.scheduler.clearTimeout(this.timer);
+            this.timer = null;
+        }
+    }
+}
+/** `primary` then the entries of `extra` it lacks, compared as strings. */
+function unionAddrs(primary, extra) {
+    const seen = new Set(primary.map((addr) => addr.toString()));
+    return [...primary, ...extra.filter((addr) => !seen.has(addr.toString()))];
+}
+//# sourceMappingURL=strand-peer-redial.js.map

package/dist/strand-peer-redial.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"strand-peer-redial.js","sourceRoot":"","sources":["../src/strand-peer-redial.ts"],"names":[],"mappings":"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"}

package/dist/strand-wake-protocol.js

@@ -26,7 +26,7 @@
 import debug from 'debug';
 import { decodeLengthPrefixedFrame } from './seed-bootstrap.js';
 import { exchangeFrame, readStreamToEnd, replyAndClose } from './control-stream.js';
-import { tryAddrsInTurn } from './peer-dial.js';
+import { dialAddr, tryAddrsInTurn } from './peer-dial.js';
 import { relayedRequestBudgetMs } from './link-budget.js';
 const log = debug('sereus:cadre:strand-wake');
 /** Protocol id for control-network push-wake (parallel to `/sereus/seed/1.0.0`). */
@@ -268,20 +268,23 @@ export async function dialWake(node, addrs, request, options = {}) {
     return await tryAddrsInTurn(addrs, budget, 'Wake dial', (addr, signal, attemptMs) => sendWake(node, addr, protocolId, request, attemptMs, signal));
 }
 /**
- * Open one stream, send the request, half-close, and read the ack.
+ * Dial one address, open one stream, send the request, half-close, and read the ack.
  *
- * `signal` is the per-attempt deadline from {@link dialWake}: it goes to
- * `dialProtocol` so a timeout during connect aborts the dial, and into
- * {@link exchangeFrame} so a timeout after the stream is open resets it —
- * releasing the otherwise unbounded ack-read.
+ * The address is dialed outside libp2p's dial queue (`dialAddr`), so another dial of
+ * the target in flight cannot capture this attempt; an open connection is still reused.
+ *
+ * `signal` is the per-attempt deadline from {@link dialWake}: it goes to the dial so a
+ * timeout during connect aborts it, and into {@link exchangeFrame} so a timeout after
+ * the stream is open resets it — releasing the otherwise unbounded ack-read.
  */
 async function sendWake(node, addr, protocolId, request, timeoutMs, signal) {
+    const connection = await dialAddr(node, addr, signal, 'Wake dial');
     // `runOnLimitedConnection: true`: the target may be reachable only over a
     // circuit-relay connection (the signaling-first addr), which libp2p marks
     // "limited". The wake exchange is a single tiny request→ack well within the
     // relay's data/duration cap, so opening it on the limited connection is safe
     // and is the whole point of dialing the relay address.
-    const rawStream = await node.dialProtocol(addr, protocolId, { runOnLimitedConnection: true, signal });
+    const rawStream = await connection.newStream(protocolId, { runOnLimitedConnection: true, signal });
     const ack = await exchangeFrame(rawStream, signal, request, (stream) => readFrame(stream, timeoutMs), 'Wake dial aborted by timeout');
     log('Wake ack from %s: accepted=%s status=%s', addr.toString(), ack.accepted, ack.status ?? '-');
     return ack;

package/dist/strand-wake-protocol.js.map

@@ -1 +1 @@
-{"version":3,"file":"strand-wake-protocol.js","sourceRoot":"","sources":["../src/strand-wake-protocol.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"strand-wake-protocol.js","sourceRoot":"","sources":["../src/strand-wake-protocol.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -8,6 +8,7 @@ import type { StrandRevocationEnforcementConfig } from './strand-revocation-enfo
 import type { StrandMembershipReconciliationConfig } from './strand-membership-reconciler.js';
 import type { StrandFirstSyncConfig } from './strand-first-sync-gate.js';
 import type { StrandDatabase } from './strand-database.js';
+import type { StrandCommitDurability, StrandCommitHeld } from './strand-commit-durability.js';
 import type { SeedTrustPolicy } from './seed-trust-policy.js';
 import type { KeyStore, KeyId } from './key-store.js';
 import type { TrustedOwnerStore, TrustSource } from './trusted-owner-store.js';
@@ -17,9 +18,10 @@ import type { EnrolledMachineStore } from './enrolled-machine-store.js';
 import type { JoinedStrandStore } from './joined-strand-store.js';
 import type { PushNotifier } from './push-notifier.js';
 import type { CadreInviteSignedFields, RevocableTable } from './control-authorization.js';
-import type { CadreInvitation } from './cadre-invite-protocol.js';
+import type { CadreInvitation, CadreInviteAddressOutcome } from './cadre-invite-protocol.js';
 import type { ControlRetryAbandonment } from './control-retry.js';
 import type { FormationRejectionCode } from './strand-formation-rejection.js';
+import type { ListenTransportOptions } from './relay-addrs.js';
 /**
  * Extended Libp2p node with the coordinatedRepo attached by db-p2p's
  * createLibp2pNode after node creation (not surfaced on the base Libp2p type).
@@ -369,6 +371,20 @@ export interface NetworkConfig {
      * ```
      */
     transports?: Libp2pTransports;
+    /**
+     * Builds `@optimystic/db-p2p`'s default transport list, for the one case where cadre has to
+     * pass a list itself while {@link transports} is unset: a node with configured relays, which
+     * is built with libp2p's relay discovery switched off (`node-transports.ts`). Called with the
+     * switches the node's listen entries imply (`wsPort` when one names WebSocket). Ignored when
+     * {@link transports} is set.
+     *
+     * A Node host passes `nodeDefaultTransports` from the Node-only
+     * `@serfab/cadre-core/node-default-transports` subpath, as `cadre-cli` does. It is injected
+     * rather than built in, because that list names `@libp2p/tcp`, which must stay out of the
+     * graph React Native and browser bundles reach. Left unset, such a node is built from
+     * db-p2p's own list with relay discovery on.
+     */
+    defaultTransports?: (listen: ListenTransportOptions) => Libp2pTransports;
     /**
      * Crypto primitives for the Noise handshake and the encrypted connection that
      * follows, threaded to both the control node and every strand's cohort node — every
@@ -592,6 +608,16 @@ export interface NetworkConfig {
  * kept it (the same pair aborted at a 200ms stall only when the deadline was 300ms). An
  * interval strictly above the deadline is what makes the 30 seconds real.
  *
+ * WHY THE OTHER END'S PING HANDLER CAPS IT TOO. The node being pinged echoes through
+ * `@libp2p/ping`'s inbound handler, which aborts the ping stream when its own timer fires; the
+ * pinging node's monitor sees the reset and aborts the connection exactly as it would on its
+ * own timeout. So this deadline is only real up to the handler timeout of the node being
+ * pinged, which has to stay above it. The deployed relay sets its handler to 60 s for that
+ * reason (`ops/docker/libp2p-infra/src/main.ts`). Every cadre node's handler is Optimystic's
+ * bare `ping()`, `@libp2p/ping`'s 10 s, and nothing here can move it
+ * (`tickets/blocked/optimystic-ping-handler-timeout-below-the-monitor-deadline.md`): between
+ * two cadre nodes, a ping whose echo takes longer than 10 s still drops the connection.
+ *
  * WHAT THE LINK NEEDS OF IT. One ping opens a fresh stream and echoes over it: a protocol
  * negotiation plus the echo, two link round trips by `link-budget.ts`'s counts (a `newStream`
  * over a relayed circuit measured 3016 ms at 1500 ms one-way). At the slowest link sereus
@@ -1539,6 +1565,24 @@ export interface CadreNodeEvents {
     'strand:writable': {
         strandId: string;
     };
+    /**
+     * Emitted after every commit on a strand's database that wrote something, with whether
+     * another member already holds it (`heldElsewhere`) and whether `strand:commit-held` will
+     * say when it does (`followed`). Synchronous, inside the commit, before the app's statement
+     * returns: keep handlers short. Covers every commit on the strand database, cadre-core's own
+     * membership writes included, so filter by the ids you hold — the `StampId()` a
+     * `returning StampId() as Tx` statement gave you. The same record is readable afterwards with
+     * `StrandDatabase.commitDurability(tx)`. See docs/strands.md, "A commit's durability".
+     */
+    'strand:commit-durability': StrandCommitDurability;
+    /**
+     * Emitted once when a commit reported `followed` below full replication becomes held by every
+     * member of its cohort — the moment a write made while the others were away reaches them.
+     * Synchronous, like `strand:commit-durability`, and can come right after it inside the same
+     * commit. Never emitted for a commit made before your listener attached, or one forgotten
+     * because its database closed, hibernated or the node restarted.
+     */
+    'strand:commit-held': StrandCommitHeld;
     /**
      * Emitted when this node discovers it is no longer a member of a CLOSED
      * strand — its party was removed by a manager, or it left. Detected by the
@@ -1689,6 +1733,18 @@ export interface CadreNodeEvents {
      * matching predicate for a reader that subscribed too late to see the event.
      */
     'claim:accepted': NodeClaimRecord;
+    /**
+     * Emitted once per node object when this node learns that an owner removed it from the
+     * cadre: a `CadrePeer` tombstone names its peer id, it has no live `CadrePeer` row, and a
+     * membership refresh of this process had seen its live row before. `CadreNode.removedFromCadre`
+     * is the matching query for a reader that subscribed too late.
+     *
+     * BEST-EFFORT: it fires only if the tombstone reached this node before the other machines
+     * cut it off, so a machine that was offline at removal time usually never sees it. Nothing
+     * is stopped or deleted for you; the node only stops its owner re-issue drains, which can no
+     * longer succeed. Stopping the node and deleting the cadre's data are the embedder's.
+     */
+    'cadre:removed': CadreRemoval;
 }
 /**
  * A peer's self-published, freshness-stamped, self-signed address record.
@@ -1699,8 +1755,8 @@ export interface CadreNodeEvents {
  * PeerId by reading the record, re-verifying the self-signature against
  * `publicKey`, checking freshness, and applying a trust gate.
  *
- * The signature covers `peerId`, the comma-joined `addrs`, and `updatedAt` — see
- * `peerRecordSignedPayload`. `publicKey` is NOT inside the signed payload: it is
+ * The signature covers `peerId`, the comma-joined `addrs`, `updatedAt` and `profile` —
+ * see `peerRecordSignedPayload`. `publicKey` is NOT inside the signed payload: it is
  * the key the signature is verified *with*, and its libp2p-identity binding to
  * `peerId` is checked separately at resolve time, so re-signing it would be
  * redundant.
@@ -1714,6 +1770,12 @@ export interface PeerAddressRecord {
     addrs: string[];
     /** epoch ms — freshness; strictly increasing per peer. */
     updatedAt: number;
+    /**
+     * The publisher's own {@link CadreNodeConfig.profile}: `'transaction'` is an app (phone,
+     * browser), `'storage'` an always-on node. Null on a row the machine has not yet
+     * self-published (an owner or an invitation seated it).
+     */
+    profile: NodeProfile | null;
     /** ed25519 self-signature over the signed payload, base64url. */
     sig: string;
 }
@@ -1735,8 +1797,16 @@ export interface PeerAddressRecord {
 export interface CadrePeerRow {
     /** libp2p peer ID (base58btc) — the row key. */
     peerId: string;
+    /** ed25519 public key (base64url) stored for the peer, or null (not ed25519, or a row written before the column). */
+    publicKey: string | null;
     /** Comma-joined dialable multiaddrs as stored, or null when unpublished. */
     multiaddr: string | null;
+    /** The machine's freshness stamp (epoch ms); 0 when it has never self-published. */
+    updatedAt: number;
+    /** The machine's self-declared node profile; null until it self-publishes. */
+    profile: NodeProfile | null;
+    /** The machine's self-signature over its address record (`peerRecordSignedPayload`); null until it self-publishes. */
+    sig: string | null;
     /** Single-use anti-replay nonce the voucher signature, or the usage row, is bound to. */
     stampId: string | null;
     /** ed25519 public key (base64url) of the owner that vouched this row, or that issued the invitation that admitted it. */
@@ -1820,6 +1890,101 @@ export interface InvitationChain {
     usages: Map<string, CadreInviteUsageRow>;
     invites: Map<string, CadreInviteRow>;
 }
+/**
+ * One machine of the cadre as `CadreNode.listMachines` reports it: a live `CadrePeer` row,
+ * or a live `OwnerKey` whose key derives a peer id with no `CadrePeer` row (an owner key
+ * seated for a machine not yet admitted, or a founder that never self-published).
+ *
+ * `profile` and `lastPublishedAt` are the machine's own claim only when the row's
+ * self-signature verifies; both are null otherwise, so an owner re-vouch that bumped
+ * `UpdatedAt` without re-signing, or a row the machine never published, reports nothing
+ * rather than someone else's stamp.
+ */
+export interface CadreMachine {
+    peerId: string;
+    /** ed25519 public key (base64url) behind `peerId`; null when the id is not ed25519. */
+    publicKey: string | null;
+    /** This node itself. */
+    isSelf: boolean;
+    /** `publicKey` is a live `OwnerKey` here. */
+    isOwner: boolean;
+    /** Has a live `CadrePeer` row; false for an owner key with no machine row. */
+    isMember: boolean;
+    /** Passes this node's authorized-membership predicate now (`CadreNode.listAuthorizedMembers`; always false for self, which that set excludes). */
+    trusted: boolean;
+    /** The machine's self-published node profile; null until it publishes, or when its signature does not verify. */
+    profile: NodeProfile | null;
+    /** `UpdatedAt` of its self-signed record, re-stamped while it runs; null on the same terms as `profile`. */
+    lastPublishedAt: number | null;
+    /** `CadrePeer.VouchOwner` (or `OwnerKey.VouchOwner` for an owner-only entry): the owner that vouched it, or the issuer of the invitation that admitted it. */
+    vouchedBy: string | null;
+}
+/** Why `CadreNode.removeMachine` refuses by name (`MachineRemovalRefusedError.code`). */
+export type MachineRemovalRefusal = 
+/** This node holds no enrolled owner key, so it cannot sign the removal. */
+'not-an-owner'
+/** The machine is this node: an owner cannot sign its own `OwnerKey` removal, so ask another owner. */
+ | 'self'
+/** The machine holds the only live owner key here (`MinOneOwner`). */
+ | 'last-owner';
+/**
+ * What `CadreNode.removeMachine` would do for one machine, read without writing
+ * (`CadreNode.planMachineRemoval`), for an app's confirmation step.
+ */
+export interface MachineRemovalPlan {
+    /** The machine as listed, or null when no live row names it here (already removed). */
+    machine: CadreMachine | null;
+    refusal: MachineRemovalRefusal | null;
+    /** The machine's key is a live owner key, so the removal also retires it. */
+    removesOwnerKey: boolean;
+    /** Rows the machine's owner key vouched, which stop passing the membership predicate everywhere once it is removed unless re-vouched first. Empty unless `removesOwnerKey`. */
+    dependents: {
+        /** Live `OwnerKey` rows whose `VouchOwner` is the machine's key, this node's own excluded. */
+        owners: string[];
+        /** Live `CadrePeer` rows whose `VouchOwner` is the machine's key, the machine itself and this node excluded. */
+        peers: string[];
+    };
+    /** Live `CadreInvite` keys the machine could redeem to come back: targeted at it, or already redeemed by it with uses left. */
+    invitations: string[];
+    /** This node's own `OwnerKey` or `CadrePeer` row was vouched by the machine. It cannot re-vouch its own rows; another owner has to re-add it afterwards. */
+    ownDependency: boolean;
+}
+/** Options for `CadreNode.removeMachine`. */
+export interface RemoveMachineOptions {
+    /** Dependents to re-vouch under this node's key before the removal; each must appear in the plan's `dependents`. */
+    revouch?: {
+        owners?: readonly string[];
+        peers?: readonly string[];
+    };
+}
+/** What `CadreNode.removeMachine` wrote. All false and empty when no live row named the machine here. */
+export interface MachineRemovalResult {
+    removedPeer: boolean;
+    removedOwnerKey: boolean;
+    removedDeviceToken: boolean;
+    /** `CadreInvite` keys whose withdrawal tombstone this call filed. */
+    withdrawnInvitations: string[];
+    /** Dependents re-vouched under this node's key before the removal. */
+    revouched: {
+        owners: string[];
+        peers: string[];
+    };
+}
+/**
+ * This node's own removal from its cadre, as it learned it: the `CadrePeer` tombstone naming
+ * its peer id, read after it had seen its own live row (`CadreNode.removedFromCadre`, the
+ * `cadre:removed` event; "Removing a machine" in docs/architecture.md).
+ */
+export interface CadreRemoval {
+    /** The cadre this node was removed from (`CadreNode.partyId`). */
+    partyId: string;
+    /** The `StampId` the tombstone retired. */
+    stampId: string;
+    /** The owner key that filed the tombstone, when its signature verifies and the key is in this node's trusted-owner anchor; null otherwise. */
+    signerKey: string | null;
+    /** When this node learned of the removal (epoch ms). */
+    at: number;
+}
 /**
  * One {@link CadreInviteRow} with its standing, as `ControlDatabase.listCadreInviteStatuses`
  * (and `CadreNode.listCadreInvitations`) reports it. `live` is the redemption's own test:
@@ -2278,12 +2443,55 @@ export interface CreateCadreInvitationOptions {
     /** How many redemptions it allows; default 1. */
     uses?: number;
 }
+/**
+ * Where a phone could redeem a cadre invitation from, judged on the addresses of machines
+ * other than the one that minted it — the answer to "can the new app join once this one is
+ * closed?". A minting machine that is itself always on can therefore read `issuer-only`.
+ */
+export type CadreInvitationReach = 
+/** Another machine has a relayed (`/p2p-circuit`), public-name or public-IP WebSocket address. */
+'anywhere'
+/** Other machines are named, but only at private or loopback addresses: works on their network only. */
+ | 'local-network'
+/** The bundle names no other machine at an address a phone can dial. */
+ | 'issuer-only';
 /** What `CadreNode.createCadreInvitation` returns: the bundle, and the same encoded for sharing. */
 export interface CreateCadreInvitationResult {
     invitation: CadreInvitation;
-    /** `encodeCadreInvitation(invitation)`: base64url JSON for a QR code, a paste or a link. */
+    /** `encodeCadreInvitation(invitation)`: `sereus-invite:1.` and base64url JSON, for a QR code, a paste or a link. */
     encoded: string;
+    /** Whether a device could redeem it once the minting machine is gone; see {@link CadreInvitationReach}. */
+    reach: CadreInvitationReach;
+}
+/** How `CadreNode.redeemCadreInvitation` runs. */
+export interface RedeemCadreInvitationOptions {
+    /**
+     * Keep making passes over the bundle's addresses while every answer is retryable, until a
+     * member accepts, one refuses finally, the invitation expires, or `signal` aborts.
+     * Default false: one pass.
+     */
+    waitForMember?: boolean;
+    /** Ends the pause and the pass in flight; the call then throws the signal's reason. */
+    signal?: AbortSignal;
+    /** Called at each pass and each pause; an exception it throws is logged and ignored. */
+    onProgress?: (progress: CadreJoinProgress) => void;
 }
+/** A redemption's progress, as `RedeemCadreInvitationOptions.onProgress` reports it. */
+export type CadreJoinProgress = {
+    state: 'redeeming';
+    pass: number;
+} | {
+    state: 'waiting';
+    pass: number;
+    /** Epoch ms of the next pass. */
+    retryAtMs: number;
+    /**
+     * `'no-member-answered'`: every address failed to dial or answer. `'member-not-ready'`: at
+     * least one member answered with a retryable refusal (issuer-unknown, busy, conflict, internal).
+     */
+    reason: 'no-member-answered' | 'member-not-ready';
+    outcomes: readonly CadreInviteAddressOutcome[];
+};
 /** What `CadreNode.redeemCadreInvitation` returns once a member accepted. */
 export interface RedeemCadreInvitationResult {
     /** The member machine that admitted this device, when its address named one. */

package/dist/types.js

@@ -66,6 +66,16 @@ export const HIBERNATION_TIMEOUTS = {
  * kept it (the same pair aborted at a 200ms stall only when the deadline was 300ms). An
  * interval strictly above the deadline is what makes the 30 seconds real.
  *
+ * WHY THE OTHER END'S PING HANDLER CAPS IT TOO. The node being pinged echoes through
+ * `@libp2p/ping`'s inbound handler, which aborts the ping stream when its own timer fires; the
+ * pinging node's monitor sees the reset and aborts the connection exactly as it would on its
+ * own timeout. So this deadline is only real up to the handler timeout of the node being
+ * pinged, which has to stay above it. The deployed relay sets its handler to 60 s for that
+ * reason (`ops/docker/libp2p-infra/src/main.ts`). Every cadre node's handler is Optimystic's
+ * bare `ping()`, `@libp2p/ping`'s 10 s, and nothing here can move it
+ * (`tickets/blocked/optimystic-ping-handler-timeout-below-the-monitor-deadline.md`): between
+ * two cadre nodes, a ping whose echo takes longer than 10 s still drops the connection.
+ *
  * WHAT THE LINK NEEDS OF IT. One ping opens a fresh stream and echoes over it: a protocol
  * negotiation plus the echo, two link round trips by `link-budget.ts`'s counts (a `newStream`
  * over a relayed circuit measured 3016 ms at 1500 ms one-way). At the slowest link sereus

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAsFA;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAA6C;IAC5E,QAAQ,EAAE;QACR,WAAW,EAAE,QAAQ,EAAS,aAAa;QAC3C,gBAAgB,EAAE,QAAQ,EAAI,kBAAkB;QAChD,eAAe,EAAE,QAAQ,EAAK,MAAM;QACpC,oBAAoB,EAAE,CAAC;QACvB,kBAAkB,EAAE,QAAQ,CAAE,MAAM;KACrC;IACD,WAAW,EAAE;QACX,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,EAAI,YAAY;QAC1C,gBAAgB,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,wBAAwB;QAC1D,eAAe,EAAE,EAAE,GAAG,IAAI,EAAI,mBAAmB;QACjD,oBAAoB,EAAE,CAAC;QACvB,kBAAkB,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,eAAe;KACnD;IACD,UAAU,EAAE;QACV,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,EAAI,WAAW;QACzC,gBAAgB,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,EAAG,uBAAuB;QACzD,eAAe,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,EAAI,kBAAkB;QACpD,oBAAoB,EAAE,CAAC;QACvB,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,gBAAgB;KACxD;IACD,OAAO,EAAE;QACP,WAAW,EAAE,EAAE,GAAG,IAAI,EAAQ,aAAa;QAC3C,gBAAgB,EAAE,EAAE,GAAG,IAAI,EAAG,wBAAwB;QACtD,eAAe,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAG,eAAe;QACjD,oBAAoB,EAAE,CAAC;QACvB,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,eAAe;KAC5D;CACF,CAAC;AA0dF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC,MAAM,CAAC;IACtD,uFAAuF;IACvF,mFAAmF;IACnF,YAAY,EAAE,KAAM;IACpB,kFAAkF;IAClF,kFAAkF;IAClF,mBAAmB;IACnB,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAM,EAAE,UAAU,EAAE,KAAM,EAAE,CAAC;CACjC,CAAC,CAAC;AAmBzC;;;GAGG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,EAAE,GAAG,IAAI,CAAC;AAYnD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,EACL,gBAAgB,EAChB,uBAAuB,EACvB,2BAA2B,EAC3B,sBAAsB,EACtB,2BAA2B,EAC3B,qBAAqB,EACrB,wBAAwB,EACxB,sBAAsB,EACtB,oBAAoB,EACpB,mBAAmB,EACpB,MAAM,+BAA+B,CAAC;AAEvC;;;;;GAKG;AACH,OAAO,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAwFA;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAA6C;IAC5E,QAAQ,EAAE;QACR,WAAW,EAAE,QAAQ,EAAS,aAAa;QAC3C,gBAAgB,EAAE,QAAQ,EAAI,kBAAkB;QAChD,eAAe,EAAE,QAAQ,EAAK,MAAM;QACpC,oBAAoB,EAAE,CAAC;QACvB,kBAAkB,EAAE,QAAQ,CAAE,MAAM;KACrC;IACD,WAAW,EAAE;QACX,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,EAAI,YAAY;QAC1C,gBAAgB,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,wBAAwB;QAC1D,eAAe,EAAE,EAAE,GAAG,IAAI,EAAI,mBAAmB;QACjD,oBAAoB,EAAE,CAAC;QACvB,kBAAkB,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,eAAe;KACnD;IACD,UAAU,EAAE;QACV,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,EAAI,WAAW;QACzC,gBAAgB,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,EAAG,uBAAuB;QACzD,eAAe,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,EAAI,kBAAkB;QACpD,oBAAoB,EAAE,CAAC;QACvB,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,gBAAgB;KACxD;IACD,OAAO,EAAE;QACP,WAAW,EAAE,EAAE,GAAG,IAAI,EAAQ,aAAa;QAC3C,gBAAgB,EAAE,EAAE,GAAG,IAAI,EAAG,wBAAwB;QACtD,eAAe,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAG,eAAe;QACjD,oBAAoB,EAAE,CAAC;QACvB,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,eAAe;KAC5D;CACF,CAAC;AAweF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6DG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC,MAAM,CAAC;IACtD,uFAAuF;IACvF,mFAAmF;IACnF,YAAY,EAAE,KAAM;IACpB,kFAAkF;IAClF,kFAAkF;IAClF,mBAAmB;IACnB,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAM,EAAE,UAAU,EAAE,KAAM,EAAE,CAAC;CACjC,CAAC,CAAC;AAmBzC;;;GAGG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,EAAE,GAAG,IAAI,CAAC;AAYnD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,EACL,gBAAgB,EAChB,uBAAuB,EACvB,2BAA2B,EAC3B,sBAAsB,EACtB,2BAA2B,EAC3B,qBAAqB,EACrB,wBAAwB,EACxB,sBAAsB,EACtB,oBAAoB,EACpB,mBAAmB,EACpB,MAAM,+BAA+B,CAAC;AAEvC;;;;;GAKG;AACH,OAAO,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC"}