instar 1.3.1338 → 1.3.1340

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

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

package/dist/commands/server.js

@@ -18060,17 +18060,57 @@ export async function startServer(options) {
         // backoff (body recovered from the canonical outbox), and after the attempt
         // cap raises ONE aggregated attention item per dark peer. Recording/sending
         // only — no blocking authority. Ships OFF (it re-sends + escalates).
+        // REWORKED (a2a-single-agent-identity §3): constructed when EITHER
+        // `monitoring.a2aRedelivery.enabled` OR the resolved `threadline.peerDarkNotice`
+        // gate is on; `redeliver` only under the former (escalate-only otherwise).
+        // Under the peer-dark gate the operator notice is per PEER with the
+        // deterministic id `a2a-peer-dark:<agent>:<peerFp>`, raised by the AWAKE
+        // machine after it healed its own side, resolved from pool-scope evidence,
+        // 12 h cooldown; a local relay outage collapses to ONE aggregated item.
+        // Dry-run (default) logs would-raise rows to logs/a2a-peer-dark.jsonl.
         try {
             const a2aDelivCfg = config.monitoring?.a2aRedelivery ?? {};
-            if (a2aDelivCfg.enabled && a2aDeliveryTracker) {
+            const { resolvePeerDarkNoticeConfig, createPeerDarkAuditWriter, resolvePeerDarkAuditPath } = await import('../threadline/peerDark.js');
+            const peerDarkCfg = resolvePeerDarkNoticeConfig(config);
+            if ((a2aDelivCfg.enabled || peerDarkCfg.enabled) && a2aDeliveryTracker) {
                 const { A2ARedeliverySentinel, DEFAULT_A2A_REDELIVERY_CONFIG } = await import('../monitoring/A2ARedeliverySentinel.js');
+                const priorityMap = {
+                    high: 'HIGH', medium: 'NORMAL', low: 'LOW',
+                };
+                // Pool-scope read of one peer's health on my OTHER machines (raise AND
+                // resolve both read it — a peer that answered on another machine is not
+                // dark). Bounded per peer; a dark/slow peer machine is simply absent.
+                const poolPeerHealth = async (peerFp) => {
+                    const urls = _resolvePeerUrls?.() ?? [];
+                    if (urls.length === 0)
+                        return [];
+                    const rows = await Promise.allSettled(urls.map(async ({ machineId, url }) => {
+                        const ac = new AbortController();
+                        const t = setTimeout(() => ac.abort(), 5000);
+                        try {
+                            const r = await fetch(`${url}/threadline/peers/${encodeURIComponent(peerFp)}/health`, {
+                                headers: { Authorization: `Bearer ${config.authToken ?? ''}`, 'X-Instar-AgentId': config.projectName ?? '' },
+                                signal: ac.signal,
+                            });
+                            if (!r.ok)
+                                throw new Error(`HTTP ${r.status}`);
+                            const b = await r.json();
+                            return { machineId, lastAckedAt: b.lastAckedAt ?? null, lastInboundAt: b.lastInboundAt ?? null, lastDeliveredAt: b.lastDeliveredAt ?? null };
+                        }
+                        finally {
+                            clearTimeout(t);
+                        }
+                    }));
+                    return rows.flatMap((r) => (r.status === 'fulfilled' ? [r.value] : []));
+                };
                 const a2aRedeliverySentinel = new A2ARedeliverySentinel({
                     tracker: a2aDeliveryTracker,
+                    agentId: config.projectName,
                     // Re-send: recover the body from the canonical outbox by messageId,
                     // then re-emit via the relay. Body missing → return false (the
                     // sentinel leaves it awaiting-ack and escalates at the cap, never
-                    // fabricating a send).
-                    redeliver: (threadlineRelayClient && listenerManager)
+                    // fabricating a send). Only under the legacy gate.
+                    redeliver: (a2aDelivCfg.enabled && threadlineRelayClient && listenerManager)
                         ? (entry) => {
                             const stored = listenerManager.readCanonicalOutboxEntry(entry.messageId);
                             if (!stored)
@@ -18081,27 +18121,93 @@ export async function startServer(options) {
                         : undefined,
                     raiseAttention: telegram
                         ? async (item) => {
-                            const priorityMap = {
-                                high: 'HIGH', medium: 'NORMAL', low: 'LOW',
-                            };
-                            return telegram.createAttentionItem({
-                                id: `a2a-redelivery-${Date.now()}`,
+                            // Legacy per-message escalation keeps its stamped id; the §3
+                            // items carry a deterministic id and REOPEN on a later episode.
+                            if (!item.id) {
+                                return telegram.createAttentionItem({
+                                    id: `a2a-redelivery-${Date.now()}`,
+                                    title: item.title,
+                                    summary: item.body.slice(0, 160),
+                                    description: item.body,
+                                    category: 'a2a-redelivery',
+                                    priority: priorityMap[item.priority ?? 'medium'] ?? 'NORMAL',
+                                    sourceContext: item.source ?? 'a2a-redelivery',
+                                });
+                            }
+                            return telegram.upsertAttentionItem({
+                                id: item.id,
                                 title: item.title,
                                 summary: item.body.slice(0, 160),
                                 description: item.body,
-                                category: 'a2a-redelivery',
+                                category: 'a2a-peer-dark',
                                 priority: priorityMap[item.priority ?? 'medium'] ?? 'NORMAL',
-                                sourceContext: item.source ?? 'a2a-redelivery',
+                                sourceContext: item.source ?? 'a2a-peer-dark',
+                            });
+                        }
+                        : undefined,
+                    // Resolve: the resolve line lands on the hub through the same upsert
+                    // (body changed → re-posted), then the item is closed silently.
+                    resolveAttention: telegram
+                        ? async (id, line) => {
+                            const existing = telegram.getAttentionItem(id);
+                            if (!existing)
+                                return false;
+                            await telegram.upsertAttentionItem({
+                                id,
+                                title: existing.title,
+                                summary: line.slice(0, 160),
+                                description: line,
+                                category: existing.category,
+                                priority: existing.priority,
+                                sourceContext: existing.sourceContext,
                             });
+                            return telegram.updateAttentionStatus(id, 'DONE', { silent: true });
+                        }
+                        : undefined,
+                    attentionState: telegram
+                        ? (id) => {
+                            const it = telegram.getAttentionItem(id);
+                            return it ? { status: it.status, updatedAt: it.updatedAt, createdAt: it.createdAt } : null;
                         }
                         : undefined,
-                }, { ...mergeDefaults(DEFAULT_A2A_REDELIVERY_CONFIG, a2aDelivCfg), enabled: true });
+                    relayState: () => {
+                        const rc = threadlineRelayClient;
+                        if (!rc)
+                            return 'not-configured';
+                        if (rc.connectionState === 'connected')
+                            return 'connected';
+                        return threadlineGetLastRelayEvent?.()?.terminal === true ? 'displaced' : 'disconnected';
+                    },
+                    // §3.3: a standby's relay is disconnected BY DESIGN; only the awake
+                    // (telegram-polling) machine may heal or raise. The boot-time standby
+                    // fact is the same one the relay-forward route reads.
+                    isAwake: () => !(_a2aRelayForwardCtx?.relaySuppressedByStandby === true),
+                    reconnectRelay: threadlineRelayClient ? () => threadlineRelayClient.reconnectRelay() : undefined,
+                    refreshPresence: threadlineRelayClient ? () => threadlineRelayClient.refreshPresence() : undefined,
+                    peerConnectedNow: threadlineRelayClient ? (fp) => threadlineRelayClient.peerConnectedNow(fp) : undefined,
+                    peerPresence: threadlineRelayClient ? (fp) => threadlineRelayClient.peerPresence(fp) : undefined,
+                    // identitySelfCheck (§2) is wired by the identity-coherence check once
+                    // it lands; absent, the heal records `unknown` and never supersedes.
+                    poolPeerHealth,
+                    audit: createPeerDarkAuditWriter(resolvePeerDarkAuditPath(config.stateDir), (l) => console.warn(l)),
+                }, {
+                    ...mergeDefaults(DEFAULT_A2A_REDELIVERY_CONFIG, a2aDelivCfg),
+                    enabled: a2aDelivCfg.enabled === true,
+                    peerDark: {
+                        enabled: peerDarkCfg.enabled,
+                        dryRun: peerDarkCfg.dryRun,
+                        queuedDarkAfterMs: peerDarkCfg.queuedDarkAfterMs,
+                        perPeer: peerDarkCfg.perPeer,
+                        cooldownMs: peerDarkCfg.cooldownMs,
+                    },
+                });
                 a2aRedeliverySentinel.start();
                 globalThis.__instarA2ARedeliverySentinel = a2aRedeliverySentinel;
-                console.log(pc.green('  A2ARedeliverySentinel: armed (A2A redelivery + dark-peer escalation)'));
+                console.log(pc.green(`  A2ARedeliverySentinel: armed (redelivery ${a2aDelivCfg.enabled ? 'on' : 'off'}; ` +
+                    `peer-dark notice ${peerDarkCfg.enabled ? (peerDarkCfg.dryRun ? 'dry-run' : 'LIVE') : 'off'})`));
             }
             else {
-                console.log(pc.dim('  A2ARedeliverySentinel: disabled (monitoring.a2aRedelivery.enabled=false; the ship-OFF default)'));
+                console.log(pc.dim('  A2ARedeliverySentinel: disabled (monitoring.a2aRedelivery.enabled=false and threadline.peerDarkNotice dark; the ship-OFF default)'));
             }
         }
         catch (err) {