2020117-agent 0.4.7 → 0.5.0

package/README.md

@@ -1,6 +1,6 @@
 # 2020117-agent
 
-Decentralized AI agent runtime for the [2020117](https://2020117.xyz) network. Connects your agent to the DVM compute marketplace via API polling + P2P Hyperswarm, with CLINK Lightning payments.
+Decentralized AI agent runtime for the [2020117](https://2020117.xyz) network. Connects your agent to the Nostr DVM compute marketplace via relay subscription + P2P Hyperswarm, with Lightning payments.
 
 ## Quick Start
 
@@ -47,7 +47,7 @@ npx 2020117-agent --agent=my-agent --kind=5100
 
 | Command | Description |
 |---------|-------------|
-| `2020117-agent` | Unified agent (API polling + P2P session listening) |
+| `2020117-agent` | Unified agent (Nostr relay subscription + P2P session listening) |
 | `2020117-session` | P2P session client (CLI REPL + HTTP proxy) |
 
 ## CLI Parameters
@@ -91,21 +91,22 @@ import { hasApiKey, registerService } from '2020117-agent/api'
 ## How It Works
 
 ```
-                    ┌─────────────────────┐
-                    │   2020117-agent      │
-                    │                     │
-  Platform API ◄────┤  API Polling        │
-  (heartbeat,       │  (inbox → accept →  │
-   inbox, result)   │   process → result) │
-                    │                     │
-  Hyperswarm DHT ◄──┤  P2P Sessions      │──► CLINK Payments
-  (encrypted TCP)   │  (session → HTTP   │     (ndebit via Lightning)
-                    │   tunnel → result) │
-                    └─────────────────────┘
+                    ┌─────────────────────────┐
+                    │     2020117-agent        │
+                    │                         │
+  Nostr Relay ◄─────┤  Relay Subscription     │
+  (Kind 5xxx sub,   │  (discover → Kind 7000  │
+   Kind 7000/6xxx)  │   accept → process →   │
+                    │   Kind 6xxx result)     │
+                    │                         │
+  Hyperswarm DHT ◄──┤  P2P Sessions           │──► Lightning Payments
+  (encrypted TCP)   │  (session → HTTP        │    (Cashu / Invoice)
+                    │   tunnel → result)      │
+                    └─────────────────────────┘
 ```
 
-- **API channel**: Polls platform inbox, accepts jobs, submits results. Lightning payments on completion.
-- **P2P channel**: Listens on Hyperswarm DHT topic `SHA256("2020117-dvm-kind-{kind}")`. Interactive sessions with CLINK per-minute billing.
+- **Relay channel** (primary): Subscribes to DVM requests (Kind 5xxx) via Nostr relay. Accepts by publishing Kind 7000, submits results via Kind 6xxx. Fully decentralized — no HTTP API dependency.
+- **P2P channel**: Listens on Hyperswarm DHT topic `SHA256("2020117-dvm-kind-{kind}")`. Interactive sessions with per-minute billing (Cashu or Lightning invoice).
 - Both channels share a single capacity counter — the agent never overloads.
 
 ## Development

package/dist/agent.js

@@ -84,7 +84,7 @@ for (const arg of process.argv.slice(2)) {
 import { randomBytes } from 'crypto';
 import { SwarmNode, topicFromKind } from './swarm.js';
 import { createProcessor } from './processor.js';
-import { hasApiKey, loadAgentName, registerService, startHeartbeatLoop, getInbox, acceptJob, sendFeedback, submitResult, createJob, getJob, getProfile, reportSession, } from './api.js';
+import { hasApiKey, loadAgentName, registerService, getInbox, acceptJob, sendFeedback, submitResult, createJob, getJob, getProfile, reportSession, } from './api.js';
 import { generateInvoice } from './clink.js';
 import { receiveCashuToken } from './cashu.js';
 import { generateKeypair, loadSovereignKeys, saveSovereignKeys, signEvent, nip44Encrypt, nip44Decrypt, pubkeyFromPrivkey, RelayPool, } from './nostr.js';
@@ -195,8 +195,15 @@ async function main() {
     if (!SOVEREIGN || hasApiKey()) {
         await setupPlatform(label);
     }
-    // 5. Async inbox poller (platform mode)
-    startInboxPoller(label);
+    // 5. Async inbox poller (platform mode — fallback when no relay subscription)
+    // If relay subscription is active, relay is the primary job discovery channel.
+    // Inbox poller is only needed when agent has no privkey (can't subscribe to relay).
+    if (!state.sovereignKeys || !state.relayPool) {
+        startInboxPoller(label);
+    }
+    else {
+        console.log(`[${label}] Relay subscription active — inbox polling disabled (Nostr-native mode)`);
+    }
     // 6. P2P swarm listener
     await startSwarmListener(label);
     // 7. Graceful shutdown
@@ -220,11 +227,49 @@ async function setupPlatform(label) {
         models,
         skill: state.skill,
     });
-    state.stopHeartbeat = startHeartbeatLoop(() => getAvailableCapacity(), () => ({
-        sessions: state.p2pSessionsCompleted,
-        earned_sats: state.p2pTotalEarnedSats,
-        active: activeSessions.size > 0,
-    }));
+    // Prefer Nostr heartbeat (Kind 30333 direct to relay) over API heartbeat
+    const keys = loadSovereignKeys(state.agentName || undefined);
+    if (keys?.privkey && keys?.pubkey) {
+        // Store keys for Nostr-native operations (relay subscribe, Kind 7000/6xxx signing)
+        if (!state.sovereignKeys) {
+            state.sovereignKeys = keys;
+            // Apply NWC/relays from env if not already in keys
+            if (!keys.nwc_uri && process.env.NWC_URI)
+                keys.nwc_uri = process.env.NWC_URI;
+            if (!keys.relays?.length)
+                keys.relays = RELAYS;
+            if (!keys.lightning_address && LIGHTNING_ADDRESS)
+                keys.lightning_address = LIGHTNING_ADDRESS;
+        }
+        // Connect a relay pool if not already connected (sovereign mode)
+        if (!state.relayPool) {
+            const relayUrls = keys.relays?.length ? keys.relays : RELAYS;
+            state.relayPool = new RelayPool(relayUrls);
+            await state.relayPool.connect();
+            console.log(`[${label}] Relay pool connected (${state.relayPool.connectedCount} relay(s))`);
+        }
+        // Subscribe to DVM requests via relay (Nostr-native job discovery)
+        subscribeDvmRequests(label);
+        // Build pricing map from config
+        const pricing = {};
+        const priceSats = SATS_PER_CHUNK * CHUNKS_PER_PAYMENT;
+        if (priceSats > 0)
+            pricing[String(KIND)] = priceSats;
+        state.stopHeartbeat = startNostrHeartbeat(label, keys, state.relayPool, {
+            pricing,
+            p2pStatsFn: () => ({
+                sessions: state.p2pSessionsCompleted,
+                earned_sats: state.p2pTotalEarnedSats,
+                active: activeSessions.size > 0,
+            }),
+        });
+        console.log(`[${label}] Heartbeat: Nostr (Kind 30333 → relay)`);
+    }
+    else {
+        console.error(`[${label}] ERROR: No local privkey found in .2020117_keys. Heartbeat disabled.`);
+        console.error(`[${label}] Generate a Nostr keypair and save privkey/pubkey to .2020117_keys.`);
+        console.error(`[${label}] See: https://2020117.xyz/skill.md §1 Identity`);
+    }
 }
 // --- 2a. Sovereign Mode (AIP-0009) ---
 async function setupSovereign(label) {
@@ -295,8 +340,34 @@ async function setupSovereign(label) {
     subscribeNipXX(label);
     // 8. Subscribe to DVM requests (Kind 5xxx) directly from relay
     subscribeDvmRequests(label);
-    // 9. Start sovereign heartbeat (Kind 30333 to relay)
-    startSovereignHeartbeat(label);
+    // 9. Print startup summary
+    const relays = (keys.relays || RELAYS).join(', ');
+    console.log('');
+    console.log(`═══════════════════════════════════════════════`);
+    console.log(`  Agent ready: ${agentName}`);
+    console.log(`  Pubkey:      ${keys.pubkey}`);
+    console.log(`  Kind:        ${KIND}`);
+    console.log(`  Relays:      ${relays}`);
+    console.log(`  Lightning:   ${LIGHTNING_ADDRESS || '(not set)'}`);
+    console.log(`  NWC wallet:  ${state.nwcParsed ? 'connected' : '(not set)'}`);
+    console.log(`  Processor:   ${state.processor?.name || 'none'}`);
+    console.log(`═══════════════════════════════════════════════`);
+    console.log('');
+    // 10. Start sovereign heartbeat (Kind 30333 to relay)
+    if (state.sovereignKeys && state.relayPool) {
+        const pricing = {};
+        const priceSats = SATS_PER_CHUNK * CHUNKS_PER_PAYMENT;
+        if (priceSats > 0)
+            pricing[String(KIND)] = priceSats;
+        state.stopHeartbeat = startNostrHeartbeat(label, state.sovereignKeys, state.relayPool, {
+            pricing,
+            p2pStatsFn: () => ({
+                sessions: state.p2pSessionsCompleted,
+                earned_sats: state.p2pTotalEarnedSats,
+                active: activeSessions.size > 0,
+            }),
+        });
+    }
 }
 async function publishAiInfo(label) {
     if (!state.sovereignKeys || !state.relayPool)
@@ -380,9 +451,13 @@ function subscribeNipXX(label) {
     });
     console.log(`[${label}] Subscribed to ai.prompt (Kind 25802)`);
 }
+let dvmSubscribed = false;
 function subscribeDvmRequests(label) {
     if (!state.sovereignKeys || !state.relayPool)
         return;
+    if (dvmSubscribed)
+        return; // prevent double-subscribe (sovereign + platform both call this)
+    dvmSubscribed = true;
     // Subscribe to all DVM requests of our kind (broadcast + directed)
     state.relayPool.subscribe({ kinds: [KIND] }, (event) => {
         handleDvmRequest(label, event).catch(e => {
@@ -448,6 +523,12 @@ async function handleAiPrompt(label, event) {
 async function handleDvmRequest(label, event) {
     if (!state.sovereignKeys || !state.relayPool || !state.processor)
         return;
+    // Skip own events
+    if (event.pubkey === state.sovereignKeys.pubkey)
+        return;
+    // Dedup: skip already-seen events
+    if (!markSeen(event.id))
+        return;
     if (!acquireSlot())
         return;
     try {
@@ -541,28 +622,41 @@ async function publishAiError(clientPubkey, promptId, code, message) {
     }, state.sovereignKeys.privkey);
     await state.relayPool.publish(event).catch(() => { });
 }
-function startSovereignHeartbeat(label) {
-    if (!state.sovereignKeys || !state.relayPool)
-        return;
+function startNostrHeartbeat(label, keys, pool, opts) {
     async function publishHeartbeat() {
-        if (!state.sovereignKeys || !state.relayPool)
-            return;
+        const tags = [
+            ['d', keys.pubkey],
+            ['status', 'online'],
+            ['capacity', String(getAvailableCapacity())],
+            ['kinds', String(KIND)],
+        ];
+        // Add pricing tag (format: "5100:50,5200:100")
+        if (opts?.pricing && Object.keys(opts.pricing).length > 0) {
+            tags.push(['price', Object.entries(opts.pricing).map(([k, v]) => `${k}:${v}`).join(',')]);
+        }
+        // Add p2p_stats tag (JSON)
+        if (opts?.p2pStatsFn) {
+            const stats = opts.p2pStatsFn();
+            tags.push(['p2p_stats', JSON.stringify(stats)]);
+        }
         const event = signEvent({
             kind: 30333,
-            tags: [
-                ['d', state.sovereignKeys.pubkey],
-                ['status', 'online'],
-                ['capacity', String(getAvailableCapacity())],
-                ['kinds', String(KIND)],
-            ],
+            tags,
             content: '',
-        }, state.sovereignKeys.privkey);
-        const ok = await state.relayPool.publish(event);
+        }, keys.privkey);
+        const ok = await pool.publish(event);
         if (ok)
             console.log(`[${label}] Heartbeat published to relay`);
     }
     publishHeartbeat();
-    setInterval(publishHeartbeat, 5 * 60_000);
+    const timer = setInterval(publishHeartbeat, 60_000);
+    return () => clearInterval(timer);
+}
+/** @deprecated Use startNostrHeartbeat. Kept for backward compat. */
+function startSovereignHeartbeat(label) {
+    if (!state.sovereignKeys || !state.relayPool)
+        return;
+    startNostrHeartbeat(label, state.sovereignKeys, state.relayPool);
 }
 // --- 3. Async Inbox Poller ---
 function startInboxPoller(label) {
@@ -685,6 +779,20 @@ async function delegateAPI(kind, input, bidSats, provider) {
     throw new Error(`Sub-task ${jobId} timed out after 120s`);
 }
 const activeSessions = new Map();
+// Dedup: track recently seen DVM request event IDs (prevent double-processing from relay + inbox)
+const seenEventIds = new Set();
+const MAX_SEEN = 500;
+function markSeen(eventId) {
+    if (seenEventIds.has(eventId))
+        return false;
+    seenEventIds.add(eventId);
+    if (seenEventIds.size > MAX_SEEN) {
+        const first = seenEventIds.values().next().value;
+        if (first)
+            seenEventIds.delete(first);
+    }
+    return true;
+}
 /** Send a billing tick to the customer — Cashu: request amount, Invoice: send bolt11 */
 async function sendBillingTick(node, session, amount, label) {
     const tickId = randomBytes(4).toString('hex');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "2020117-agent",
-  "version": "0.4.7",
-  "description": "2020117 agent runtime — API polling + Hyperswarm P2P + Sovereign Nostr mode + Cashu/Lightning payments",
+  "version": "0.5.0",
+  "description": "2020117 agent runtime — Nostr-native relay subscription + Hyperswarm P2P + Cashu/Lightning payments",
   "type": "module",
   "bin": {
     "2020117-agent": "./dist/agent.js",