2020117-agent 0.4.2 → 0.4.4

package/dist/agent.js

@@ -333,6 +333,10 @@ async function publishHandlerInfo(label) {
         about: state.skill?.description || `DVM agent (kind ${KIND})`,
         pricing: { [String(KIND)]: SATS_PER_CHUNK * CHUNKS_PER_PAYMENT },
     };
+    if (LIGHTNING_ADDRESS) {
+        content.payment = { lightning_address: LIGHTNING_ADDRESS };
+        content.lud16 = LIGHTNING_ADDRESS;
+    }
     const event = signEvent({
         kind: 31990,
         tags: [
@@ -449,17 +453,43 @@ 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 resultTags = [
+            ['p', event.pubkey],
+            ['e', event.id],
+            ['request', JSON.stringify(event)],
+            ['amount', String(SATS_PER_CHUNK * CHUNKS_PER_PAYMENT * 1000)], // msats
+        ];
+        if (LIGHTNING_ADDRESS) {
+            resultTags.push(['lightning_address', LIGHTNING_ADDRESS]);
+        }
         const resultEvent = signEvent({
             kind: resultKind,
-            tags: [
-                ['p', event.pubkey],
-                ['e', event.id],
-                ['request', JSON.stringify(event)],
-            ],
+            tags: resultTags,
             content: result,
         }, state.sovereignKeys.privkey);
         await state.relayPool.publish(resultEvent);
         console.log(`[${label}] Published DVM result (Kind ${resultKind}) via relay`);
+        // Publish reputation endorsement (Kind 30311) for customer
+        try {
+            const endorsementEvent = signEvent({
+                kind: 30311,
+                tags: [
+                    ['d', event.pubkey],
+                    ['p', event.pubkey],
+                    ['rating', '5'],
+                    ['k', String(KIND)],
+                ],
+                content: JSON.stringify({
+                    rating: 5,
+                    context: { jobs_together: 1, kinds: [KIND], last_job_at: Math.floor(Date.now() / 1000) },
+                }),
+            }, state.sovereignKeys.privkey);
+            await state.relayPool.publish(endorsementEvent);
+            console.log(`[${label}] Published endorsement (Kind 30311) for ${event.pubkey.slice(0, 8)}`);
+        }
+        catch (e) {
+            console.warn(`[${label}] Failed to publish endorsement: ${e.message}`);
+        }
     }
     finally {
         releaseSlot();
@@ -676,7 +706,14 @@ async function startSwarmListener(label) {
     node.on('message', async (msg, socket, peerId) => {
         const tag = peerId.slice(0, 8);
         if (msg.type === 'skill_request') {
-            node.send(socket, { type: 'skill_response', id: msg.id, skill: state.skill });
+            const satsPerMinute = state.skill?.pricing?.sats_per_minute
+                || Number(process.env.SATS_PER_MINUTE)
+                || 10;
+            // Always include runtime pricing, even without a skill file
+            const skillWithPricing = state.skill
+                ? { ...state.skill, pricing: { ...(state.skill.pricing || {}), sats_per_minute: satsPerMinute } }
+                : { pricing: { sats_per_minute: satsPerMinute }, payment_methods: LIGHTNING_ADDRESS ? ['cashu', 'invoice'] : ['cashu'] };
+            node.send(socket, { type: 'skill_response', id: msg.id, skill: skillWithPricing });
             return;
         }
         // --- Session protocol ---

package/dist/session.js

@@ -43,12 +43,17 @@ for (const arg of process.argv.slice(2)) {
         case '--mint':
             process.env.CASHU_MINT_URL = val;
             break;
+        case '--nwc':
+            process.env.NWC_URI = val;
+            break;
     }
 }
 import { SwarmNode, topicFromKind } from './swarm.js';
 import { queryProviderSkill } from './p2p-customer.js';
 import { walletPayInvoice, walletGetBalance, hasApiKey } from './api.js';
 import { decodeCashuToken, sendCashuToken, createMintQuote, claimMintQuote } from './cashu.js';
+import { parseNwcUri, nwcGetBalance, nwcPayInvoice } from './nwc.js';
+import { loadSovereignKeys } from './nostr.js';
 import { randomBytes } from 'crypto';
 import { createServer } from 'http';
 import { createInterface } from 'readline';
@@ -60,10 +65,24 @@ const BUDGET = Number(process.env.BUDGET_SATS) || 500;
 const PORT = Number(process.env.SESSION_PORT) || 8080;
 const CASHU_TOKEN = process.env.CASHU_TOKEN || '';
 const MINT_URL = process.env.CASHU_MINT_URL || 'https://8333.space:3338';
+// Load NWC URI: --nwc flag > .2020117_keys nwc_uri > none
+let nwcParsed = null;
+const nwcUri = process.env.NWC_URI
+    || loadSovereignKeys(process.env.AGENT)?.nwc_uri
+    || null;
 // Mutable Cashu wallet state (loaded from CASHU_TOKEN at startup)
 let cashuState = null;
 const TICK_INTERVAL_MS = 60_000;
 const HTTP_TIMEOUT_MS = 60_000;
+function confirmPrompt(question) {
+    return new Promise(resolve => {
+        const rl = createInterface({ input: process.stdin, output: process.stdout });
+        rl.question(question, answer => {
+            rl.close();
+            resolve(answer.trim().toLowerCase() === 'y' || answer.trim().toLowerCase() === 'yes');
+        });
+    });
+}
 const state = {
     node: null,
     socket: null,
@@ -175,23 +194,43 @@ function setupMessageHandler() {
                     break;
                 }
                 if (msg.bolt11) {
-                    // Invoice mode: pay bolt11 via wallet
+                    // Invoice mode: pay bolt11 via NWC direct or platform API
                     log(`Paying invoice: ${amount} sats...`);
-                    const payResult = await walletPayInvoice(msg.bolt11);
-                    if (payResult.ok) {
-                        state.totalSpent += amount;
-                        log(`Paid ${amount} sats (total: ${state.totalSpent}, ~${estimatedMinutesLeft()} min left)`);
-                        state.node.send(state.socket, {
-                            type: 'session_tick_ack',
-                            id: msg.id,
-                            session_id: state.sessionId,
-                            preimage: payResult.preimage,
-                            amount,
-                        });
+                    if (nwcParsed) {
+                        try {
+                            const { preimage } = await nwcPayInvoice(nwcParsed, msg.bolt11);
+                            state.totalSpent += amount;
+                            log(`Paid ${amount} sats via NWC (total: ${state.totalSpent}, ~${estimatedMinutesLeft()} min left)`);
+                            state.node.send(state.socket, {
+                                type: 'session_tick_ack',
+                                id: msg.id,
+                                session_id: state.sessionId,
+                                preimage,
+                                amount,
+                            });
+                        }
+                        catch (e) {
+                            warn(`NWC invoice payment failed: ${e.message} — ending session`);
+                            endSession();
+                        }
                     }
                     else {
-                        warn(`Invoice payment failed: ${payResult.error} — ending session`);
-                        endSession();
+                        const payResult = await walletPayInvoice(msg.bolt11);
+                        if (payResult.ok) {
+                            state.totalSpent += amount;
+                            log(`Paid ${amount} sats (total: ${state.totalSpent}, ~${estimatedMinutesLeft()} min left)`);
+                            state.node.send(state.socket, {
+                                type: 'session_tick_ack',
+                                id: msg.id,
+                                session_id: state.sessionId,
+                                preimage: payResult.preimage,
+                                amount,
+                            });
+                        }
+                        else {
+                            warn(`Invoice payment failed: ${payResult.error} — ending session`);
+                            endSession();
+                        }
                     }
                 }
                 else if (cashuState) {
@@ -701,8 +740,26 @@ async function main() {
     const pricing = skill?.pricing;
     const satsPerMinute = Number(pricing?.sats_per_minute) || 10;
     state.satsPerMinute = satsPerMinute;
-    log(`Pricing: ${satsPerMinute} sats/min`);
-    log(`Budget: ${BUDGET} sats (~${Math.floor(BUDGET / satsPerMinute)} min)`);
+    // Price confirmation
+    const minutesAvailable = Math.floor(BUDGET / satsPerMinute);
+    log('');
+    log('┌─────────────────────────────────');
+    log(`│ Rate:     ${satsPerMinute} sats/min`);
+    log(`│ Budget:   ${BUDGET} sats`);
+    log(`│ Duration: ~${minutesAvailable} min`);
+    if (skill?.payment_methods) {
+        log(`│ Payment:  ${skill.payment_methods.join(', ')}`);
+    }
+    log('└─────────────────────────────────');
+    log('');
+    if (process.stdin.isTTY) {
+        const confirmed = await confirmPrompt('Start session? (y/n): ');
+        if (!confirmed) {
+            log('Session cancelled.');
+            await node.destroy();
+            process.exit(0);
+        }
+    }
     // 4. Determine payment method: Cashu (default) or invoice (fallback)
     let paymentMethod;
     if (CASHU_TOKEN) {
@@ -716,8 +773,40 @@ async function main() {
             warn(`Cashu token (${tokenAmount} sats) is less than budget (${BUDGET} sats)`);
         }
     }
+    else if (nwcUri) {
+        // NWC direct: auto-mint Cashu tokens via local NWC wallet (no platform API)
+        nwcParsed = parseNwcUri(nwcUri);
+        const { balance_msats } = await nwcGetBalance(nwcParsed);
+        const balance = Math.floor(balance_msats / 1000);
+        if (balance <= 0) {
+            warn('NWC wallet balance is 0. Cannot auto-mint Cashu tokens.');
+            await node.destroy();
+            process.exit(1);
+        }
+        const mintAmount = Math.min(balance, BUDGET);
+        log(`NWC wallet balance: ${balance} sats — minting ${mintAmount} sats from ${MINT_URL}`);
+        try {
+            const { quote, invoice } = await createMintQuote(MINT_URL, mintAmount);
+            log(`Mint quote: ${quote} (invoice: ${invoice.slice(0, 30)}...)`);
+            log('Paying mint invoice via NWC...');
+            const { preimage } = await nwcPayInvoice(nwcParsed, invoice);
+            log(`Invoice paid (preimage: ${preimage?.slice(0, 16)}...)`);
+            log('Claiming minted tokens...');
+            const token = await claimMintQuote(MINT_URL, mintAmount, quote);
+            const { mint, proofs } = decodeCashuToken(token);
+            cashuState = { mintUrl: mint, proofs };
+            paymentMethod = 'cashu';
+            const totalMinted = proofs.reduce((s, p) => s + p.amount, 0);
+            log(`Minted ${totalMinted} sats Cashu token — using Cashu payment mode`);
+        }
+        catch (e) {
+            warn(`NWC auto-mint failed: ${e.message}`);
+            await node.destroy();
+            process.exit(1);
+        }
+    }
     else if (hasApiKey()) {
-        // Auto-mint Cashu tokens via NWC wallet
+        // Platform API fallback: auto-mint Cashu tokens via platform wallet proxy
         const balance = await walletGetBalance();
         if (balance <= 0) {
             warn('Wallet balance is 0. Cannot auto-mint Cashu tokens.');
@@ -727,17 +816,14 @@ async function main() {
         const mintAmount = Math.min(balance, BUDGET);
         log(`Wallet balance: ${balance} sats — minting ${mintAmount} sats from ${MINT_URL}`);
         try {
-            // 1. Request mint quote (Lightning invoice)
             const { quote, invoice } = await createMintQuote(MINT_URL, mintAmount);
             log(`Mint quote: ${quote} (invoice: ${invoice.slice(0, 30)}...)`);
-            // 2. Pay the invoice via platform NWC wallet
-            log('Paying mint invoice via NWC wallet...');
+            log('Paying mint invoice via platform wallet...');
             const payResult = await walletPayInvoice(invoice);
             if (!payResult.ok) {
                 throw new Error(`Payment failed: ${payResult.error}`);
             }
             log(`Invoice paid (preimage: ${payResult.preimage?.slice(0, 16)}...)`);
-            // 3. Claim minted proofs
             log('Claiming minted tokens...');
             const token = await claimMintQuote(MINT_URL, mintAmount, quote);
             const { mint, proofs } = decodeCashuToken(token);
@@ -755,7 +841,8 @@ async function main() {
     else {
         warn('No payment method available.');
         warn('  Option 1 (default): --cashu-token=cashuA... (Cashu eCash token)');
-        warn('  Option 2: --agent=NAME (auto-mints Cashu via NWC wallet)');
+        warn('  Option 2: --nwc="nostr+walletconnect://..." (NWC direct wallet)');
+        warn('  Option 3: --agent=NAME (auto-mints via platform API)');
         await node.destroy();
         process.exit(1);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "2020117-agent",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "2020117 agent runtime — API polling + Hyperswarm P2P + Sovereign Nostr mode + Cashu/Lightning payments",
   "type": "module",
   "bin": {