agentic-x402 0.3.1 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentic-x402",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Agent skill for x402 payments - pay for and sell gated content",
   "type": "module",
   "bin": {

package/scripts/plugin/cli.ts

@@ -19,38 +19,41 @@ export function registerCliCommands(
       .option('--interval <ms>', 'Poll interval in milliseconds', '30000')
       .action(async (opts: unknown) => {
         const { interval: intervalStr } = opts as { interval: string };
-        if (watcher) {
-          console.log('Watcher is already running as a background service.');
+
+        // If the watcher is actually running (gateway context), show its status
+        if (watcher && watcher.getStatus().running) {
           const status = watcher.getStatus();
+          console.log('Watcher is running as a background service.');
           console.log(`Tracking ${status.trackedRouters.length} router(s)`);
           console.log(`Payments detected: ${status.paymentsDetected}`);
+          console.log(`Last poll: ${status.lastPollAt ?? 'Never'}`);
           return;
         }
 
-        // Start a standalone watcher for debugging
+        // CLI context: watcher exists but was never start()-ed, or is null.
+        // Start a watcher in foreground for debugging.
         const { PaymentWatcher: WatcherClass } = await import('./watcher.js');
-        const { applyConfigBridge } = await import('./config-bridge.js');
-
-        applyConfigBridge({});
 
         const interval = parseInt(intervalStr, 10);
+        const address = getWalletAddress();
 
-        const debugWatcher = new WatcherClass({
+        const fgWatcher = new WatcherClass({
           logger,
-          gatewayPort: 0,
+          gatewayPort: api.gatewayPort || 0,
           pollIntervalMs: interval,
-          notifyOnPayment: false,
+          notifyOnPayment: api.gatewayPort > 0,
         });
 
-        console.log('Starting payment watcher in foreground...');
+        console.log(`Starting payment watcher in foreground for ${address}...`);
+        console.log(`Poll interval: ${interval / 1000}s`);
         console.log('Press Ctrl+C to stop.\n');
 
         process.on('SIGINT', async () => {
-          await debugWatcher.stop();
+          await fgWatcher.stop();
           process.exit(0);
         });
 
-        await debugWatcher.start();
+        await fgWatcher.start();
 
         // Keep alive
         await new Promise(() => {});
@@ -59,35 +62,98 @@ export function registerCliCommands(
     x402
       .command('status')
       .description('Show payment watcher status, tracked routers, and payment count')
-      .action(() => {
-        if (!watcher) {
-          console.log('Payment watcher is not running.');
-          console.log('Enable it in your OpenClaw plugin config or start it with: openclaw x402 watch');
+      .action(async () => {
+        const address = getWalletAddress();
+
+        // If watcher is running in gateway context, show its live state
+        if (watcher && watcher.getStatus().running) {
+          const status = watcher.getStatus();
+
+          console.log('x402 Payment Watcher Status');
+          console.log('===========================\n');
+          console.log(`Running:           Yes (background service)`);
+          console.log(`Poll interval:     ${status.pollIntervalMs / 1000}s`);
+          console.log(`Payments detected: ${status.paymentsDetected}`);
+          console.log(`Last poll:         ${status.lastPollAt ?? 'Never'}`);
+          console.log(`Wallet address:    ${address}`);
+
+          if (status.trackedRouters.length === 0) {
+            console.log('\nNo routers tracked yet.');
+          } else {
+            console.log(`\nTracked Routers (${status.trackedRouters.length}):`);
+            for (const r of status.trackedRouters) {
+              console.log(`  ${r.name}`);
+              console.log(`    Address: ${r.address}`);
+              console.log(`    Balance: ${r.balance} USDC`);
+              console.log(`    Checked: ${r.lastChecked}`);
+              console.log('');
+            }
+          }
           return;
         }
 
-        const status = watcher.getStatus();
-        const address = getWalletAddress();
+        // CLI context: do a one-shot poll to show current state
+        console.log('x402 Watcher Status (live query)');
+        console.log('================================\n');
+        console.log(`Wallet: ${address}`);
 
-        console.log('x402 Payment Watcher Status');
-        console.log('===========================\n');
-        console.log(`Running:           ${status.running ? 'Yes' : 'No'}`);
-        console.log(`Poll interval:     ${status.pollIntervalMs / 1000}s`);
-        console.log(`Payments detected: ${status.paymentsDetected}`);
-        console.log(`Last poll:         ${status.lastPollAt ?? 'Never'}`);
-        console.log(`Wallet address:    ${address}`);
-
-        if (status.trackedRouters.length === 0) {
-          console.log('\nNo routers tracked yet.');
-        } else {
-          console.log(`\nTracked Routers (${status.trackedRouters.length}):`);
-          for (const r of status.trackedRouters) {
-            console.log(`  ${r.name}`);
-            console.log(`    Address: ${r.address}`);
-            console.log(`    Balance: ${r.balance} USDC`);
-            console.log(`    Checked: ${r.lastChecked}`);
-            console.log('');
-          }
+        const { getConfig, getUsdcAddress } = await import('../core/config.js');
+        const { getClient } = await import('../core/client.js');
+        const { formatUnits } = await import('viem');
+
+        const config = getConfig();
+
+        // Fetch routers from API
+        const apiUrl = `${config.x402LinksApiUrl}/api/links/beneficiary/${address}`;
+        const response = await fetch(apiUrl);
+        const data = await response.json() as {
+          success: boolean;
+          links?: Array<{
+            router_address: string;
+            metadata?: { name?: string };
+          }>;
+        };
+
+        if (!data.success || !data.links || data.links.length === 0) {
+          console.log('No routers found for this wallet.');
+          return;
+        }
+
+        console.log(`Found ${data.links.length} router(s):\n`);
+
+        const client = getClient();
+        const usdcAddress = getUsdcAddress(config.chainId);
+
+        const ERC20_ABI = [{
+          name: 'balanceOf' as const,
+          type: 'function' as const,
+          stateMutability: 'view' as const,
+          inputs: [{ name: 'account', type: 'address' }],
+          outputs: [{ name: '', type: 'uint256' }],
+        }] as const;
+
+        for (const link of data.links) {
+          const name = link.metadata?.name ?? 'Unnamed';
+          let balance = '?';
+          try {
+            const bal = await client.publicClient.readContract({
+              address: usdcAddress,
+              abi: ERC20_ABI,
+              functionName: 'balanceOf',
+              args: [link.router_address as `0x${string}`],
+            });
+            balance = `${formatUnits(bal, 6)} USDC`;
+          } catch { /* */ }
+
+          console.log(`  ${name}`);
+          console.log(`    Router:  ${link.router_address}`);
+          console.log(`    Balance: ${balance}`);
+          console.log('');
+        }
+
+        if (watcher && !watcher.getStatus().running) {
+          console.log('Note: The background watcher is registered but not running.');
+          console.log('It starts automatically with the gateway. Use "openclaw x402 watch" for foreground mode.');
         }
       });
   }, { commands: ['x402'] });

package/scripts/plugin/watcher.ts

@@ -49,12 +49,12 @@ export class PaymentWatcher implements PluginService {
   async start(): Promise<void> {
     this.logger.info(`Starting payment watcher (poll every ${this.pollIntervalMs / 1000}s)`);
 
-    // Initial poll to seed state
+    // Set timer first so the watcher is "running" even if initial poll fails
+    this.timer = setInterval(() => this.poll(), this.pollIntervalMs);
+
+    // Initial poll to seed state (errors are caught inside poll())
     await this.poll();
     this.seeded = true;
-
-    // Start periodic polling
-    this.timer = setInterval(() => this.poll(), this.pollIntervalMs);
   }
 
   async stop(): Promise<void> {
@@ -72,7 +72,7 @@ export class PaymentWatcher implements PluginService {
         address: r.address,
         name: r.name,
         balance: formatUnitsLocal(r.lastBalance, 6),
-        lastChecked: new Date(r.lastChecked).toISOString(),
+        lastChecked: r.lastChecked ? new Date(r.lastChecked).toISOString() : 'never',
       });
     }
 
@@ -109,6 +109,8 @@ export class PaymentWatcher implements PluginService {
     const address = getWalletAddress();
     const apiUrl = `${config.x402LinksApiUrl}/api/links/beneficiary/${address}`;
 
+    this.logger.debug(`Fetching routers for ${address} from ${apiUrl}`);
+
     const response = await fetch(apiUrl);
     if (!response.ok) {
       this.logger.warn(`Failed to fetch routers: ${response.status}`);
@@ -123,7 +125,10 @@ export class PaymentWatcher implements PluginService {
       }>;
     };
 
-    if (!data.success || !data.links) return;
+    if (!data.success || !data.links) {
+      this.logger.debug(`Router API returned success=${data.success}, links=${data.links?.length ?? 0}`);
+      return;
+    }
 
     // Add any new routers we haven't seen yet
     for (const link of data.links) {
@@ -138,6 +143,8 @@ export class PaymentWatcher implements PluginService {
         this.logger.info(`Tracking router: ${link.metadata?.name ?? 'Unnamed'} (${link.router_address})`);
       }
     }
+
+    this.logger.debug(`Tracking ${this.trackedRouters.size} router(s)`);
   }
 
   private async checkBalances(): Promise<void> {
@@ -150,7 +157,7 @@ export class PaymentWatcher implements PluginService {
     const client = getClient();
     const usdcAddress = getUsdcAddress(config.chainId);
 
-    for (const [key, router] of this.trackedRouters) {
+    for (const [, router] of this.trackedRouters) {
       try {
         const balance = await client.publicClient.readContract({
           address: usdcAddress,