clawmoney 0.17.0 → 0.17.2

package/dist/commands/setup.js

@@ -57,15 +57,98 @@ export async function setupCommand() {
     catch {
         // Fall through — if the check fails, we still try registering.
     }
+    // Existing ACTIVE agent → login path: send OTP, verify, rotate key.
+    // This is the "I already registered on another machine / lost my api_key"
+    // flow — no new claim link needed.
     if (existingStatus === 'ACTIVE') {
-        agentSpinner.warn('An active agent already exists for this email.');
-        console.log('');
-        console.log(chalk.yellow('If you have lost your API key, re-register and a new claim link will be sent.'));
-        const proceed = await prompt(chalk.cyan('? ') + 'Continue with re-registration? (y/N): ');
-        if (!/^y(es)?$/i.test(proceed.trim())) {
+        agentSpinner.info('Existing agent found. Sending login code to your email...');
+        try {
+            const loginResp = await apiPost('/api/v1/claw-agents/login', { email });
+            if (!loginResp.ok) {
+                console.error(chalk.red(JSON.stringify(loginResp.data)));
+                return;
+            }
+        }
+        catch (err) {
+            console.error(chalk.red(err.message));
             return;
         }
-        agentSpinner.start('Checking agent status...');
+        const otp = await prompt(chalk.cyan('? ') + 'Enter the 6-digit code from your email: ');
+        if (!otp || !/^\d{4,8}$/.test(otp.trim())) {
+            console.log(chalk.red('Invalid code.'));
+            return;
+        }
+        const verifySpinner = ora('Verifying code...').start();
+        let loginData;
+        try {
+            const verifyResp = await apiPost('/api/v1/claw-agents/login/verify', { email, otp: otp.trim() });
+            if (!verifyResp.ok) {
+                verifySpinner.fail('Verification failed');
+                console.error(chalk.red(JSON.stringify(verifyResp.data)));
+                return;
+            }
+            loginData = verifyResp.data;
+        }
+        catch (err) {
+            verifySpinner.fail('Verification failed');
+            console.error(chalk.red(err.message));
+            return;
+        }
+        verifySpinner.succeed('Logged in');
+        // Persist api_key immediately so nothing is lost if wallet provision hiccups.
+        saveConfig({
+            api_key: loginData.api_key,
+            agent_id: loginData.agent_id,
+            agent_slug: loginData.agent_slug,
+            email,
+            wallet_address: loginData.agent?.wallet_address ?? undefined,
+        });
+        // Always hit /me/wallet/balance to (a) let the backend reconcile
+        // legacy awal addresses to the canonical CDP address (the /login/verify
+        // response may still carry the stale awal value from DB), and (b) cache
+        // the authoritative address back to config. The returned `address` is
+        // the CDP account address after _ensure_agent_wallet has run.
+        let walletAddress = '';
+        const walletSpinner = ora('Reconciling CDP wallet...').start();
+        try {
+            const balResp = await apiGet('/api/v1/claw-agents/me/wallet/balance?asset=usdc', loginData.api_key);
+            if (balResp.ok && balResp.data?.address) {
+                walletAddress = balResp.data.address;
+                saveConfig({ wallet_address: walletAddress });
+                const prior = loginData.agent?.wallet_address ?? '';
+                if (prior && prior.toLowerCase() !== walletAddress.toLowerCase()) {
+                    walletSpinner.succeed(`Wallet migrated: ${prior} → ${walletAddress}`);
+                    console.log(chalk.yellow(`  (Your old awal address ${prior} is no longer`));
+                    console.log(chalk.yellow(`   used by this CLI. Transfer any remaining funds manually.)`));
+                }
+                else {
+                    walletSpinner.succeed(`Wallet ready: ${walletAddress}`);
+                }
+            }
+            else {
+                walletSpinner.warn('Wallet reconcile failed — will be created on first use.');
+            }
+        }
+        catch (err) {
+            walletSpinner.warn(`Wallet reconcile deferred: ${err.message}`);
+        }
+        // Summary.
+        console.log('');
+        console.log(chalk.green.bold('  Setup complete!'));
+        console.log('');
+        console.log(chalk.dim(`  Agent ID:    ${loginData.agent_id}`));
+        console.log(chalk.dim(`  Agent Slug:  ${loginData.agent_slug}`));
+        if (walletAddress) {
+            console.log(chalk.dim(`  Wallet:      ${walletAddress}`));
+            console.log(chalk.dim(`  Custody:     Coinbase CDP Server Wallet`));
+        }
+        console.log(chalk.dim(`  Config:      ${getConfigPath()}`));
+        console.log('');
+        console.log(`  Next steps:`);
+        console.log(`    ${chalk.cyan('clawmoney wallet balance')}  Check your wallet balance`);
+        console.log(`    ${chalk.cyan('clawmoney browse')}          Browse available tasks`);
+        console.log('');
+        return;
     }
     // Step 3: Register agent (or re-send claim link for an UNCLAIMED agent).
     // The backend generates the anonymous slug from email hash; we never send a name.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawmoney",
-  "version": "0.17.0",
+  "version": "0.17.2",
   "description": "ClawMoney CLI -- Earn rewards with your AI agent",
   "type": "module",
   "bin": {