2020117-agent 0.6.20 → 0.6.22

package/dist/agent.d.ts

@@ -8,10 +8,10 @@
  * to relays. The platform API is only used for read operations (pipeline sub-tasks).
  *
  * Usage:
- *   AGENT=translator DVM_KIND=5302 OLLAMA_MODEL=qwen2.5:0.5b npm run agent
- *   AGENT=my-agent DVM_KIND=5100 MAX_JOBS=5 npm run agent
- *   AGENT=broker DVM_KIND=5302 PROCESSOR=none SUB_KIND=5100 npm run agent
- *   AGENT=custom DVM_KIND=5100 PROCESSOR=exec:./my-model.sh npm run agent
- *   AGENT=remote DVM_KIND=5100 PROCESSOR=http://localhost:8080 npm run agent
+ *   AGENT=translator DVM_KIND=5002 OLLAMA_MODEL=qwen2.5:0.5b npm run agent
+ *   AGENT=my-agent DVM_KIND=5050 MAX_JOBS=5 npm run agent
+ *   AGENT=broker DVM_KIND=5002 PROCESSOR=none SUB_KIND=5050 npm run agent
+ *   AGENT=custom DVM_KIND=5050 PROCESSOR=exec:./my-model.sh npm run agent
+ *   AGENT=remote DVM_KIND=5050 PROCESSOR=http://localhost:8080 npm run agent
  */
 export {};

package/dist/agent.js

@@ -8,11 +8,11 @@
  * to relays. The platform API is only used for read operations (pipeline sub-tasks).
  *
  * Usage:
