clawmoney 0.15.32 → 0.15.34

package/dist/commands/relay-setup.js

@@ -346,7 +346,36 @@ export async function relaySetupCommand() {
             log.warn(`${f.cli}/${f.model}: ${chalk.dim(f.error.slice(0, 120))}`);
         }
     }
-    // ── Step 7: auto-start the daemon ──
+    // ── Step 7: prune — implement "pick-what-you-run" semantics ──
+    //
+    // setup is meant to be declarative: the cli_types the user just picked
+    // are the complete set of what the daemon should serve. Earlier test
+    // runs that registered different subscriptions (antigravity, gemini,
+    // etc.) would otherwise linger in the DB and get preflighted every
+    // daemon start, confusing the user who just picked claude+codex.
+    //
+    // We only prune AFTER registration succeeds, so a failed batch doesn't
+    // wipe the user's existing state. And we only send the selected
+    // cli_types as keep_cli_types — the backend handles the "delete what's
+    // not in the list" part.
+    try {
+        const pruneResp = await apiPost("/api/v1/relay/providers/prune", { keep_cli_types: Array.from(new Set(selectedClis)) }, config.api_key);
+        if (pruneResp.ok &&
+            pruneResp.data?.deleted &&
+            pruneResp.data.deleted.length > 0) {
+            log.success(`Cleaned up ${pruneResp.data.deleted.length} provider(s) from earlier runs ` +
+                chalk.dim("(" +
+                    Array.from(new Set(pruneResp.data.deleted.map((d) => d.cli_type))).join(", ") +
+                    ")"));
+        }
+    }
+    catch (err) {
+        // Non-fatal: worst case is the daemon preflights extra cli_types,
+        // which is annoying but doesn't break anything.
+        log.warn(`Could not prune old providers: ${err.message} — ` +
+            `run \`clawmoney relay status\` and clean manually if needed`);
+    }
+    // ── Step 8: auto-start the daemon ──
     //
     // The daemon now runs in multi-cli auto mode by default: it fetches
     // every provider this agent has registered, preflights each distinct
@@ -370,8 +399,8 @@ export async function relaySetupCommand() {
     // instead of 6.
     log.message(chalk.dim("Next:") +
         "\n" +
-        `  ${chalk.cyan("clawmoney relay status")}   daemon health + providers\n` +
-        `  ${chalk.cyan("clawmoney relay credits")}  earnings + balance\n` +
+        `  ${chalk.cyan("clawmoney relay status")}   daemon + provider list\n` +
+        `  ${chalk.cyan("clawmoney wallet balance")} on-chain + relay earnings\n` +
         `  ${chalk.cyan("clawmoney relay stop")}     stop daemon`);
     const cliLabel = uniqueClis.length === 1
         ? `${uniqueClis[0]} daemon running`

package/dist/commands/relay.d.ts

@@ -18,5 +18,4 @@ export declare function relayLogsCommand(options: {
 }): Promise<void>;
 export declare function relayStatusCommand(): Promise<void>;
 export declare function relayModelsCommand(): Promise<void>;
-export declare function relayCreditsCommand(): Promise<void>;
 export {};

package/dist/commands/relay.js

@@ -344,28 +344,3 @@ export async function relayModelsCommand() {
         throw err;
     }
 }
-export async function relayCreditsCommand() {
-    const config = requireConfig();
-    const spinner = ora("Fetching relay credits...").start();
-    try {
-        const resp = await apiGet("/api/v1/relay/credits", config.api_key);
-        if (!resp.ok) {
-            const detail = resp.data?.detail ?? resp.status;
-            spinner.fail(chalk.red(`Failed to fetch credits: ${detail}`));
-            process.exit(1);
-        }
-        const data = resp.data;
-        spinner.succeed("Relay Credits");
-        console.log("");
-        console.log(`  ${chalk.bold("Balance:")}        $${(data.balance_usd ?? 0).toFixed(2)}`);
-        console.log(`  ${chalk.bold("Total Spent:")}    $${(data.total_spent_usd ?? 0).toFixed(2)}`);
-        console.log(`  ${chalk.bold("Total Requests:")} ${data.total_requests ?? 0}`);
-        if (data.last_used_at) {
-            console.log(`  ${chalk.bold("Last Used:")}      ${data.last_used_at}`);
-        }
-    }
-    catch (err) {
-        spinner.fail(chalk.red("Failed to fetch credits"));
-        throw err;
-    }
-}

package/dist/commands/wallet.js

@@ -1,6 +1,8 @@
 import chalk from 'chalk';
 import ora from 'ora';
 import { awalExec } from '../utils/awal.js';
