instar 1.3.633 → 1.3.635

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;AAmH7D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AA+EtD;;;;;;;;;;;;;;;;;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,CAohftE;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;AAsH7D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AA+EtD;;;;;;;;;;;;;;;;;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,CAukftE;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

@@ -101,6 +101,9 @@ import { FencedLease } from '../core/FencedLease.js';
 import { GitLeaseStore } from '../core/GitLeaseStore.js';
 import { LocalLeaseStore } from '../core/LocalLeaseStore.js';
 import { LeaseCoordinator } from '../core/LeaseCoordinator.js';
+import { isPeerPresumedDead } from '../core/leaseLiveness.js';
+import { readPollActive, pidAlive as pollPidAlive } from '../core/pollIntent.js';
+import { checkMultiMachineConfigCoherence } from '../core/configCoherence.js';
 import { HttpLeaseTransport } from '../core/HttpLeaseTransport.js';
 import { HttpLiveTailTransport } from '../core/HttpLiveTailTransport.js';
 import { LiveTailBuffer } from '../core/LiveTailBuffer.js';
@@ -3188,6 +3191,7 @@ export async function startServer(options) {
         const coordinator = new MultiMachineCoordinator(state, {
             stateDir: config.stateDir,
             multiMachine: config.multiMachine,
+            developmentAgent: config.developmentAgent,
         });
         const machineRole = coordinator.start();
         if (coordinator.enabled) {
@@ -3195,6 +3199,13 @@ export async function startServer(options) {
             if (machineRole === 'standby') {
                 console.log(pc.yellow('  Standby mode — processing gated, writes disabled'));
             }
+            // Phase 2 #7 — surface incoherent multi-machine config (WARN only, never a
+            // boot reject): e.g. meshTransport off while session transfer is live (the
+            // worst-of-both state from the 2026-06-20 audit), or duplicate mesh rope
+            // priorities. Signal — the operator decides; boot is never blocked.
+            for (const w of checkMultiMachineConfigCoherence(config.multiMachine, true)) {
+                console.log(pc.yellow(`  ⚠ config-coherence [${w.code}]: ${w.message}`));
+            }
         }
         // ── Coherence Journal (COHERENCE-JOURNAL-SPEC §3.1/§3.3, P1.1) ─────────
         // Per-machine append-only event streams (topic-placement / session-
@@ -3836,6 +3847,13 @@ export async function startServer(options) {
         let liveTailReceiver;
         const isGitRepo = fs.existsSync(path.join(config.projectDir, '.git'));
         const gitBackupEnabled = config.gitBackup?.enabled !== false;
+        // B4 (multimachine-lease-poll-robustness, Decision 10) — forward-ref to the
+        // (later-constructed) MachinePoolRegistry so the lease-liveness closures can
+        // read the SKEW-IMMUNE routerReceivedAt source instead of the skew-contaminated
+        // registry lastSeen. undefined until the registry is built below — during that
+        // window the closures fall back to lastSeen (safe). Function-body scope so it
+        // is visible to BOTH the lease closures (deeper) and the registry assignment.
+        let leaseLivenessRegistry;
         // Construct gitSync for BOTH roles when this is a git-backed mesh machine:
         // a standby needs it to pull, and a standby that later self-elects to awake
         // (the Phase-0 scenario) must ALREADY have it so its role-change push fires.
@@ -4013,12 +4031,23 @@ export async function startServer(options) {
                     presumedDeadHolders: () => {
                         const reg = idMgr.loadRegistry();
                         const nowMs = Date.now();
+                        // B4 Decision 10 — skew-immune liveness when the flag resolves on AND
+                        // the in-process registry has actually observed the peer; else legacy
+                        // lastSeen. enabled OMITTED ⇒ developmentAgent gate.
+                        const skewImmune = resolveDevAgentGate(config.multiMachine?.leaseSelfHeal?.skewImmuneLiveness?.enabled, config);
                         const dead = new Set();
                         for (const [id, e] of Object.entries(reg.machines ?? {})) {
                             if (id === selfMachineId)
                                 continue;
-                            const last = Date.parse(e.lastSeen);
-                            if (!Number.isNaN(last) && nowMs - last > seamlessness.failoverThresholdMs)
+                            const cap = leaseLivenessRegistry?.getCapacity(id);
+                            if (isPeerPresumedDead({
+                                lastSeenMs: Date.parse(e.lastSeen),
+                                routerObserved: !!cap?.routerReceivedAt,
+                                routerOnline: !!cap?.online,
+                                nowMs,
+                                failoverThresholdMs: seamlessness.failoverThresholdMs,
+                                skewImmune,
+                            }))
                                 dead.add(id);
                         }
                         return dead;
@@ -4052,9 +4081,18 @@ export async function startServer(options) {
                         const peerIds = Object.keys(reg.machines ?? {}).filter((id) => id !== selfMachineId && !reg.machines[id].revokedAt);
                         if (peerIds.length === 0)
                             return false; // a solo machine never "holds against" a peer
+                        // B4 Decision 10 — same skew-immune liveness as presumedDeadHolders.
+                        const skewImmune = resolveDevAgentGate(config.multiMachine?.leaseSelfHeal?.skewImmuneLiveness?.enabled, config);
                         return peerIds.every((id) => {
-                            const last = Date.parse(reg.machines[id].lastSeen);
-                            return !Number.isNaN(last) && nowMs - last > seamlessness.failoverThresholdMs;
+                            const cap = leaseLivenessRegistry?.getCapacity(id);
+                            return isPeerPresumedDead({
+                                lastSeenMs: Date.parse(reg.machines[id].lastSeen),
+                                routerObserved: !!cap?.routerReceivedAt,
+                                routerOnline: !!cap?.online,
+                                nowMs,
+                                failoverThresholdMs: seamlessness.failoverThresholdMs,
+                                skewImmune,
+                            });
                         });
                     },
                     onSelfSuspend: (reason) => console.log(pc.yellow(`  [lease] self-suspend: ${reason}`)),
@@ -14425,6 +14463,9 @@ export async function startServer(options) {
                     failoverThresholdMs,
                     logger: (m) => console.log(pc.dim(`  [pool] ${m}`)),
                 });
+                // B4 Decision 10 — hand the skew-immune registry to the lease-liveness
+                // closures (forward-ref declared at function-body scope above the lease).
+                leaseLivenessRegistry = machinePoolRegistry;
                 const poolSelfId = machineHeartbeat?.config?.machineId ??
                     (poolIdMgr.hasIdentity() ? poolIdMgr.loadIdentity().machineId : null);
                 // WS4.3 journal-lease cutover (MULTI-MACHINE-SEAMLESSNESS-SPEC §WS4.3,
@@ -14572,6 +14613,20 @@ export async function startServer(options) {
                                 selfReportedLastSeen: new Date().toISOString(),
                                 loadAvg: osMod.loadavg()[0],
                                 quotaState: selfQuotaState(),
+                                // B5 — advertise this machine's REAL poll state (the lifeline's
+                                // truth file), so the pool's exactly-one-listener guard counts
+                                // actual pollers. undefined when the file is absent/stale or the
+                                // lifeline pid is dead (→ peers read it as unknown = fail-open).
+                                pollingActive: (() => {
+                                    const pa = readPollActive(config.stateDir);
+                                    if (!pa)
+                                        return undefined;
+                                    if (pa.pid && !pollPidAlive(pa.pid))
+                                        return undefined; // dead lifeline → unknown
+                                    if (Date.now() - pa.ts > 90_000)
+                                        return undefined; // stale → unknown
+                                    return pa.pollingActive;
+                                })(),
                                 servesChannels: selfServesChannels(),
                                 guardPosture: selfGuardPosture(),
                                 // WS1.1 capability advertisement (spec invariant 5): a bounded