- *   AGENT=translator DVM_KIND=5302 OLLAMA_MODEL=qwen2.5:0.5b npm run agent
- *   AGENT=my-agent DVM_KIND=5100 MAX_JOBS=5 npm run agent
- *   AGENT=broker DVM_KIND=5302 PROCESSOR=none SUB_KIND=5100 npm run agent
- *   AGENT=custom DVM_KIND=5100 PROCESSOR=exec:./my-model.sh npm run agent
- *   AGENT=remote DVM_KIND=5100 PROCESSOR=http://localhost:8080 npm run agent
+ *   AGENT=translator DVM_KIND=5002 OLLAMA_MODEL=qwen2.5:0.5b npm run agent
+ *   AGENT=my-agent DVM_KIND=5050 MAX_JOBS=5 npm run agent
+ *   AGENT=broker DVM_KIND=5002 PROCESSOR=none SUB_KIND=5050 npm run agent
+ *   AGENT=custom DVM_KIND=5050 PROCESSOR=exec:./my-model.sh npm run agent
+ *   AGENT=remote DVM_KIND=5050 PROCESSOR=http://localhost:8080 npm run agent
  */
 // --- CLI args → env (for npx usage) ---
 for (const arg of process.argv.slice(2)) {
@@ -91,7 +91,8 @@ import WebSocket from 'ws';
 if (!globalThis.WebSocket)
     globalThis.WebSocket = WebSocket;
 // --- Config from env ---
-const KIND = Number(process.env.DVM_KIND) || 5100;
+const KINDS = (process.env.DVM_KIND || '5050').split(',').map(s => Number(s.trim())).filter(Boolean);
+const KIND = KINDS[0]; // primary kind (for result subscriptions, registration, etc.)
 const MAX_CONCURRENT = Number(process.env.MAX_JOBS) || 3;
 const P2P_ONLY = process.env.P2P_ONLY === 'true' || process.env.P2P_ONLY === '1';
 const SATS_PER_CHUNK = Number(process.env.SATS_PER_CHUNK) || 1;
@@ -161,7 +162,7 @@ async function main() {
     console.log(`[${label}] Starting agent runtime`);
     // 1. Create and verify processor
     state.processor = await createProcessor();
-    console.log(`[${label}] kind=${KIND} processor=${state.processor.name} maxJobs=${MAX_CONCURRENT}`);
+    console.log(`[${label}] kind=${KINDS.join(',')} processor=${state.processor.name} maxJobs=${MAX_CONCURRENT}`);
     if (SUB_KIND) {
         console.log(`[${label}] Pipeline: sub-task kind=${SUB_KIND} (bid=${SUB_BID}${SUB_PROVIDER ? `, provider=${SUB_PROVIDER}` : ''})`);
     }
@@ -266,7 +267,7 @@ async function setupNostr(label) {
     const pricing = {};
     const priceSats = SATS_PER_CHUNK * CHUNKS_PER_PAYMENT;
     if (priceSats > 0)
-        pricing[String(KIND)] = priceSats;
+        KINDS.forEach(k => { pricing[String(k)] = priceSats; });
     state.stopHeartbeat = startNostrHeartbeat(label, state.sovereignKeys, state.relayPool, {
         pricing,
         p2pStatsFn: () => ({
@@ -281,7 +282,7 @@ async function setupNostr(label) {
     console.log(`═══════════════════════════════════════════════`);
     console.log(`  Agent ready: ${agentName}`);
     console.log(`  Pubkey:      ${keys.pubkey}`);
-    console.log(`  Kind:        ${KIND}`);
+    console.log(`  Kind:        ${KINDS.join(',')}`);
     console.log(`  Relays:      ${relays}`);
     console.log(`  Lightning:   ${LIGHTNING_ADDRESS || '(not set)'}`);
     console.log(`  NWC wallet:  ${state.nwcParsed ? 'connected' : '(not set)'}`);
@@ -300,7 +301,7 @@ async function publishAiInfo(label) {
         supported_models: state.processor?.name ? [state.processor.name] : [],
         default_model: state.processor?.name || 'default',
         dvm_compatible: true,
-        dvm_kinds: [KIND],
+        dvm_kinds: KINDS,
         pricing_hints: {
             currency: 'BTC',
             sats_per_prompt: SATS_PER_CHUNK * CHUNKS_PER_PAYMENT,
@@ -356,8 +357,8 @@ async function publishHandlerInfo(label) {
     const event = signEvent({
         kind: 31990,
         tags: [
-            ['d', `${agentName}-${KIND}`],
-            ['k', String(KIND)],
+            ['d', `${agentName}-${KINDS.join('-')}`],
+            ...KINDS.map(k => ['k', String(k)]),
         ],
         content: JSON.stringify(content),
     }, state.sovereignKeys.privkey);
@@ -381,13 +382,13 @@ function subscribeDvmRequests(label) {
     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) => {
+    // Subscribe to all DVM requests of our kind(s) (broadcast + directed)
+    state.relayPool.subscribe({ kinds: KINDS }, (event) => {
         handleDvmRequest(label, event).catch(e => {
             console.error(`[${label}] DVM request error: ${e.message}`);
         });
     });
-    console.log(`[${label}] Subscribed to DVM requests (Kind ${KIND}) via relay`);
+    console.log(`[${label}] Subscribed to DVM requests (Kind ${KINDS.join(',')}) via relay`);
 }
 // --- Customer: subscribe to DVM results and auto-pay ---
 let dvmResultSubscribed = false;
@@ -398,13 +399,13 @@ function subscribeDvmResults(label) {
         return;
     dvmResultSubscribed = true;
     // Subscribe to Kind 6xxx results directed to us (#p = our pubkey)
-    const resultKind = KIND + 1000;
-    state.relayPool.subscribe({ kinds: [resultKind], '#p': [state.sovereignKeys.pubkey] }, (event) => {
+    const resultKinds = KINDS.map(k => k + 1000);
+    state.relayPool.subscribe({ kinds: resultKinds, '#p': [state.sovereignKeys.pubkey] }, (event) => {
         handleDvmResult(label, event).catch(e => {
             console.error(`[${label}] DVM result handler error: ${e.message}`);
         });
     });
-    console.log(`[${label}] Subscribed to DVM results (Kind ${resultKind}) via relay`);
+    console.log(`[${label}] Subscribed to DVM results (Kind ${resultKinds.join(',')}) via relay`);
 }
 async function handleDvmResult(label, event) {
     if (!state.sovereignKeys || !state.relayPool)
@@ -570,8 +571,16 @@ async function handleDvmRequest(label, event) {
     // Dedup: skip already-seen events
     if (!markSeen(event.id))
         return;
-    if (!acquireSlot())
+    if (!acquireSlot()) {
+        console.warn(`[${label}] DVM request ${event.id.slice(0, 8)} dropped — agent at capacity (${state.activeJobs}/${MAX_CONCURRENT})`);
+        const errorEvent = signEvent({
+            kind: 7000,
+            tags: [['p', event.pubkey], ['e', event.id], ['status', 'error']],
+            content: 'Agent at capacity, please retry later',
+        }, state.sovereignKeys.privkey);
+        await state.relayPool.publish(errorEvent).catch(() => { });
         return;
+    }
     try {
         // Step 1: p-tag filter — if request is directed (has p tags) but not to us, skip
         const pTags = event.tags.filter(t => t[0] === 'p').map(t => t[1]);
@@ -653,7 +662,7 @@ async function handleDvmRequest(label, event) {
         }
         console.log(`[${label}] DVM result: ${result.length} chars`);
         // Send result (Kind 6xxx = request kind + 1000)
-        const resultKind = KIND + 1000;
+        const resultKind = event.kind + 1000;
         // Prefer the bid the customer declared in the job; fall back to local fixed price.
         // bid tag is in the outer (unencrypted) event tags per NIP-90.
         const bidMsats = Number(event.tags.find(t => t[0] === 'bid')?.[1] || '0');
@@ -748,7 +757,7 @@ function startNostrHeartbeat(label, keys, pool, opts) {
             ['d', keys.pubkey],
             ['status', 'online'],
             ['capacity', String(getAvailableCapacity())],
-            ['kinds', String(KIND)],
+            ['kinds', KINDS.join(',')],
         ];
         // Add pricing tag (format: "5100:50,5200:100")
         if (opts?.pricing && Object.keys(opts.pricing).length > 0) {

package/dist/nostr.js

@@ -203,17 +203,22 @@ export class NostrRelay {
     async reconnect() {
         try {
             await this.connect();
-            // Re-subscribe after reconnect
-            for (const [id, handler] of this.subs) {
-                // Can't re-send original filters, but the subscription handler is preserved
-                // Caller should re-subscribe if needed
+            // Re-send all active subscriptions to the relay
+            for (const [id, { filters }] of this.subs) {
+                this.ws.send(JSON.stringify(['REQ', id, filters]));
+            }
+            if (this.subs.size > 0) {
+                console.log(`[NostrRelay] Reconnected to ${this.url}, restored ${this.subs.size} subscription(s)`);
             }
         }
-        catch { }
+        catch (e) {
+            console.error(`[NostrRelay] Reconnect failed for ${this.url}: ${e.message}`);
+        }
     }
     handleMessage(msg) {
         if (msg[0] === 'EVENT') {
-            const handler = this.subs.get(msg[1]);
+            const sub = this.subs.get(msg[1]);
+            const handler = sub?.handler;
             if (handler)
                 handler(msg[2]);
         }
@@ -249,7 +254,7 @@ export class NostrRelay {
         if (!this.ws || !this._connected)
             throw new Error('Not connected');
         const id = randomBytes(4).toString('hex');
-        this.subs.set(id, handler);
+        this.subs.set(id, { filters, handler });
         if (onEose)
             this.eoseCallbacks.set(id, onEose);
         this.ws.send(JSON.stringify(['REQ', id, filters]));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "2020117-agent",
-  "version": "0.6.20",
+  "version": "0.6.22",
   "description": "2020117 agent runtime — Nostr-native relay subscription + Hyperswarm P2P + Lightning payments",
   "type": "module",
   "bin": {