+import { apiGet } from '../utils/api.js';
+import { loadConfig } from '../utils/config.js';
 export async function walletStatusCommand() {
     const spinner = ora('Getting wallet status...').start();
     try {
@@ -20,25 +22,51 @@ export async function walletStatusCommand() {
 }
 export async function walletBalanceCommand() {
     const spinner = ora('Getting wallet balance...').start();
+    // Kick off both calls in parallel. Relay earnings are loaded from
+    // the clawmoney backend per-agent; the on-chain balance is awal's
+    // native `balance` RPC. We don't block on-chain display if relay
+    // fetching fails — the on-chain balance is the authoritative "real
+    // money" view.
+    const config = loadConfig();
+    const relayPromise = config?.api_key
+        ? apiGet("/api/v1/relay/providers/me", config.api_key)
+            .then((resp) => (resp.ok && Array.isArray(resp.data) ? resp.data : null))
+            .catch(() => null)
+        : Promise.resolve(null);
+    let awalResult;
     try {
-        const result = await awalExec(['balance']);
-        spinner.succeed('Wallet Balance');
-        console.log('');
-        const data = result.data;
-        if (typeof data === 'object' && data !== null) {
-            for (const [key, value] of Object.entries(data)) {
-                console.log(`  ${chalk.dim(key + ':')} ${chalk.green(String(value))}`);
-            }
-        }
-        else {
-            console.log(`  ${result.raw}`);
-        }
-        console.log('');
+        awalResult = await awalExec(['balance']);
     }
     catch (err) {
         spinner.fail('Failed to get wallet balance');
         console.error(chalk.red(err.message));
+        return;
     }
+    const relayRows = await relayPromise;
+    spinner.succeed('Wallet');
+    console.log('');
+    console.log(chalk.bold('  On-chain (awal)'));
+    const data = awalResult.data;
+    if (typeof data === 'object' && data !== null) {
+        for (const [key, value] of Object.entries(data)) {
+            console.log(`    ${chalk.dim(key + ':').padEnd(22)} ${chalk.green(String(value))}`);
+        }
+    }
+    else {
+        console.log(`    ${awalResult.raw}`);
+    }
+    if (relayRows && relayRows.length > 0) {
+        const earned = relayRows.reduce((s, p) => s + (p.total_earned_usd ?? 0), 0);
+        const withdrawn = relayRows.reduce((s, p) => s + (p.total_withdrawn_usd ?? 0), 0);
+        const pending = Math.max(0, earned - withdrawn);
+        const requests = relayRows.reduce((s, p) => s + (p.total_requests ?? 0), 0);
+        console.log('');
+        console.log(chalk.bold('  Relay earnings'));
+        console.log(`    ${chalk.dim('Earned:').padEnd(22)} ${chalk.green('$' + earned.toFixed(2))}`);
+        console.log(`    ${chalk.dim('Pending payout:').padEnd(22)} ${chalk.green('$' + pending.toFixed(2))}`);
+        console.log(chalk.dim(`    (${relayRows.length} provider${relayRows.length === 1 ? "" : "s"} · ${requests} request${requests === 1 ? "" : "s"} served)`));
+    }
+    console.log('');
 }
 export async function walletAddressCommand() {
     const spinner = ora('Getting wallet address...').start();

package/dist/index.js

@@ -8,7 +8,7 @@ import { walletStatusCommand, walletBalanceCommand, walletAddressCommand, wallet
 import { tweetCommand } from './commands/tweet.js';
 import { gigCreateCommand, gigBrowseCommand, gigDetailCommand, gigAcceptCommand, gigDeliverCommand, gigApproveCommand, gigDisputeCommand, } from './commands/gig.js';
 import { hubStartCommand, hubStopCommand, hubStatusCommand, hubSearchCommand, hubCallCommand, hubRegisterCommand, hubSkillsCommand, hubOrderCommand, hubHistoryCommand, } from './commands/hub.js';
-import { relayRegisterCommand, relayStartCommand, relayStopCommand, relayStatusCommand, relayModelsCommand, relayCreditsCommand, relayLogsCommand, } from './commands/relay.js';
+import { relayRegisterCommand, relayStartCommand, relayStopCommand, relayStatusCommand, relayModelsCommand, relayLogsCommand, } from './commands/relay.js';
 import { antigravityLoginCommand, antigravityStatusCommand, } from './commands/antigravity.js';
 import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
@@ -34,7 +34,7 @@ program
 // account
 program
     .command('account')
-    .description('Show current agent info (wallet, email, slug, credits)')
+    .description('Show current agent info (wallet, email, slug)')
     .action(async () => {
     try {
         const { requireConfig } = await import('./utils/config.js');
@@ -56,10 +56,6 @@ program
         console.log(`  ${chalk.bold('Email:')}    ${a.email ?? '-'}`);
         console.log(`  ${chalk.bold('Wallet:')}   ${a.wallet_address ?? 'not set'}`);
         console.log(`  ${chalk.bold('Status:')}   ${a.status ?? '-'}`);
-        const credResp = await apiGet('/api/v1/relay/credits', config.api_key);
-        if (credResp.ok && credResp.data) {
-            console.log(`  ${chalk.bold('Credits:')}  $${Number(credResp.data.balance_usd ?? 0).toFixed(2)}`);
-        }
         // Query Base mainnet USDC balance directly via JSON-RPC (no awal
         // dependency — works even if awal wallet bridge is down). Base USDC
         // is 0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913, balanceOf(address)
@@ -553,18 +549,6 @@ relay
         process.exit(1);
     }
 });
-relay
-    .command('credits')
-    .description('Check relay credit balance')
-    .action(async () => {
-    try {
-        await relayCreditsCommand();
-    }
-    catch (err) {
-        console.error(err.message);
-        process.exit(1);
-    }
-});
 // antigravity (Google Antigravity IDE OAuth — separate quota pool + Claude access)
 const antigravity = program
     .command('antigravity')

package/package.json

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