@obol/cli 0.1.3 → 0.2.1

package/bin/obol.js

@@ -4,7 +4,7 @@ import { runSetup } from '../src/setup.js';
 import { runStatus } from '../src/status.js';
 import { runConnect } from '../src/connect.js';
 import { runCreditsBuy } from '../src/credits.js';
-import { getBalance, getTiers, createReferralCode, getReferralStats } from '../src/api.js';
+import { getBalance, getTiers, createReferralCode, getReferralStats, listEndpoints, listConnections, refreshToken } from '../src/api.js';
 import { loadEnv } from '../src/config.js';
 import pc from 'picocolors';
 
@@ -41,10 +41,25 @@ async function main() {
         console.log(pc.red('\n  No agent configured yet. Run: npx @obol/cli setup\n'));
         process.exit(1);
       }
+      // Try to refresh the token (in case it's expired)
+      let token = env.OBOL_JWT_TOKEN;
+      const gwUrl = env.OBOL_GATEWAY_URL || 'https://www.obolagents.com';
+      try {
+        const data = await refreshToken(gwUrl, token);
+        if (data.token) {
+          token = data.token;
+          // Save refreshed token to .env
+          const { saveEnv } = await import('../src/config.js');
+          saveEnv({ OBOL_GATEWAY_URL: gwUrl, OBOL_AGENT_ID: env.OBOL_AGENT_ID, OBOL_JWT_TOKEN: token });
+          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.bold('Your Agent Token')}`);
       console.log(`  ${pc.dim('Agent:')} ${pc.green(env.OBOL_AGENT_ID || '(unknown)')}`);
       console.log(`\n  ${pc.dim('Copy this token and paste it into the dashboard at obolagents.com/dashboard')}`);
-      console.log(`\n  ${pc.cyan(env.OBOL_JWT_TOKEN)}\n`);
+      console.log(`\n  ${pc.cyan(token)}\n`);
       break;
     }
 
@@ -133,15 +148,68 @@ async function main() {
       break;
     }
 
+    case 'test': {
+      const env = loadEnv();
+      if (!env.OBOL_GATEWAY_URL || !env.OBOL_JWT_TOKEN) {
+        console.log(pc.red('\n  No account configured. Run: npx @obol/cli setup\n'));
+        process.exit(1);
+      }
+      console.log(`\n  ${pc.bold('Obol Connection Test')}\n`);
+
+      // Test gateway connectivity + endpoints
+      try {
+        const epData = await listEndpoints(env.OBOL_GATEWAY_URL, env.OBOL_JWT_TOKEN);
+        const eps = epData.endpoints || [];
+        const names = eps.map(e => e.provider || e.name).filter(Boolean);
+        console.log(`  ${pc.green('✓')} Connection     Connected to Obol Gateway`);
+        console.log(`  ${pc.green('✓')} Account        ${pc.bold(env.OBOL_AGENT_ID || '(unknown)')}`);
+        console.log(`  ${pc.green('✓')} Endpoints      ${eps.length} available${names.length ? ` (${names.join(', ')})` : ''}`);
+      } catch (err) {
+        console.log(`  ${pc.red('✗')} Connection     ${err.message}`);
+        process.exit(1);
+      }
+
+      // Check balance
+      try {
+        const bal = await getBalance(env.OBOL_GATEWAY_URL, env.OBOL_JWT_TOKEN);
+        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) {
+          console.log(`\n  ${pc.yellow('Buy credits to start executing:')} ${pc.green('npx @obol/cli credits buy')}`);
+        }
+      } catch {
+        console.log(`  ${pc.dim('-')} Balance        ${pc.dim('could not fetch')}`);
+      }
+
+      // Check connections
+      try {
+        const connData = await listConnections(env.OBOL_GATEWAY_URL, env.OBOL_JWT_TOKEN);
+        const conns = connData.connections || connData || [];
+        if (Array.isArray(conns) && conns.length > 0) {
+          const connNames = conns.map(c => c.provider).filter(Boolean);
+          console.log(`  ${pc.green('✓')} Connections    ${conns.length} active${connNames.length ? ` (${connNames.join(', ')})` : ''}`);
+        } else {
+          console.log(`  ${pc.dim('-')} Connections    none yet`);
+        }
+      } catch {
+        console.log(`  ${pc.dim('-')} Connections    ${pc.dim('could not fetch')}`);
+      }
+
+      console.log();
+      break;
+    }
+
     case 'help':
     case '--help':
     case '-h':
     case undefined:
       console.log(`
-  ${pc.bold(pc.green('obol'))} — CLI for the Obol Agent Execution Gateway
+  ${pc.bold(pc.green('obol'))} — Connect your agent to the Obol Execution Gateway
 
   ${pc.bold('Commands:')}
-    ${pc.green('setup')}              Create a new agent (interactive wizard)
+    ${pc.green('setup')}              Connect your agent to Obol (interactive wizard)
+    ${pc.green('test')}               Verify your Obol connection is working
     ${pc.green('status')}             Check agent health, balance & connections
     ${pc.green('token')}              Show your JWT token (for the dashboard)
     ${pc.green('connect')} ${pc.dim('<provider>')}  Add a service API key (github, slack, etc.)

package/package.json

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

package/src/api.js

@@ -146,8 +146,19 @@ export async function validateReferralCode(gatewayUrl, code) {
   });
 }
 
