agentstore 1.0.2 → 1.0.3

package/dist/index.js

@@ -13,7 +13,7 @@ import * as keytar from 'keytar';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const API_BASE = 'https://api.agentstore.tools';
-const MEV_COMMIT_RPC = 'https://fastrpc.mev-commit.xyz';
+const ETHEREUM_RPC = 'https://ethereum-rpc.publicnode.com';
 const KEYCHAIN_SERVICE = 'agentstore-wallet';
 const KEYCHAIN_ACCOUNT = 'encryption-key';
 // USDC contract on Ethereum mainnet
@@ -53,7 +53,7 @@ const TX_HISTORY_FILE = path.join(AGENTSTORE_DIR, 'tx_history.json');
 // Create public client for reading blockchain state
 const publicClient = createPublicClient({
     chain: mainnet,
-    transport: http(MEV_COMMIT_RPC),
+    transport: http(ETHEREUM_RPC),
 });
 // Ensure directories exist
 function ensureDirectories() {
@@ -214,7 +214,7 @@ async function createNewWallet() {
         address: account.address,
         createdAt: new Date().toISOString(),
         network: 'mainnet',
-        rpcEndpoint: MEV_COMMIT_RPC,
+        rpcEndpoint: ETHEREUM_RPC,
         spendLimits: {
             perTransaction: 100,
             daily: 500,
@@ -243,7 +243,7 @@ async function ensureWalletExists() {
         address: account.address,
         createdAt: new Date().toISOString(),
         network: 'mainnet',
-        rpcEndpoint: MEV_COMMIT_RPC,
+        rpcEndpoint: ETHEREUM_RPC,
         spendLimits: {
             perTransaction: 100,
             daily: 500,
@@ -413,6 +413,42 @@ function prompt(question) {
         });
     });
 }
+// Prompt for secret input (masked)
+function promptSecret(question) {
+    return new Promise((resolve) => {
+        process.stdout.write(question);
+        const stdin = process.stdin;
+        const wasRaw = stdin.isRaw;
+        stdin.setRawMode?.(true);
+        stdin.resume();
+        stdin.setEncoding('utf8');
+        let input = '';
+        const onData = (ch) => {
+            if (ch === '\n' || ch === '\r') {
+                stdin.setRawMode?.(wasRaw ?? false);
+                stdin.pause();
+                stdin.removeListener('data', onData);
+                process.stdout.write('\n');
+                resolve(input);
+            }
+            else if (ch === '\u0003') {
+                // Ctrl+C
+                process.exit(0);
+            }
+            else if (ch === '\u007f' || ch === '\b') {
+                if (input.length > 0) {
+                    input = input.slice(0, -1);
+                    process.stdout.write('\b \b');
+                }
+            }
+            else {
+                input += ch;
+                process.stdout.write('*');
+            }
+        };
+        stdin.on('data', onData);
+    });
+}
 // Check agent access — returns entitlement if already purchased, or 402 payment params
 async function getPaymentRequired(agentId, walletAddress) {
     try {
@@ -490,6 +526,18 @@ async function submitX402Payment(agentId, walletAddress, payment, authorization)
         });
         if (!response.ok) {
             const error = await response.json();
+            if (response.status === 409) {
+                // Already purchased — re-check /access for the entitlement
+                console.log('Agent already purchased. Retrieving entitlement...');
+                const access = await getPaymentRequired(agentId, walletAddress);
+                if (access.status === 'granted' && access.entitlement) {
+                    return {
+                        entitlement_token: access.entitlement.token,
+                        install: access.install,
+                        proof: null,
+                    };
+                }
+            }
             console.error(`Payment failed: ${error.error || response.statusText}`);
             return null;
         }
@@ -575,6 +623,9 @@ This is a prompt-based agent. Reference it by asking Claude to follow the instru
 }
 // Install command
 async function installAgent(agentId, options) {
+    // --pay is a true alias for --yes
+    if (options.pay)
+        options.yes = true;
     ensureDirectories();
     console.log(`Fetching agent: ${agentId}...`);
     const agent = await fetchAgent(agentId);
@@ -622,93 +673,112 @@ async function installAgent(agentId, options) {
         console.log('\n💰 Payment Required:');
         console.log(`   Price: $${priceUsd.toFixed(2)} USDC`);
         console.log(`   Your wallet: ${walletAddress}`);
-        // Check access status (entitlement or 402)
-        const accessResult = await getPaymentRequired(agent.agent_id, walletAddress);
-        if (accessResult.status === 'error') {
-            console.log(`\n❌ Access check failed: ${accessResult.error}`);
-            process.exit(1);
-        }
-        if (accessResult.status === 'granted' && accessResult.entitlement) {
+        // Check local entitlements first (skip API call if already purchased)
+        const localEntitlements = loadEntitlements();
+        const localEntitlement = localEntitlements.find((e) => e.agentId === agent.agent_id);
+        if (localEntitlement) {
             console.log('\n✓ Already purchased! Using existing entitlement.');
-            entitlementToken = accessResult.entitlement.token;
-            expiresAt = accessResult.entitlement.expires_at;
-        }
-        else if (accessResult.status === 'payment_required') {
-            const paymentRequired = accessResult.payment;
-            // Check USDC balance
-            try {
-                const balance = await getWalletBalance();
-                const requiredRaw = parseUsdc(paymentRequired.amount);
-                console.log(`   Your USDC balance: $${balance.usdc}`);
-                if (balance.usdcRaw < requiredRaw) {
-                    console.log(`\n⚠️  Insufficient USDC. Need $${paymentRequired.amount}, have $${balance.usdc}`);
-                    const funded = await triggerFundingFlow(priceUsd);
-                    if (!funded) {
-                        process.exit(1);
-                    }
-                    // Re-check balance after funding
-                    const newBalance = await getWalletBalance();
-                    console.log(`   New USDC balance: $${newBalance.usdc}`);
-                    if (newBalance.usdcRaw < requiredRaw) {
-                        console.log(`\n❌ Still insufficient. Need $${paymentRequired.amount}, have $${newBalance.usdc}`);
-                        process.exit(1);
-                    }
-                }
-            }
-            catch (error) {
-                console.log(`\n❌ Could not check balance: ${error instanceof Error ? error.message : error}`);
+            entitlementToken = localEntitlement.token;
+            expiresAt = localEntitlement.expiresAt;
+        }
+        // If no local entitlement, check server
+        if (!entitlementToken) {
+            const accessResult = await getPaymentRequired(agent.agent_id, walletAddress);
+            if (accessResult.status === 'error') {
+                console.log(`\n❌ Access check failed: ${accessResult.error}`);
                 process.exit(1);
             }
-            // Check spend limits
-            const config = loadWalletConfig();
-            const txHistory = loadTxHistory();
-            const limitCheck = checkSpendLimit(priceUsd, config, txHistory);
-            if (!limitCheck.allowed) {
-                console.log(`\n❌ Spend limit exceeded: ${limitCheck.reason}`);
-                process.exit(1);
+            if (accessResult.status === 'granted' && accessResult.entitlement) {
+                console.log('\n✓ Already purchased! Using existing entitlement.');
+                entitlementToken = accessResult.entitlement.token;
+                expiresAt = accessResult.entitlement.expires_at;
             }
-            // Confirm payment (skip with --yes or --pay)
-            if (!options.yes && !options.pay) {
-                const confirm = await prompt(`\nPay $${paymentRequired.amount} USDC for "${agent.name}"? (y/n) `);
-                if (confirm !== 'y' && confirm !== 'yes') {
-                    console.log('Payment cancelled.');
-                    process.exit(0);
+        }
+        if (!entitlementToken) {
+            // Need to pay — fetch 402 details
+            const accessResult = await getPaymentRequired(agent.agent_id, walletAddress);
+            if (accessResult.status !== 'payment_required') {
+                if (accessResult.status === 'granted') {
+                    console.log('\n✓ Access granted (no payment needed).');
+                }
+                else {
+                    console.log(`\n❌ Unexpected access status: ${accessResult.status}`);
+                    process.exit(1);
                 }
             }
-            // Sign the EIP-3009 authorization
-            const privateKey = await loadPrivateKey();
-            if (!privateKey) {
-                console.log('\n❌ Could not load wallet private key');
-                process.exit(1);
-            }
-            console.log('\n🔐 Signing USDC authorization...');
-            const authorization = await signTransferAuthorization(paymentRequired, privateKey, walletAddress);
-            // Submit to API for facilitator relay
-            console.log('🔄 Processing payment via x402...');
-            const result = await submitX402Payment(agent.agent_id, walletAddress, paymentRequired, authorization);
-            if (!result) {
-                console.log('❌ Payment processing failed.');
-                process.exit(1);
+            else {
+                const paymentRequired = accessResult.payment;
+                // Check USDC balance
+                try {
+                    const balance = await getWalletBalance();
+                    const requiredRaw = parseUsdc(paymentRequired.amount);
+                    console.log(`   Your USDC balance: $${balance.usdc}`);
+                    if (balance.usdcRaw < requiredRaw) {
+                        console.log(`\n⚠️  Insufficient USDC. Need $${paymentRequired.amount}, have $${balance.usdc}`);
+                        const funded = await triggerFundingFlow(priceUsd);
+                        if (!funded) {
+                            process.exit(1);
+                        }
+                        // Re-check balance after funding
+                        const newBalance = await getWalletBalance();
+                        console.log(`   New USDC balance: $${newBalance.usdc}`);
+                        if (newBalance.usdcRaw < requiredRaw) {
+                            console.log(`\n❌ Still insufficient. Need $${paymentRequired.amount}, have $${newBalance.usdc}`);
+                            process.exit(1);
+                        }
+                    }
+                }
+                catch (error) {
+                    console.log(`\n❌ Could not check balance: ${error instanceof Error ? error.message : error}`);
+                    process.exit(1);
+                }
+                // Check spend limits
+                const config = loadWalletConfig();
+                const txHistory = loadTxHistory();
+                const limitCheck = checkSpendLimit(priceUsd, config, txHistory);
+                if (!limitCheck.allowed) {
+                    console.log(`\n❌ Spend limit exceeded: ${limitCheck.reason}`);
+                    process.exit(1);
+                }
+                // Confirm payment (skip with --yes or --pay)
+                if (!options.yes) {
+                    const confirm = await prompt(`\nPay $${paymentRequired.amount} USDC for "${agent.name}"? (y/n) `);
+                    if (confirm !== 'y' && confirm !== 'yes') {
+                        console.log('Payment cancelled.');
+                        process.exit(0);
+                    }
+                }
+                // Sign the EIP-3009 authorization
+                const privateKey = await loadPrivateKey();
+                if (!privateKey) {
+                    console.log('\n❌ Could not load wallet private key');
+                    process.exit(1);
+                }
+                console.log('\n🔐 Signing USDC authorization...');
+                const authorization = await signTransferAuthorization(paymentRequired, privateKey, walletAddress);
+                // Submit to API for facilitator relay
+                console.log('🔄 Processing payment via x402...');
+                const result = await submitX402Payment(agent.agent_id, walletAddress, paymentRequired, authorization);
+                if (!result) {
+                    console.log('❌ Payment processing failed.');
+                    process.exit(1);
+                }
+                entitlementToken = result.entitlement_token;
+                expiresAt = null;
+                console.log('✓ Payment confirmed! (gasless USDC via x402)');
+                // Record in local tx history
+                const txProof = result.proof;
+                txHistory.push({
+                    txHash: txProof?.tx_hash || 'x402-' + Date.now(),
+                    to: paymentRequired.payTo,
+                    amountUsdc: paymentRequired.amount,
+                    amountUsd: priceUsd,
+                    agentId: agent.agent_id,
+                    timestamp: new Date().toISOString(),
+                    status: 'confirmed',
+                });
+                saveTxHistory(txHistory);
             }
-            entitlementToken = result.entitlement_token;
-            expiresAt = null;
-            console.log('✓ Payment confirmed! (gasless USDC via x402)');
-            // Record in local tx history
-            const txProof = result.proof;
-            txHistory.push({
-                txHash: txProof?.tx_hash || 'x402-' + Date.now(),
-                to: paymentRequired.payTo,
-                amountUsdc: paymentRequired.amount,
-                amountUsd: priceUsd,
-                agentId: agent.agent_id,
-                timestamp: new Date().toISOString(),
-                status: 'confirmed',
-            });
-            saveTxHistory(txHistory);
-        }
-        else if (accessResult.status === 'granted') {
-            // Free agent via access route (model says free)
-            console.log('\n✓ Access granted (no payment needed).');
         }
     }
     console.log('\nInstalling...');
@@ -1097,7 +1167,7 @@ walletCmd
             console.log('Wallet already exists. Delete ~/.agentstore/wallet.* files to import a new one.');
             process.exit(1);
         }
-        const key = await prompt('Enter private key (0x...): ');
+        const key = await promptSecret('Enter private key (0x...): ');
         if (!key.startsWith('0x') || key.length !== 66) {
             console.log('Invalid private key format. Must be a 0x-prefixed 64-character hex string.');
             process.exit(1);
@@ -1108,7 +1178,7 @@ walletCmd
             address: account.address,
             createdAt: new Date().toISOString(),
             network: 'mainnet',
-            rpcEndpoint: MEV_COMMIT_RPC,
+            rpcEndpoint: ETHEREUM_RPC,
             spendLimits: { perTransaction: 100, daily: 500, weekly: 2000 },
             allowedPublishers: [],
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentstore",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "AgentStore CLI - Browse, install, and pay for Claude Code agents",
   "type": "module",
   "main": "dist/index.js",