2020117-agent 0.5.1 → 0.5.3

package/dist/agent.js

@@ -81,7 +81,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, createJob, getJob, getProfile, reportSession, } from './api.js';
+import { loadAgentName, } 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';
@@ -173,12 +173,12 @@ async function main() {
     if (state.skill) {
         console.log(`[${label}] Skill: ${state.skill.name} v${state.skill.version} (${state.skill.features.join(', ')})`);
     }
-    // 2. Auto-fetch Lightning Address from platform if not set via CLI/env
-    if (!LIGHTNING_ADDRESS && hasApiKey()) {
-        const profile = await getProfile();
-        if (profile?.lightning_address) {
-            LIGHTNING_ADDRESS = profile.lightning_address;
-            console.log(`[${label}] Lightning Address loaded from platform: ${LIGHTNING_ADDRESS}`);
+    // 2. Auto-load Lightning Address from .2020117_keys if not set via CLI/env
+    if (!LIGHTNING_ADDRESS) {
+        const keys = loadSovereignKeys(loadAgentName() || 'agent');
+        if (keys?.lightning_address) {
+            LIGHTNING_ADDRESS = keys.lightning_address;
+            console.log(`[${label}] Lightning Address loaded from keys: ${LIGHTNING_ADDRESS}`);
         }
     }
     // 3. Nostr identity + relay + subscriptions (all agents are Nostr-native)
@@ -515,8 +515,23 @@ async function handleDvmRequest(label, event) {
             content: '',
         }, state.sovereignKeys.privkey);
         await state.relayPool.publish(feedbackEvent);
-        // Process
-        const result = await state.processor.generate({ input });
+        // Process (with optional pipeline: delegate sub-task first)
+        let result;
+        if (SUB_KIND) {
+            console.log(`[${label}] Pipeline: delegating to kind ${SUB_KIND}...`);
+            try {
+                const subResult = await delegateNostr(label, SUB_KIND, input, SUB_BID, SUB_PROVIDER);
+                console.log(`[${label}] Sub-task returned ${subResult.length} chars`);
+                result = await state.processor.generate({ input: subResult });
+            }
+            catch (e) {
+                console.error(`[${label}] Sub-task failed: ${e.message}, using original input`);
+                result = await state.processor.generate({ input });
+            }
+        }
+        else {
+            result = await state.processor.generate({ input });
+        }
         console.log(`[${label}] DVM result: ${result.length} chars`);
         // Send result (Kind 6xxx = request kind + 1000)
         const resultKind = KIND + 1000;
@@ -624,35 +639,41 @@ function startSovereignHeartbeat(label) {
 }
 // --- Sub-task delegation ---
 /**
- * Delegate a sub-task via platform API. Creates a job, then polls until
- * the result is available (max 120s).
+ * Delegate a sub-task via Nostr relay. Publishes Kind 5xxx request,
+ * then subscribes for Kind 6xxx result (max 120s timeout).
  */
-async function delegateAPI(kind, input, bidSats, provider) {
-    const tag = `sub-api`;
-    const created = await createJob({ kind, input, bid_sats: bidSats, provider });
-    if (!created) {
-        throw new Error('Failed to create sub-task via API');
+async function delegateNostr(label, kind, input, bidSats, provider) {
+    if (!state.sovereignKeys || !state.relayPool) {
+        throw new Error('No Nostr keys or relay pool — cannot delegate sub-task');
     }
-    const jobId = created.job_id;
-    console.log(`[${tag}] Created job ${jobId} (kind ${kind}, bid ${bidSats})`);
-    // Poll for result
-    const deadline = Date.now() + 120_000;
-    while (Date.now() < deadline) {
-        await new Promise(r => setTimeout(r, 5_000));
-        const job = await getJob(jobId);
-        if (!job)
-            continue;
-        if (job.status === 'completed' || job.status === 'result_available') {
-            if (job.result) {
-                console.log(`[${tag}] Job ${jobId}: got result (${job.result.length} chars)`);
-                return job.result;
-            }
-        }
-        if (job.status === 'cancelled' || job.status === 'rejected') {
-            throw new Error(`Sub-task ${jobId} was ${job.status}`);
-        }
+    const tags = [
+        ['i', input, 'text'],
+        ['bid', String(bidSats * 1000)], // msats
+    ];
+    if (provider) {
+        tags.push(['p', provider]);
     }
-    throw new Error(`Sub-task ${jobId} timed out after 120s`);
+    const requestEvent = signEvent({
+        kind,
+        tags,
+        content: '',
+    }, state.sovereignKeys.privkey);
+    await state.relayPool.publish(requestEvent);
+    console.log(`[${label}] Published sub-task (Kind ${kind}, id ${requestEvent.id.slice(0, 8)})`);
+    // Subscribe for result (Kind = request kind + 1000) referencing our request
+    const resultKind = kind + 1000;
+    return new Promise((resolve, reject) => {
+        const timeout = setTimeout(() => {
+            sub.close();
+            reject(new Error(`Sub-task ${requestEvent.id.slice(0, 8)} timed out after 120s`));
+        }, 120_000);
+        const sub = state.relayPool.subscribe({ kinds: [resultKind], '#e': [requestEvent.id] }, (event) => {
+            clearTimeout(timeout);
+            sub.close();
+            console.log(`[${label}] Sub-task result from ${event.pubkey.slice(0, 8)}: ${event.content.length} chars`);
+            resolve(event.content);
+        });
+    });
 }
 const activeSessions = new Map();
 // Dedup: track recently seen DVM request event IDs (prevent double-processing from relay + inbox)
@@ -1072,10 +1093,7 @@ function endSession(node, session, label) {
     // Update P2P lifetime counters
     state.p2pSessionsCompleted++;
     state.p2pTotalEarnedSats += session.totalEarned;
-    // Report session to platform activity feed (best-effort, no content exposed)
-    if (hasApiKey()) {
-        reportSession({ kind: KIND, durationS, totalSats: session.totalEarned });
-    }
+    // Session stats are included in the next Kind 30333 heartbeat automatically
     activeSessions.delete(session.sessionId);
 }
 // --- 5. Graceful shutdown ---

package/package.json

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