clawmoney 0.15.29 → 0.15.31

package/dist/commands/relay-setup.js

@@ -7,7 +7,7 @@ import chalk from "chalk";
 import { apiPost } from "../utils/api.js";
 import { loadConfig, requireConfig } from "../utils/config.js";
 import { setupCommand } from "./setup.js";
-import { API_PRICES, RELAY_DISCOUNT, PLATFORM_FEE } from "../relay/pricing.js";
+import { API_PRICES, PLATFORM_FEE } from "../relay/pricing.js";
 // ── Per-cli_type model catalogs ──
 //
 // `RECOMMENDED_MODELS` is what gets registered when the user picks "all
@@ -119,12 +119,6 @@ function detectInstalledClis() {
     });
     return results;
 }
-// ── Helpers ──
-function formatBuyerPrice(input, output) {
-    const buyerInput = (input * RELAY_DISCOUNT).toFixed(3);
-    const buyerOutput = (output * RELAY_DISCOUNT).toFixed(3);
-    return `$${buyerInput}/$${buyerOutput} per 1M (after ${Math.round((1 - RELAY_DISCOUNT) * 100)}% relay discount)`;
-}
 // ── Main command ──
 export async function relaySetupCommand() {
     // ── Step 0: ensure the agent is logged in ──
@@ -273,85 +267,87 @@ export async function relaySetupCommand() {
         process.exit(0);
     }
     const dailyLimit = dailyLimitChoice;
-    // ── Step 5: confirmation summary ──
-    // Translate the chosen daily-limit USD value back into the percentage
-    // label the user picked, so what they see in the summary matches what
-    // they answered in the prompt.
+    // ── Step 5: register everything under one spinner ──
+    //
+    // We deliberately skip the old per-model Summary block: pricing is on
+    // the website, and Step 3 already listed which models were queued per
+    // subscription. The remaining signal (quota share + earn %) goes into
+    // the spinner's final message so users see it exactly once.
+    //
+    // Also: one spinner for the whole batch, not N. Sequential per-model
+    // spinners produced 7+ rows of clack vertical whitespace for what's
+    // really a single bulk action.
+    //
+    // No "Register all N providers now?" confirm either — the user picked
+    // subscriptions + quota share above; Ctrl-C still aborts, and the
+    // backend is idempotent so mid-way aborts are safe to re-run.
     const limitLabel = {
-        15: "~25% (Light)",
-        30: "~50% (Balanced)",
-        45: "~75% (Heavy)",
-        60: "~100% (Full)",
+        15: "~25%", 30: "~50%", 45: "~75%", 60: "~100%",
     };
-    log.step(chalk.bold("Summary"));
-    for (const r of registrations) {
-        log.message(`  ${chalk.cyan(r.cli + "/" + r.model).padEnd(50)} ${chalk.dim(formatBuyerPrice(r.input, r.output))}`);
-    }
-    log.message(chalk.dim(`  ${registrations.length} provider(s) · ${limitLabel[dailyLimit] ?? `$${dailyLimit}/day cap`} per model`));
-    log.message(chalk.dim(`  You earn ~${Math.round((1 - PLATFORM_FEE) * 100)}% of what buyers pay (after platform fee)`));
-    log.message(chalk.dim(`  To customize: edit ~/.clawmoney/config.yaml after start`));
-    // ── Step 6: register each (idempotent — "already registered" counts as success) ──
-    //
-    // No "Register all N providers now?" confirm — the user already
-    // picked subscriptions + daily quota share. Seeing the summary and
-    // immediately going into registration is the expected flow. Ctrl-C
-    // still aborts, and registrations are idempotent so a mid-way abort
-    // is recoverable by re-running.
+    const earnPct = Math.round((1 - PLATFORM_FEE) * 100);
     let succeeded = 0;
     let failed = 0;
     const failures = [];
-    for (const r of registrations) {
-        const regSpin = spinner();
-        regSpin.start(`Registering ${r.cli}/${r.model}...`);
+    const regSpin = spinner();
+    regSpin.start(`Registering ${registrations.length} providers...`);
+    // Parallel registration — each request creates a distinct RelayProvider
+    // row so there's no write contention, and the backend's insert path is
+    // idempotent on (agent_id, cli_type, model). Sequential registration
+    // was costing ~1 RTT per row, which on a high-latency link (e.g. from
+    // China) added up to 7-10s of visible wait for 7 providers.
+    await Promise.all(registrations.map(async (r) => {
+        const body = {
+            cli_type: r.cli,
+            model: r.model,
+            mode: "chat",
+            concurrency,
+            daily_limit_usd: dailyLimit,
+            price_input_per_m: r.input,
+            price_output_per_m: r.output,
+        };
         try {
-            const body = {
-                cli_type: r.cli,
-                model: r.model,
-                mode: "chat",
-                concurrency,
-                daily_limit_usd: dailyLimit,
-                price_input_per_m: r.input,
-                price_output_per_m: r.output,
-            };
             const resp = await apiPost("/api/v1/relay/providers", body, config.api_key);
             if (resp.ok) {
-                regSpin.stop(`${chalk.green("✓")} ${r.cli}/${r.model}`);
+                succeeded++;
+                return;
+            }
+            const raw = resp.data && typeof resp.data === "object" && "detail" in resp.data
+                ? resp.data.detail
+                : resp.data;
+            const detail = typeof raw === "string" ? raw : JSON.stringify(raw);
+            // Already-registered is a soft success — idempotent re-run.
+            if (detail.includes("Already registered")) {
                 succeeded++;
             }
             else {
-                const raw = resp.data && typeof resp.data === "object" && "detail" in resp.data
-                    ? resp.data.detail
-                    : resp.data;
-                const detail = typeof raw === "string" ? raw : JSON.stringify(raw);
-                // Already-registered is a soft success — idempotent re-run.
-                if (detail.includes("Already registered")) {
-                    regSpin.stop(`${chalk.yellow("~")} ${r.cli}/${r.model} ${chalk.dim("(already registered, no change)")}`);
-                    succeeded++;
-                }
-                else {
-                    regSpin.stop(`${chalk.red("✗")} ${r.cli}/${r.model} ${chalk.dim("(" + detail.slice(0, 80) + ")")}`);
-                    failed++;
-                    failures.push({ cli: r.cli, model: r.model, error: detail });
-                }
+                failed++;
+                failures.push({ cli: r.cli, model: r.model, error: detail });
             }
         }
         catch (err) {
             const msg = err.message;
-            regSpin.stop(`${chalk.red("✗")} ${r.cli}/${r.model} ${chalk.dim("(" + msg + ")")}`);
             failed++;
             failures.push({ cli: r.cli, model: r.model, error: msg });
         }
+    }));
+    if (failed === 0) {
+        regSpin.stop(`${chalk.green(`✓ ${succeeded} providers registered`)}  ` +
+            chalk.dim(`(${limitLabel[dailyLimit] ?? `$${dailyLimit}`} quota share · you earn ~${earnPct}%)`));
     }
-    // ── Step 7: registration done, offer to auto-start ──
-    log.step(chalk.bold("Registered"));
-    log.message(`${chalk.green(succeeded.toString())} provider(s) registered`);
+    else {
+        regSpin.stop(`${chalk.yellow(`${succeeded} registered, ${failed} failed`)}`);
+    }
+    // ── Step 6: on failure, list which ones broke ──
+    //
+    // On success we say nothing — the spinner's final message is already
+    // the "registered" summary. On failure we dump a per-row detail line
+    // so the user can tell what to fix.
     if (failed > 0) {
-        log.warn(`${failed} registrations failed`);
         for (const f of failures) {
-            log.message(chalk.dim(`  ${f.cli}/${f.model}: ${f.error.slice(0, 120)}`));
+            log.warn(`${f.cli}/${f.model}: ${chalk.dim(f.error.slice(0, 120))}`);
         }
     }
-    // ── Step 8: auto-start the daemon ──
+    // ── Step 7: 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,11 +366,14 @@ export async function relaySetupCommand() {
         outro(chalk.yellow("Setup complete (daemon not started)"));
         return;
     }
-    log.message("");
-    log.message(chalk.dim("Useful follow-up commands:"));
-    log.message(`    ${chalk.cyan("clawmoney relay status")}        # check daemon health + provider list`);
-    log.message(`    ${chalk.cyan("clawmoney relay credits")}       # check earnings + payout balance`);
-    log.message(`    ${chalk.cyan("clawmoney relay stop")}          # stop the daemon`);
+    // One multi-line log.message renders each line with a `│` prefix
+    // but without clack's inter-call gap — 3 bullets fit in 3 lines
+    // 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 stop")}     stop daemon`);
     const cliLabel = uniqueClis.length === 1
         ? `${uniqueClis[0]} daemon running`
         : `daemon serving ${uniqueClis.join(" + ")}`;

package/dist/commands/relay.js

@@ -206,36 +206,65 @@ export async function relayStatusCommand() {
     else {
         console.log(chalk.dim("  Local process: not running"));
     }
-    // Remote status
+    // Remote status. /api/v1/relay/providers/me returns a LIST of
+    // RelayProviderPublic (one row per registered model), so we can't
+    // treat the body as a single object. For multi-cli providers the
+    // list can easily be 7-10 rows — render them as a table with one
+    // line per row instead of 14 labeled lines for a single picked row.
     const spinner = ora("Fetching relay provider status...").start();
     try {
         const resp = await apiGet("/api/v1/relay/providers/me", config.api_key);
         if (!resp.ok) {
             if (resp.status === 404) {
                 spinner.info("Not registered as relay provider yet.");
-                console.log(chalk.dim(`  Run "clawmoney relay register" to get started.`));
+                console.log(chalk.dim(`  Run "clawmoney relay setup" to get started.`));
                 return;
             }
-            const detail = resp.data?.detail ?? resp.status;
+            const detail = resp.data?.detail ?? String(resp.status);
             spinner.fail(chalk.red(`Failed to fetch status: ${detail}`));
             process.exit(1);
         }
-        const data = resp.data;
-        const statusColor = data.status === "online" ? chalk.green : data.status === "offline" ? chalk.dim : chalk.yellow;
-        spinner.succeed("Relay Provider Status");
+        // Normalize: backend currently returns a list, but guard against
+        // a single-object shape in case someone points the CLI at an older
+        // Hub build.
+        const providers = Array.isArray(resp.data)
+            ? resp.data
+            : resp.data
+                ? [resp.data]
+                : [];
+        if (providers.length === 0) {
+            spinner.info("No providers registered yet.");
+            console.log(chalk.dim(`  Run "clawmoney relay setup" to get started.`));
+            return;
+        }
+        spinner.succeed(`Relay Providers (${providers.length})`);
         console.log("");
-        console.log(`  ${chalk.bold("Provider ID:")}   ${data.id ?? data.provider_id ?? "-"}`);
-        console.log(`  ${chalk.bold("Status:")}        ${statusColor(data.status ?? "-")}`);
-        console.log(`  ${chalk.bold("CLI:")}           ${data.cli_type ?? "-"}`);
-        console.log(`  ${chalk.bold("Model:")}         ${data.model ?? "-"}`);
-        console.log(`  ${chalk.bold("Mode:")}          ${data.mode ?? "-"}`);
-        console.log(`  ${chalk.bold("Concurrency:")}   ${data.concurrency ?? "-"}`);
-        console.log(`  ${chalk.bold("Current Load:")}  ${data.current_load ?? 0}`);
-        console.log(`  ${chalk.bold("Daily Spent:")}   $${(data.daily_spent_usd ?? 0).toFixed(2)} / $${(data.daily_limit_usd ?? 0).toFixed(2)}`);
-        console.log(`  ${chalk.bold("Total Earned:")}  $${(data.total_earned_usd ?? 0).toFixed(2)}`);
-        console.log(`  ${chalk.bold("Total Requests:")} ${data.total_requests ?? 0}`);
-        console.log(`  ${chalk.bold("Input Price:")}   $${data.price_input_per_m ?? "-"}/1M tokens`);
-        console.log(`  ${chalk.bold("Output Price:")}  $${data.price_output_per_m ?? "-"}/1M tokens`);
+        // Aggregate stats across all rows since users think of earnings /
+        // spend as account-level, not per-model.
+        const totalEarned = providers.reduce((s, p) => s + (p.total_earned_usd ?? 0), 0);
+        const totalRequests = providers.reduce((s, p) => s + (p.total_requests ?? 0), 0);
+        const totalDailySpent = providers.reduce((s, p) => s + (p.daily_spent_usd ?? 0), 0);
+        const totalDailyLimit = providers.reduce((s, p) => s + (p.daily_limit_usd ?? 0), 0);
+        // Per-provider rows — compact table with status/cli/model/load.
+        const header = `  ${"STATUS".padEnd(9)} ${"CLI".padEnd(12)} ${"MODEL".padEnd(30)} ${"LOAD".padEnd(8)} ${"EARNED".padEnd(10)}`;
+        console.log(chalk.bold(header));
+        console.log(chalk.dim("  " + "─".repeat(75)));
+        for (const p of providers) {
+            const statusRaw = (p.status ?? "-").padEnd(9);
+            const statusColored = p.status === "online"
+                ? chalk.green(statusRaw)
+                : p.status === "offline"
+                    ? chalk.dim(statusRaw)
+                    : chalk.yellow(statusRaw);
+            const cli = (p.cli_type ?? "-").padEnd(12);
+            const model = (p.model ?? "-").padEnd(30);
+            const load = `${p.current_load ?? 0}/${p.concurrency ?? "-"}`.padEnd(8);
+            const earned = `$${(p.total_earned_usd ?? 0).toFixed(2)}`.padEnd(10);
+            console.log(`  ${statusColored} ${cli} ${model} ${load} ${earned}`);
+        }
+        console.log("");
+        console.log(`  ${chalk.bold("Daily quota:")}  $${totalDailySpent.toFixed(2)} / $${totalDailyLimit.toFixed(2)}`);
+        console.log(`  ${chalk.bold("Total earned:")} $${totalEarned.toFixed(2)} (${totalRequests} requests)`);
     }
     catch (err) {
         spinner.fail(chalk.red("Failed to fetch status"));

package/package.json

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