+export async function listEndpoints(gatewayUrl, jwt) {
+  return request(`${gatewayUrl}/v1/endpoints`, { headers: jwtHeaders(jwt) });
+}
+
 export async function getAgentInfo(gatewayUrl, adminKey, agentId) {
   return request(`${gatewayUrl}/v1/agents/${agentId}`, {
     headers: adminHeaders(adminKey),
   });
 }
+
+export async function refreshToken(gatewayUrl, jwt) {
+  return request(`${gatewayUrl}/v1/token/refresh`, {
+    method: 'POST',
+    headers: jwtHeaders(jwt),
+  });
+}

package/src/setup.js

@@ -1,6 +1,9 @@
+import { execSync } from 'node:child_process';
+import { existsSync, writeFileSync } from 'node:fs';
+import { resolve } from 'node:path';
 import * as p from '@clack/prompts';
 import pc from 'picocolors';
-import { checkHealth, signup, storeBYOK, validateReferralCode } from './api.js';
+import { checkHealth, signup, storeBYOK, validateReferralCode, listEndpoints } from './api.js';
 import { saveEnv } from './config.js';
 
 const cheers = ['Nice!', 'Boom!', "Let's go.", 'Easy.', 'Done.'];
@@ -10,7 +13,7 @@ export async function runSetup() {
   console.log();
   p.intro(pc.bgGreen(pc.black(' Welcome to Obol! ')));
 
-  p.log.info("Let's get your agent connected. Takes about 30 seconds.");
+  p.log.info("Let's connect your agent to Obol. Takes about 60 seconds.");
 
   const url = 'https://www.obolagents.com';
 
@@ -28,12 +31,12 @@ export async function runSetup() {
     process.exit(1);
   }
 
-  // --- Agent Name ---
+  // --- Account Name ---
   const agentId = await p.text({
-    message: 'Pick a name for your agent',
+    message: 'Pick a name for your Obol account',
     placeholder: 'my-agent',
     validate: (val) => {
-      if (!val) return 'Your agent needs a name!';
+      if (!val) return 'Your account needs a name!';
       if (!/^[a-zA-Z0-9][a-zA-Z0-9_-]{1,62}[a-zA-Z0-9]$/.test(val)) {
         return 'Letters, numbers, hyphens, and underscores only (3-64 chars)';
       }
@@ -122,8 +125,8 @@ export async function runSetup() {
   // --- Confirm ---
   const keyCount = Object.keys(apiKeys).length;
   const confirmMsg = keyCount
-    ? `Create agent ${pc.bold(pc.green(agentId))} with ${services.length} service${services.length > 1 ? 's' : ''} and ${keyCount} API key${keyCount > 1 ? 's' : ''}?`
-    : `Create agent ${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' : ''} and ${keyCount} API key${keyCount > 1 ? 's' : ''}?`
+    : `Create Obol account ${pc.bold(pc.green(agentId))} with ${services.length} service${services.length > 1 ? 's' : ''}?`;
   const confirmed = await p.confirm({ message: confirmMsg });
   if (p.isCancel(confirmed) || !confirmed) return cancelled();
 
@@ -131,8 +134,8 @@ export async function runSetup() {
   console.log();
   const s = p.spinner();
 
-  // 1. Sign up (creates agent + JWT + policy in one call)
-  s.start('Creating your agent...');
+  // 1. Sign up
+  s.start('Creating your account...');
   let jwt;
   let expiresAt;
   try {
@@ -141,17 +144,17 @@ export async function runSetup() {
     expiresAt = new Date(result.expires_at * 1000);
 
     if (result.referral) {
-      s.stop(pc.green(`Agent "${agentId}" created with referral! $${result.referral.signup_bonus_referee} bonus unlocks after your first API call `) + cheer());
+      s.stop(pc.green(`Account "${agentId}" created with referral! $${result.referral.signup_bonus_referee} bonus unlocks after your first API call `) + cheer());
     } else {
-      s.stop(pc.green(`Agent "${agentId}" created! `) + cheer());
+      s.stop(pc.green(`Account "${agentId}" created! `) + cheer());
     }
   } catch (err) {
     if (err.status === 409) {
-      s.stop(pc.red(`The name "${agentId}" is already taken — try a different name.`));
+      s.stop(pc.red(`That account name was revoked — try a different name.`));
     } else {
-      s.stop(pc.red(`Couldn't create agent: ${err.message}`));
+      s.stop(pc.red(`Couldn't create account: ${err.message}`));
     }
-    p.outro(pc.dim('Try again with a different name.'));
+    p.outro(pc.dim('Try again.'));
     process.exit(1);
   }
 
@@ -178,23 +181,193 @@ export async function runSetup() {
   const envPath = saveEnv(vars);
   s.stop(pc.green(`Saved to ${envPath}`));
 
-  // --- Celebration! ---
+  // 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') {
+    if (hasPackageJson) {
+      s.start('Installing @obol/sdk...');
+      try {
+        execSync('npm install @obol/sdk', { 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: npm install @obol/sdk'));
+      }
+    } else {
+      p.log.info(`Install the SDK when you're ready: ${pc.green('npm install @obol/sdk')}`);
+    }
+
+    // Generate integration file
+    const obolFile = resolve(process.cwd(), 'obol.js');
+    if (!existsSync(obolFile)) {
+      s.start('Generating integration file...');
+      writeFileSync(obolFile, jsIntegrationFile(agentId, services));
+      s.stop(pc.green('Created obol.js'));
+      integrationFile = 'obol.js';
+    }
+  } else if (lang === 'python') {
+    s.start('Installing obol-sdk...');
+    try {
+      execSync('pip install obol-sdk', { 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'));
+    }
+
+    // Generate integration file
+    const obolFile = resolve(process.cwd(), 'obol_setup.py');
+    if (!existsSync(obolFile)) {
+      s.start('Generating integration file...');
+      writeFileSync(obolFile, pyIntegrationFile(agentId, services));
+      s.stop(pc.green('Created obol_setup.py'));
+      integrationFile = 'obol_setup.py';
+    }
+  }
+
+  // 5. Test connectivity
+  s.start('Testing connection...');
+  try {
+    const epData = await listEndpoints(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(', ')})` : ''));
+  } catch {
+    s.stop(pc.yellow('Could not verify connection — run obol test later to check'));
+  }
+
+  // --- Summary ---
+  console.log();
+  p.log.success(pc.bold(`Your agent is connected to Obol!`));
   console.log();
-  p.log.success(pc.bold(`Your agent "${agentId}" is live on Obol!`));
+
+  if (sdkInstalled) {
+    console.log(`  ${pc.dim('SDK installed:')}     ${pc.green(lang === 'js' ? '@obol/sdk' : 'obol-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();
 
-  console.log(`  ${pc.dim('Check status:')}  ${pc.green('npx @obol/cli status')}`);
-  console.log(`  ${pc.dim('Add a key:')}     ${pc.green('npx @obol/cli connect github')}`);
-  console.log(`  ${pc.dim('View balance:')}  ${pc.green('npx @obol/cli balance')}`);
-  console.log(`  ${pc.dim('Dashboard:')}     ${pc.green('npx @obol/cli token')} ${pc.dim('→ paste at obolagents.com/dashboard')}`);
+  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 (lang === 'js' && integrationFile) {
+    console.log(`    ${pc.dim('2.')} 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.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();
-  p.log.info(`${pc.bold('Earn credits by referring other agents!')} Run ${pc.green('obol referral code')} to get your referral link.`);
-  p.log.info(pc.dim('You earn $2 per signup + 10% ongoing commissions on their usage.'));
+
+  p.log.info(`${pc.bold('Earn credits by referring other agents!')} Run ${pc.green('npx @obol/cli referral code')} to get started.`);
   console.log();
 
   p.outro('Go build something awesome. ' + pc.green('⚡'));
 }
 
+function detectProject() {
+  const cwd = process.cwd();
+  if (existsSync(resolve(cwd, 'package.json'))) return 'js';
+  if (existsSync(resolve(cwd, 'requirements.txt'))) return 'python';
+  if (existsSync(resolve(cwd, 'pyproject.toml'))) return 'python';
+  return null;
+}
+
+function jsIntegrationFile(agentId, services) {
+  const providerMap = { stripe: 1, github: 2, slack: 3, notion: 4, discord: 5, twitter: 6, agentmail: 7 };
+  const examples = services
+    .map(svc => {
+      const id = providerMap[svc];
+      const ex = {
+        stripe: `await obol.execute(${id}, 'Create invoice for $50 to customer@example.com');`,
+        github: `await obol.execute(${id}, 'Create issue titled "Bug report" in owner/repo');`,
+        slack: `await obol.execute(${id}, 'Send message "Hello team" to #general');`,
+        notion: `await obol.execute(${id}, 'Create page titled "Meeting Notes"');`,
+        discord: `await obol.execute(${id}, 'Send message "Hello" to channel 123456');`,
+        twitter: `await obol.execute(${id}, 'Post tweet: Just shipped a new feature!');`,
+        agentmail: `await obol.execute(${id}, 'Send email to user@example.com subject "Hello"');`,
+      };
+      return `//   ${ex[svc] || `await obol.execute(${id}, 'your intent here');`}`;
+    })
+    .join('\n');
+
+  return `import { ObolClient } from '@obol/sdk';
+
+// Pre-configured Obol client — reads OBOL_JWT_TOKEN from .env automatically
+export const obol = new ObolClient();
+
+// Provider IDs: 1=Stripe, 2=GitHub, 3=Slack, 4=Notion, 5=Discord, 6=Twitter, 7=AgentMail
+//
+// Usage:
+//   import { obol } from './obol.js';
+${examples}
+`;
+}
+
+function pyIntegrationFile(agentId, services) {
+  const providerMap = { stripe: 1, github: 2, slack: 3, notion: 4, discord: 5, twitter: 6, agentmail: 7 };
+  const examples = services
+    .map(svc => {
+      const id = providerMap[svc];
+      const ex = {
+        stripe: `# obol.execute(${id}, 'Create invoice for $50 to customer@example.com', idempotency_key='unique-key')`,
+        github: `# obol.execute(${id}, 'Create issue titled "Bug report" in owner/repo', idempotency_key='unique-key')`,
+        slack: `# obol.execute(${id}, 'Send message "Hello team" to #general', idempotency_key='unique-key')`,
+        notion: `# obol.execute(${id}, 'Create page titled "Meeting Notes"', idempotency_key='unique-key')`,
+        discord: `# obol.execute(${id}, 'Send message "Hello" to channel 123456', idempotency_key='unique-key')`,
+        twitter: `# obol.execute(${id}, 'Post tweet: Just shipped a new feature!', idempotency_key='unique-key')`,
+        agentmail: `# obol.execute(${id}, 'Send email to user@example.com subject "Hello"', idempotency_key='unique-key')`,
+      };
+      return ex[svc] || `# obol.execute(${id}, 'your intent here', idempotency_key='unique-key')`;
+    })
+    .join('\n');
+
+  return `import os
+from obol_sdk import ObolClient
+
+# Pre-configured Obol client — reads from environment variables
+obol = ObolClient(
+    gateway_url=os.getenv("OBOL_GATEWAY_URL", "https://www.obolagents.com"),
+    agent_id=os.getenv("OBOL_AGENT_ID", "${agentId}"),
+    jwt_token=os.getenv("OBOL_JWT_TOKEN", ""),
+)
+
+# Provider IDs: 1=Stripe, 2=GitHub, 3=Slack, 4=Notion, 5=Discord, 6=Twitter, 7=AgentMail
+#
+# Usage:
+#   from obol_setup import obol
+${examples}
+`;
+}
+
 function cancelled() {
   p.cancel('Setup cancelled. Come back anytime!');
   process.exit(0);