@obol/cli 0.2.1 → 0.3.0

package/bin/obol.js

@@ -54,7 +54,7 @@ async function main() {
           console.log(`\n  ${pc.green('Token refreshed!')} Expires: ${pc.dim(new Date(data.expires_at * 1000).toLocaleDateString())}`);
         }
       } catch {
-        // Refresh failed — show existing token anyway
+        console.log(`\n  ${pc.yellow('Could not refresh token — showing current token (it may be expired).')}`);
       }
       console.log(`\n  ${pc.bold('Your Agent Token')}`);
       console.log(`  ${pc.dim('Agent:')} ${pc.green(env.OBOL_AGENT_ID || '(unknown)')}`);
@@ -133,7 +133,7 @@ async function main() {
           console.log(`  Signup bonuses: ${pc.green('$' + data.total_signup_bonuses_earned_usdc.toFixed(2))}`);
           console.log(`  Total earned:   ${pc.green(pc.bold('$' + data.total_earned_usdc.toFixed(2)))}`);
           if (data.own_bonus_status === 'pending') {
-            console.log(`\n  ${pc.yellow('Your signup bonus is pending — make your first API call to unlock it!')}`);
+            console.log(`\n  ${pc.yellow('Your signup bonus is pending — make your first paid execution or buy credits to unlock it!')}`);
           }
           console.log();
         } catch (err) {
@@ -175,8 +175,10 @@ async function main() {
         const balStr = '$' + (bal.balance_usdc || 0).toFixed(2);
         const color = bal.balance_usdc > 0 ? pc.green : pc.yellow;
         console.log(`  ${color(bal.balance_usdc > 0 ? '✓' : '!')} Balance        ${color(balStr)} USDC`);
-        if (bal.balance_usdc === 0) {
+        if (bal.balance_usdc === 0 && (env.OBOL_PAYMENT_MODE || '').toLowerCase() !== 'x402') {
           console.log(`\n  ${pc.yellow('Buy credits to start executing:')} ${pc.green('npx @obol/cli credits buy')}`);
+        } else if ((env.OBOL_PAYMENT_MODE || '').toLowerCase() === 'x402') {
+          console.log(`\n  ${pc.green('Automatic agent payments are enabled via x402.')}`);
         }
       } catch {
         console.log(`  ${pc.dim('-')} Balance        ${pc.dim('could not fetch')}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@obol/cli",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "CLI for the Obol Agent Execution Gateway",
   "type": "module",
   "bin": {

package/src/api.js

@@ -45,10 +45,11 @@ export async function checkHealth(gatewayUrl) {
   return request(`${gatewayUrl}/healthz`);
 }
 
-export async function signup(gatewayUrl, agentId, services, referralCode) {
+export async function signup(gatewayUrl, agentId, services, referralCode, setupKey) {
   const body = { agent_id: agentId };
   if (services && services.length > 0) body.services = services;
   if (referralCode) body.referral_code = referralCode;
+  if (setupKey) body.setup_key = setupKey;
   return request(`${gatewayUrl}/v1/signup`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
@@ -119,11 +120,13 @@ export async function createCheckout(gatewayUrl, jwt, amountUsd) {
   });
 }
 
-export async function createWebCheckout(gatewayUrl, agentId, amountUsd) {
+export async function createWebCheckout(gatewayUrl, agentId, amountUsd, setupKey) {
+  const body = { agent_id: agentId, amount_usdc: amountUsd };
+  if (setupKey) body.setup_key = setupKey;
   return request(`${gatewayUrl}/v1/credits/web-checkout`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ agent_id: agentId, amount_usdc: amountUsd }),
+    body: JSON.stringify(body),
   });
 }
 

package/src/config.js

@@ -11,6 +11,9 @@ const OBOL_KEYS = [
   'OBOL_GATEWAY_URL',
   'OBOL_AGENT_ID',
   'OBOL_JWT_TOKEN',
+  'OBOL_SETUP_KEY',
+  'OBOL_PAYMENT_MODE',
+  'OBOL_X402_PRIVATE_KEY',
   'OBOL_WALLET_ADDRESS',
 ];
 
@@ -29,6 +32,10 @@ export function loadEnv(path) {
     // Strip quotes
     if ((val.startsWith('"') && val.endsWith('"')) || (val.startsWith("'") && val.endsWith("'"))) {
       val = val.slice(1, -1);
+    } else {
+      // Strip inline comments for unquoted values
+      const hashIdx = val.indexOf(' #');
+      if (hashIdx !== -1) val = val.slice(0, hashIdx).trim();
     }
     env[key] = val;
   }

package/src/credits.js

@@ -1,17 +1,17 @@
 import * as p from '@clack/prompts';
 import pc from 'picocolors';
-import { getTiers, createWebCheckout } from './api.js';
+import { createCheckout, getTiers } from './api.js';
 import { loadEnv } from './config.js';
 
 export async function runCreditsBuy() {
   const env = loadEnv();
 
-  if (!env.OBOL_GATEWAY_URL || !env.OBOL_AGENT_ID) {
+  if (!env.OBOL_GATEWAY_URL || !env.OBOL_AGENT_ID || !env.OBOL_JWT_TOKEN) {
     console.log();
     p.log.warn('No agent configured yet.');
     p.log.info(`Run ${pc.green('npx @obol/cli setup')} first.`);
     console.log();
-    return;
+    process.exit(1);
   }
 
   const url = env.OBOL_GATEWAY_URL;
@@ -51,7 +51,7 @@ export async function runCreditsBuy() {
   // Create checkout session (returns a Stripe checkout URL)
   s.start('Creating Stripe checkout...');
   try {
-    const result = await createWebCheckout(url, env.OBOL_AGENT_ID, tier.price_usd);
+    const result = await createCheckout(url, env.OBOL_JWT_TOKEN, tier.price_usd);
     s.stop(pc.green('Checkout ready!'));
 
     console.log();

package/src/setup.js

@@ -1,13 +1,14 @@
 import { execSync } from 'node:child_process';
-import { existsSync, writeFileSync } from 'node:fs';
+import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { resolve } from 'node:path';
 import * as p from '@clack/prompts';
 import pc from 'picocolors';
-import { checkHealth, signup, storeBYOK, validateReferralCode, listEndpoints } from './api.js';
-import { saveEnv } from './config.js';
+import { checkHealth, listConnections, listEndpoints, signup, storeBYOK, validateReferralCode } from './api.js';
+import { loadEnv, saveEnv } from './config.js';
 
 const cheers = ['Nice!', 'Boom!', "Let's go.", 'Easy.', 'Done.'];
 const cheer = () => cheers[Math.floor(Math.random() * cheers.length)];
+const PYTHON_SDK_INSTALL_CMD = 'python3 -m pip install "git+https://github.com/kineticSum/obol-gateway.git#subdirectory=sdk/python"';
 
 export async function runSetup() {
   console.log();
@@ -16,6 +17,7 @@ export async function runSetup() {
   p.log.info("Let's connect your agent to Obol. Takes about 60 seconds.");
 
   const url = 'https://www.obolagents.com';
+  const existingEnv = loadEnv();
 
   // Verify connectivity
   const healthSpin = p.spinner();
@@ -63,7 +65,7 @@ export async function runSetup() {
     valSpin.start('Checking referral code...');
     try {
       const validation = await validateReferralCode(url, referralCode.trim());
-      valSpin.stop(pc.green(`Referral code valid! You'll get $${validation.signup_bonus_usdc} in credits after your first API call.`));
+      valSpin.stop(pc.green(`Referral code valid! You'll get $${validation.signup_bonus_usdc} in credits after your first paid execution or Stripe purchase.`));
     } catch (err) {
       valSpin.stop(pc.yellow('That referral code isn\'t valid — continuing without it.'));
       referralCode = undefined;
@@ -122,11 +124,87 @@ export async function runSetup() {
     }
   }
 
+  // --- Project Language ---
+  let lang = detectProject();
+  if (!lang) {
+    lang = await p.select({
+      message: 'What language is your agent built in?',
+      options: [
+        { value: 'js', label: 'JavaScript / TypeScript' },
+        { value: 'python', label: 'Python' },
+      ],
+    });
+    if (p.isCancel(lang)) return cancelled();
+  }
+
+  // --- Payment Mode ---
+  let paymentMode = existingEnv.OBOL_PAYMENT_MODE || 'credits';
+  let x402PrivateKey = existingEnv.OBOL_X402_PRIVATE_KEY || '';
+  let walletAddress = existingEnv.OBOL_WALLET_ADDRESS || '';
+
+  if (lang === 'js') {
+    paymentMode = await p.select({
+      message: 'How should your agent pay for Obol calls?',
+      options: [
+        {
+          value: 'x402',
+          label: 'Automatic USDC payments (recommended)',
+          hint: 'Best for autonomous agents with a Base wallet',
+        },
+        {
+          value: 'credits',
+          label: 'Credits via Stripe',
+          hint: 'Buy a balance with a credit card and spend from it',
+        },
+      ],
+      initialValue: x402PrivateKey ? 'x402' : paymentMode,
+    });
+    if (p.isCancel(paymentMode)) return cancelled();
+
+    if (paymentMode === 'x402') {
+      p.log.info('Agent payments use a Base wallet with USDC. Your agent pays per call automatically.');
+      const privateKey = await p.password({
+        message: 'Paste your agent wallet private key',
+        validate: (val) => {
+          const trimmed = (val || '').trim();
+          if (!trimmed) return 'A private key is required to enable automatic agent payments.';
+          if (!/^0x[a-fA-F0-9]{64}$/.test(trimmed)) {
+            return 'Use a 0x-prefixed 32-byte private key.';
+          }
+        },
+      });
+      if (p.isCancel(privateKey)) return cancelled();
+      x402PrivateKey = privateKey.trim();
+
+      const publicAddress = await p.text({
+        message: `Optional: enter the wallet's public address ${pc.dim('(shown in status output)')}`,
+        placeholder: existingEnv.OBOL_WALLET_ADDRESS || '0x...',
+        validate: (val) => {
+          const trimmed = (val || '').trim();
+          if (!trimmed) return;
+          if (!/^0x[a-fA-F0-9]{40}$/.test(trimmed)) {
+            return 'Use a valid 0x-prefixed EVM address, or leave blank.';
+          }
+        },
+      });
+      if (p.isCancel(publicAddress)) return cancelled();
+      walletAddress = (publicAddress || '').trim();
+    } else {
+      x402PrivateKey = '';
+      walletAddress = '';
+    }
+  } else {
+    paymentMode = 'credits';
+    x402PrivateKey = '';
+    walletAddress = '';
+    p.log.info('Python onboarding uses credits by default today. Automatic x402 agent payments are available in the JavaScript SDK.');
+  }
+
   // --- Confirm ---
   const keyCount = Object.keys(apiKeys).length;
   const confirmMsg = keyCount
-    ? `Create Obol account ${pc.bold(pc.green(agentId))} with ${services.length} service${services.length > 1 ? 's' : ''} and ${keyCount} API key${keyCount > 1 ? 's' : ''}?`
-    : `Create Obol account ${pc.bold(pc.green(agentId))} with ${services.length} service${services.length > 1 ? 's' : ''}?`;
+    ? `Create Obol account ${pc.bold(pc.green(agentId))} with ${services.length} service${services.length > 1 ? 's' : ''}, ${keyCount} API key${keyCount > 1 ? 's' : ''}, and ${paymentMode === 'x402' ? 'automatic agent payments' : 'credits'}?`
+    : `Create Obol account ${pc.bold(pc.green(agentId))} with ${services.length} service${services.length > 1 ? 's' : ''} and ${paymentMode === 'x402' ? 'automatic agent payments' : 'credits'}?`;
   const confirmed = await p.confirm({ message: confirmMsg });
   if (p.isCancel(confirmed) || !confirmed) return cancelled();
 
@@ -137,20 +215,29 @@ export async function runSetup() {
   // 1. Sign up
   s.start('Creating your account...');
   let jwt;
-  let expiresAt;
+  let setupKey = existingEnv.OBOL_AGENT_ID === agentId ? existingEnv.OBOL_SETUP_KEY || '' : '';
   try {
-    const result = await signup(url, agentId, services, referralCode?.trim() || undefined);
+    const result = await signup(url, agentId, services, referralCode?.trim() || undefined, setupKey);
     jwt = result.token;
-    expiresAt = new Date(result.expires_at * 1000);
+    setupKey = result.setup_key || setupKey;
 
-    if (result.referral) {
-      s.stop(pc.green(`Account "${agentId}" created with referral! $${result.referral.signup_bonus_referee} bonus unlocks after your first API call `) + cheer());
+    if (result.status === 'existing') {
+      s.stop(pc.green(`Recovered account "${agentId}". `) + cheer());
+    } else if (result.referral) {
+      s.stop(pc.green(`Account "${agentId}" created with referral! $${result.referral.signup_bonus_referee} bonus unlocks after your first paid execution or Stripe purchase. `) + cheer());
     } else {
       s.stop(pc.green(`Account "${agentId}" created! `) + cheer());
     }
   } catch (err) {
     if (err.status === 409) {
-      s.stop(pc.red(`That account name was revoked — try a different name.`));
+      if (typeof err.message === 'string' && err.message.includes('ACCOUNT_EXISTS')) {
+        s.stop(pc.red(`That account name is already taken.`));
+        p.log.info('Reuse the original project folder so setup can read your saved setup key, or choose a different account name.');
+      } else {
+        s.stop(pc.red(`That account name was revoked — try a different name.`));
+      }
+    } else if (err.status === 403 && typeof err.message === 'string' && err.message.includes('SETUP_KEY_INVALID')) {
+      s.stop(pc.red('Your saved setup key does not match that account name.'));
     } else {
       s.stop(pc.red(`Couldn't create account: ${err.message}`));
     }
@@ -173,30 +260,46 @@ export async function runSetup() {
 
   // 3. Save config
   s.start('Saving configuration...');
-  const vars = {
-    OBOL_GATEWAY_URL: url,
-    OBOL_AGENT_ID: agentId,
-    OBOL_JWT_TOKEN: jwt,
-  };
-  const envPath = saveEnv(vars);
-  s.stop(pc.green(`Saved to ${envPath}`));
+  let envPath;
+  try {
+    const vars = {
+      OBOL_GATEWAY_URL: url,
+      OBOL_AGENT_ID: agentId,
+      OBOL_JWT_TOKEN: jwt,
+      OBOL_SETUP_KEY: setupKey,
+      OBOL_PAYMENT_MODE: paymentMode,
+      OBOL_X402_PRIVATE_KEY: paymentMode === 'x402' ? x402PrivateKey : '',
+      OBOL_WALLET_ADDRESS: walletAddress || '',
+    };
+    envPath = saveEnv(vars);
+    s.stop(pc.green(`Saved to ${envPath}`));
+  } catch (err) {
+    s.stop(pc.red(`Could not save .env: ${err.message}`));
+    p.log.error('Your token (save this manually):');
+    console.log(`  OBOL_JWT_TOKEN=${jwt}`);
+    p.outro(pc.dim('Fix the file permissions and try again.'));
+    process.exit(1);
+  }
+
+  // Add .env to .gitignore if not already there
+  try {
+    const gitignorePath = resolve(process.cwd(), '.gitignore');
+    if (existsSync(gitignorePath)) {
+      const content = readFileSync(gitignorePath, 'utf-8');
+      if (!content.split('\n').some(l => l.trim() === '.env')) {
+        writeFileSync(gitignorePath, content.trimEnd() + '\n.env\n');
+      }
+    } else if (existsSync(resolve(process.cwd(), '.git'))) {
+      writeFileSync(gitignorePath, '.env\n');
+    }
+  } catch {
+    // Non-critical — don't fail setup
+  }
 
   // 4. Detect project type and install SDK
-  let lang = detectProject();
   let sdkInstalled = false;
   let integrationFile = null;
 
-  if (!lang) {
-    lang = await p.select({
-      message: 'What language is your agent built in?',
-      options: [
-        { value: 'js', label: 'JavaScript / TypeScript' },
-        { value: 'python', label: 'Python' },
-      ],
-    });
-    if (p.isCancel(lang)) return cancelled();
-  }
-
   const hasPackageJson = existsSync(resolve(process.cwd(), 'package.json'));
 
   if (lang === 'js') {
@@ -217,37 +320,46 @@ export async function runSetup() {
     const obolFile = resolve(process.cwd(), 'obol.js');
     if (!existsSync(obolFile)) {
       s.start('Generating integration file...');
-      writeFileSync(obolFile, jsIntegrationFile(agentId, services));
+      writeFileSync(obolFile, jsIntegrationFile(agentId, services, paymentMode));
       s.stop(pc.green('Created obol.js'));
       integrationFile = 'obol.js';
     }
   } else if (lang === 'python') {
-    s.start('Installing obol-sdk...');
+    s.start('Installing the Obol Python SDK from GitHub...');
     try {
-      execSync('pip install obol-sdk', { stdio: 'pipe', timeout: 60000 });
+      execSync(PYTHON_SDK_INSTALL_CMD, { stdio: 'pipe', timeout: 60000 });
       s.stop(pc.green('SDK installed! ') + cheer());
       sdkInstalled = true;
     } catch {
-      s.stop(pc.yellow('Could not auto-install SDK. Run manually: pip install obol-sdk'));
+      s.stop(pc.yellow(`Could not auto-install SDK. Run manually: ${PYTHON_SDK_INSTALL_CMD}`));
     }
 
     // Generate integration file
     const obolFile = resolve(process.cwd(), 'obol_setup.py');
     if (!existsSync(obolFile)) {
       s.start('Generating integration file...');
-      writeFileSync(obolFile, pyIntegrationFile(agentId, services));
+      writeFileSync(obolFile, pyIntegrationFile(agentId, services, paymentMode));
       s.stop(pc.green('Created obol_setup.py'));
       integrationFile = 'obol_setup.py';
     }
   }
 
   // 5. Test connectivity
-  s.start('Testing connection...');
+  s.start('Testing your Obol connection...');
   try {
-    const epData = await listEndpoints(url, jwt);
+    const [epData, connData] = await Promise.all([
+      listEndpoints(url, jwt),
+      listConnections(url, jwt),
+    ]);
     const eps = epData.endpoints || [];
-    const names = eps.map(e => e.provider || e.name).filter(Boolean);
-    s.stop(pc.green(`Connected! ${eps.length} endpoints available`) + (names.length ? ` (${names.join(', ')})` : ''));
+    const conns = connData.connections || connData || [];
+    const connNames = conns.map(c => c.provider).filter(Boolean);
+    const endpointCount = `${eps.length} endpoint${eps.length === 1 ? '' : 's'}`;
+    if (connNames.length > 0) {
+      s.stop(pc.green(`Connected! ${endpointCount} available, ${connNames.length} service${connNames.length === 1 ? '' : 's'} linked`) + ` (${connNames.join(', ')})`);
+    } else {
+      s.stop(pc.yellow(`Connected to Obol, but no services are linked yet. ${endpointCount} are available once you connect keys.`));
+    }
   } catch {
     s.stop(pc.yellow('Could not verify connection — run obol test later to check'));
   }
@@ -258,33 +370,46 @@ export async function runSetup() {
   console.log();
 
   if (sdkInstalled) {
-    console.log(`  ${pc.dim('SDK installed:')}     ${pc.green(lang === 'js' ? '@obol/sdk' : 'obol-sdk')}`);
+    console.log(`  ${pc.dim('SDK installed:')}     ${pc.green(lang === 'js' ? '@obol/sdk' : 'GitHub Python SDK')}`);
   }
   if (integrationFile) {
     console.log(`  ${pc.dim('Integration file:')} ${pc.green('./' + integrationFile)}`);
   }
   console.log(`  ${pc.dim('Config saved:')}     ${pc.green(envPath)}`);
-  console.log();
-
-  // Prominent $0 balance warning
-  p.log.warn(pc.bold(pc.yellow('Your balance is $0.00 — you need credits before your agent can execute.')));
+  console.log(`  ${pc.dim('Payment mode:')}     ${pc.green(paymentMode === 'x402' ? 'Automatic USDC (x402)' : 'Credits via Stripe')}`);
+  if (paymentMode === 'x402') {
+    if (walletAddress) {
+      console.log(`  ${pc.dim('Wallet:')}           ${pc.green(walletAddress)}`);
+    } else {
+      console.log(`  ${pc.dim('Wallet:')}           ${pc.green('Private key saved for automatic payments')}`);
+    }
+  }
   console.log();
 
   console.log(`  ${pc.bold('Next steps:')}`);
-  console.log(`    ${pc.dim('1.')} ${pc.bold('Buy credits')} ${pc.dim('(required)')}: ${pc.green('npx @obol/cli credits buy')}`);
-  console.log(`       ${pc.dim('or visit:')} ${pc.cyan('obolagents.com/dashboard')}`);
+  if (paymentMode === 'x402') {
+    console.log(`    ${pc.dim('1.')} ${pc.bold('Fund your agent wallet')}: keep Base ETH for gas and USDC for Obol calls.`);
+    console.log(`    ${pc.dim('2.')} ${pc.bold('Run your agent')}: each Obol call pays automatically via x402.`);
+  } else {
+    p.log.warn(pc.bold(pc.yellow('Your balance is $0.00 — buy credits before your agent can execute.')));
+    console.log();
+    console.log(`    ${pc.dim('1.')} ${pc.bold('Buy credits')} ${pc.dim('(required)')}: ${pc.green('npx @obol/cli credits buy')}`);
+    console.log(`       ${pc.dim('or visit:')} ${pc.cyan('obolagents.com/dashboard')}`);
+    console.log(`    ${pc.dim('2.')} ${pc.bold('Run your agent')}: Obol will draw from your credit balance automatically.`);
+  }
   if (lang === 'js' && integrationFile) {
-    console.log(`    ${pc.dim('2.')} Use in your code:`);
+    console.log(`    ${pc.dim('3.')} Use in your code:`);
     console.log(`         ${pc.cyan("import { obol } from './obol.js';")}`);
     console.log(`         ${pc.cyan("const result = await obol.execute(2, 'Create issue ...');")}`);
   } else if (lang === 'python' && integrationFile) {
-    console.log(`    ${pc.dim('2.')} Use in your code:`);
+    console.log(`    ${pc.dim('3.')} Use in your code:`);
     console.log(`         ${pc.cyan("from obol_setup import obol")}`);
     console.log(`         ${pc.cyan("result = obol.execute(2, 'Create issue ...', idempotency_key='...')")}`);
   }
   console.log();
   console.log(`  ${pc.dim('Dashboard:')}  ${pc.green('npx @obol/cli token')} → paste at ${pc.cyan('obolagents.com/dashboard')}`);
   console.log(`  ${pc.dim('Token:')}      Refreshes automatically — run ${pc.green('npx @obol/cli test')} anytime to verify.`);
+  console.log(`  ${pc.dim('Setup key:')}  Saved in ${pc.green('.env')} so you can safely reconnect this account later.`);
   console.log();
 
   p.log.info(`${pc.bold('Earn credits by referring other agents!')} Run ${pc.green('npx @obol/cli referral code')} to get started.`);
@@ -301,7 +426,7 @@ function detectProject() {
   return null;
 }
 
-function jsIntegrationFile(agentId, services) {
+function jsIntegrationFile(agentId, services, paymentMode) {
   const providerMap = { stripe: 1, github: 2, slack: 3, notion: 4, discord: 5, twitter: 6, agentmail: 7 };
   const examples = services
     .map(svc => {
@@ -321,9 +446,12 @@ function jsIntegrationFile(agentId, services) {
 
   return `import { ObolClient } from '@obol/sdk';
 
-// Pre-configured Obol client — reads OBOL_JWT_TOKEN from .env automatically
+// Pre-configured Obol client — reads your Obol settings from .env automatically
 export const obol = new ObolClient();
 
+// Payment mode: ${paymentMode === 'x402' ? 'automatic x402 USDC payments' : 'credits via Stripe'}
+// If OBOL_PAYMENT_MODE=x402 and OBOL_X402_PRIVATE_KEY is set, execute() pays automatically per call.
+
 // Provider IDs: 1=Stripe, 2=GitHub, 3=Slack, 4=Notion, 5=Discord, 6=Twitter, 7=AgentMail
 //
 // Usage:
@@ -332,7 +460,7 @@ ${examples}
 `;
 }
 
-function pyIntegrationFile(agentId, services) {
+function pyIntegrationFile(agentId, services, paymentMode) {
   const providerMap = { stripe: 1, github: 2, slack: 3, notion: 4, discord: 5, twitter: 6, agentmail: 7 };
   const examples = services
     .map(svc => {
@@ -353,6 +481,8 @@ function pyIntegrationFile(agentId, services) {
   return `import os
 from obol_sdk import ObolClient
 
+# Install: ${PYTHON_SDK_INSTALL_CMD}
+#
 # Pre-configured Obol client — reads from environment variables
 obol = ObolClient(
     gateway_url=os.getenv("OBOL_GATEWAY_URL", "https://www.obolagents.com"),
@@ -360,6 +490,8 @@ obol = ObolClient(
     jwt_token=os.getenv("OBOL_JWT_TOKEN", ""),
 )
 
+# Payment mode: ${paymentMode === 'x402' ? 'use credits by default in Python today unless you provide x402 headers separately' : 'credits via Stripe'}
+
 # Provider IDs: 1=Stripe, 2=GitHub, 3=Slack, 4=Notion, 5=Discord, 6=Twitter, 7=AgentMail
 #
 # Usage:

package/src/status.js

@@ -58,12 +58,18 @@ export async function runStatus() {
     }
   }
 
-  // Wallet
-  if (env.OBOL_WALLET_ADDRESS) {
-    const addr = env.OBOL_WALLET_ADDRESS;
-    p.log.info(`${pc.bold('Wallet:')} ${pc.cyan(addr.slice(0, 6) + '...' + addr.slice(-4))} ${pc.dim('(USDC micropayments)')}`);
+  // Payment mode / wallet
+  if ((env.OBOL_PAYMENT_MODE || '').toLowerCase() === 'x402') {
+    if (env.OBOL_WALLET_ADDRESS) {
+      const addr = env.OBOL_WALLET_ADDRESS;
+      p.log.info(`${pc.bold('Payments:')} ${pc.green('Automatic USDC (x402)')} via ${pc.cyan(addr.slice(0, 6) + '...' + addr.slice(-4))}`);
+    } else if (env.OBOL_X402_PRIVATE_KEY) {
+      p.log.info(`${pc.bold('Payments:')} ${pc.green('Automatic USDC (x402)')} ${pc.dim('(wallet private key configured)')}`);
+    } else {
+      p.log.info(`${pc.bold('Payments:')} ${pc.yellow('x402 selected, but wallet key is missing')}`);
+    }
   } else {
-    p.log.info(`${pc.bold('Wallet:')} ${pc.dim('Not configured')} — add one during setup for automatic micropayments`);
+    p.log.info(`${pc.bold('Payments:')} ${pc.dim('Credits via Stripe')} — rerun setup to enable automatic x402 agent payments`);
   }
 
   p.log.info(`${pc.bold('Gateway:')} ${pc.dim(url)}`);