@obol/cli 0.3.1 → 0.3.2

package/package.json

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

package/src/api.js

@@ -45,11 +45,13 @@ export async function checkHealth(gatewayUrl) {
   return request(`${gatewayUrl}/healthz`);
 }
 
-export async function signup(gatewayUrl, agentId, services, referralCode, setupKey) {
+export async function signup(gatewayUrl, agentId, services, referralCode, setupKey, preferredPaymentMode, walletAddress) {
   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;
+  if (preferredPaymentMode) body.preferred_payment_mode = preferredPaymentMode;
+  if (walletAddress) body.wallet_address = walletAddress;
   return request(`${gatewayUrl}/v1/signup`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },

package/src/setup.js

@@ -1,6 +1,6 @@
 import { execSync } from 'node:child_process';
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
-import { resolve } from 'node:path';
+import { basename, resolve } from 'node:path';
 import * as p from '@clack/prompts';
 import pc from 'picocolors';
 import { checkHealth, listConnections, listEndpoints, signup, storeBYOK, validateReferralCode } from './api.js';
@@ -10,6 +10,30 @@ 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 function preferredJsPaymentMode(existingEnv = {}) {
+  return existingEnv.OBOL_PAYMENT_MODE || 'x402';
+}
+
+export function ensureJsProjectManifest(agentId, cwd = process.cwd()) {
+  const packageJsonPath = resolve(cwd, 'package.json');
+  if (existsSync(packageJsonPath)) return packageJsonPath;
+
+  const rawName = basename(cwd) || agentId || 'obol-agent';
+  const packageName = rawName
+    .toLowerCase()
+    .replace(/[^a-z0-9._-]+/g, '-')
+    .replace(/^-+|-+$/g, '')
+    || 'obol-agent';
+
+  const manifest = {
+    name: packageName,
+    private: true,
+    type: 'module',
+  };
+  writeFileSync(packageJsonPath, JSON.stringify(manifest, null, 2) + '\n');
+  return packageJsonPath;
+}
+
 export async function runSetup() {
   console.log();
   p.intro(pc.bgGreen(pc.black(' Welcome to Obol! ')));
@@ -138,7 +162,7 @@ export async function runSetup() {
   }
 
   // --- Payment Mode ---
-  let paymentMode = existingEnv.OBOL_PAYMENT_MODE || 'credits';
+  let paymentMode = preferredJsPaymentMode(existingEnv);
   let x402PrivateKey = existingEnv.OBOL_X402_PRIVATE_KEY || '';
   let walletAddress = existingEnv.OBOL_WALLET_ADDRESS || '';
 
@@ -217,7 +241,15 @@ export async function runSetup() {
   let jwt;
   let setupKey = existingEnv.OBOL_AGENT_ID === agentId ? existingEnv.OBOL_SETUP_KEY || '' : '';
   try {
-    const result = await signup(url, agentId, services, referralCode?.trim() || undefined, setupKey);
+    const result = await signup(
+      url,
+      agentId,
+      services,
+      referralCode?.trim() || undefined,
+      setupKey,
+      paymentMode,
+      walletAddress || undefined,
+    );
     jwt = result.token;
     setupKey = result.setup_key || setupKey;
 
@@ -299,10 +331,23 @@ export async function runSetup() {
   // 4. Detect project type and install SDK
   let sdkInstalled = false;
   let integrationFile = null;
+  let projectReady = true;
 
-  const hasPackageJson = existsSync(resolve(process.cwd(), 'package.json'));
+  let hasPackageJson = existsSync(resolve(process.cwd(), 'package.json'));
 
   if (lang === 'js') {
+    if (!hasPackageJson) {
+      s.start('Preparing this folder for JavaScript setup...');
+      try {
+        const packageJsonPath = ensureJsProjectManifest(agentId);
+        hasPackageJson = true;
+        s.stop(pc.green(`Created ${packageJsonPath}`));
+      } catch (err) {
+        projectReady = false;
+        s.stop(pc.yellow(`Could not create package.json automatically: ${err.message}`));
+      }
+    }
+
     if (hasPackageJson) {
       s.start('Installing @obol/sdk...');
       try {
@@ -310,19 +355,22 @@ export async function runSetup() {
         s.stop(pc.green('SDK installed! ') + cheer());
         sdkInstalled = true;
       } catch {
+        projectReady = false;
         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, paymentMode));
-      s.stop(pc.green('Created obol.js'));
-      integrationFile = 'obol.js';
+    if (hasPackageJson) {
+      const obolFile = resolve(process.cwd(), 'obol.js');
+      if (!existsSync(obolFile)) {
+        s.start('Generating integration file...');
+        writeFileSync(obolFile, jsIntegrationFile(agentId, services, paymentMode));
+        s.stop(pc.green('Created obol.js'));
+        integrationFile = 'obol.js';
+      }
+    } else {
+      projectReady = false;
     }
   } else if (lang === 'python') {
     s.start('Installing the Obol Python SDK from GitHub...');
@@ -366,7 +414,7 @@ export async function runSetup() {
 
   // --- Summary ---
   console.log();
-  p.log.success(pc.bold(`Your agent is connected to Obol!`));
+  p.log.success(pc.bold(projectReady ? 'Your agent is connected to Obol!' : 'Your Obol account is ready.'));
   console.log();
 
   if (sdkInstalled) {
@@ -377,6 +425,9 @@ export async function runSetup() {
   }
   console.log(`  ${pc.dim('Config saved:')}     ${pc.green(envPath)}`);
   console.log(`  ${pc.dim('Payment mode:')}     ${pc.green(paymentMode === 'x402' ? 'Automatic USDC (x402)' : 'Credits via Stripe')}`);
+  if (lang === 'js' && !sdkInstalled) {
+    console.log(`  ${pc.dim('Project status:')}   ${pc.yellow('Install @obol/sdk before importing obol.js')}`);
+  }
   if (paymentMode === 'x402') {
     if (walletAddress) {
       console.log(`  ${pc.dim('Wallet:')}           ${pc.green(walletAddress)}`);

package/test/setup_helpers.test.mjs

@@ -0,0 +1,40 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { ensureJsProjectManifest, preferredJsPaymentMode } from '../src/setup.js';
+
+test('preferredJsPaymentMode defaults to x402 for fresh JS onboarding', () => {
+  assert.equal(preferredJsPaymentMode({}), 'x402');
+  assert.equal(preferredJsPaymentMode({ OBOL_PAYMENT_MODE: 'credits' }), 'credits');
+  assert.equal(preferredJsPaymentMode({ OBOL_PAYMENT_MODE: 'x402' }), 'x402');
+});
+
+test('ensureJsProjectManifest creates a runnable package.json when missing', () => {
+  const dir = mkdtempSync(join(tmpdir(), 'obol-setup-helper-'));
+  try {
+    const packageJsonPath = ensureJsProjectManifest('agent-123', dir);
+    assert.equal(existsSync(packageJsonPath), true);
+    const manifest = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
+    assert.equal(manifest.private, true);
+    assert.equal(manifest.type, 'module');
+    assert.ok(manifest.name);
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test('ensureJsProjectManifest preserves an existing package.json', () => {
+  const dir = mkdtempSync(join(tmpdir(), 'obol-setup-helper-existing-'));
+  const packageJsonPath = join(dir, 'package.json');
+  try {
+    writeFileSync(packageJsonPath, '{"name":"already-here","private":true}\n');
+    const returnedPath = ensureJsProjectManifest('agent-456', dir);
+    assert.equal(returnedPath, packageJsonPath);
+    assert.equal(readFileSync(packageJsonPath, 'utf8'), '{"name":"already-here","private":true}\n');
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});