clawmoney 0.15.30 → 0.15.32

package/dist/commands/relay-setup.js

@@ -195,7 +195,7 @@ export async function relaySetupCommand() {
             log.warn(`${cli}: no recommended models found — skipping`);
             continue;
         }
-        log.step(`${chalk.bold(cli)}: ${recommended.length} models ${chalk.dim("— " + recommended.join(", "))}`);
+        log.success(`${chalk.bold(cli)}: ${recommended.length} models ${chalk.dim("— " + recommended.join(", "))}`);
         for (const model of recommended) {
             const p = API_PRICES[model];
             registrations.push({
@@ -285,47 +285,50 @@ export async function relaySetupCommand() {
         15: "~25%", 30: "~50%", 45: "~75%", 60: "~100%",
     };
     const earnPct = Math.round((1 - PLATFORM_FEE) * 100);
+    // Single batch POST — one round-trip, one DB session, no
+    // client-side fan-out. The earlier sequential loop paid 7× the
+    // TLS/bcrypt/CF overhead, and parallelizing with Promise.all
+    // tripped over client- or proxy-level concurrency limits on some
+    // machines. Batch endpoint is the right architecture.
     let succeeded = 0;
     let failed = 0;
     const failures = [];
     const regSpin = spinner();
     regSpin.start(`Registering ${registrations.length} providers...`);
-    for (const r of registrations) {
-        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) {
-                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")) {
-                    succeeded++;
-                }
-                else {
-                    failed++;
-                    failures.push({ cli: r.cli, model: r.model, error: detail });
-                }
-            }
+    const batchBody = {
+        providers: registrations.map((r) => ({
+            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 resp = await apiPost("/api/v1/relay/providers/batch", batchBody, config.api_key);
+        if (!resp.ok) {
+            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);
+            regSpin.stop(chalk.red(`✗ Batch registration failed: ${detail}`));
+            cancel("Setup aborted");
+            process.exit(1);
         }
-        catch (err) {
-            const msg = err.message;
-            failed++;
-            failures.push({ cli: r.cli, model: r.model, error: msg });
+        // Per-row counts from the batch result.
+        succeeded = (resp.data.created?.length ?? 0) + (resp.data.skipped?.length ?? 0);
+        failed = resp.data.failed?.length ?? 0;
+        for (const f of resp.data.failed ?? []) {
+            failures.push({ cli: f.cli_type, model: f.model, error: f.error });
         }
     }
+    catch (err) {
+        regSpin.stop(chalk.red(`✗ Batch registration failed: ${err.message}`));
+        cancel("Setup aborted");
+        process.exit(1);
+    }
     if (failed === 0) {
         regSpin.stop(`${chalk.green(`✓ ${succeeded} providers registered`)}  ` +
             chalk.dim(`(${limitLabel[dailyLimit] ?? `$${dailyLimit}`} quota share · you earn ~${earnPct}%)`));
@@ -362,11 +365,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.d.ts

@@ -12,6 +12,10 @@ export declare function relayStartCommand(options: {
     cli?: string;
 }): Promise<void>;
 export declare function relayStopCommand(): Promise<void>;
+export declare function relayLogsCommand(options: {
+    follow?: boolean;
+    lines?: string;
+}): Promise<void>;
 export declare function relayStatusCommand(): Promise<void>;
 export declare function relayModelsCommand(): Promise<void>;
 export declare function relayCreditsCommand(): Promise<void>;

package/dist/commands/relay.js

@@ -192,6 +192,32 @@ export async function relayStopCommand() {
     await new Promise((resolve) => setTimeout(resolve, 500));
     removeRelayPid();
 }
+// ── relay logs ──
+export async function relayLogsCommand(options) {
+    const { existsSync } = await import("node:fs");
+    const { spawn } = await import("node:child_process");
+    if (!existsSync(LOG_FILE)) {
+        console.log(chalk.dim(`No log file yet at ${LOG_FILE}`));
+        console.log(chalk.dim("Start the daemon first: clawmoney relay start"));
+        return;
+    }
+    // Default: tail -f the last 50 lines. Use system `tail` rather than
+    // reimplementing it in Node — it's just a debug helper, not worth
+    // a pure-JS reinvention.
+    const nLines = options.lines ?? "50";
+    const args = ["-n", nLines];
+    if (options.follow !== false) {
+        args.push("-f");
+    }
+    args.push(LOG_FILE);
+    const child = spawn("tail", args, { stdio: "inherit" });
+    child.on("exit", (code) => {
+        process.exit(code ?? 0);
+    });
+    // Ctrl-C inside `tail -f` kills tail but returns us here; propagate
+    // the exit code so the wrapper looks transparent.
+    process.on("SIGINT", () => child.kill("SIGINT"));
+}
 export async function relayStatusCommand() {
     const config = requireConfig();
     // Local process status
@@ -206,36 +232,78 @@ 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;
+        }
+        // Group rows by cli_type so `claude-*` lines stay together, then
+        // `codex-*`, then `gemini-*`, then `antigravity-*`. Within a family
+        // we sort by model name so the ordering is stable across calls.
+        const CLI_ORDER = ["claude", "codex", "gemini", "antigravity"];
+        providers.sort((a, b) => {
+            const ai = CLI_ORDER.indexOf(a.cli_type ?? "");
+            const bi = CLI_ORDER.indexOf(b.cli_type ?? "");
+            const aRank = ai === -1 ? CLI_ORDER.length : ai;
+            const bRank = bi === -1 ? CLI_ORDER.length : bi;
+            if (aRank !== bRank)
+                return aRank - bRank;
+            return (a.model ?? "").localeCompare(b.model ?? "");
+        });
+        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/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, } from './commands/relay.js';
+import { relayRegisterCommand, relayStartCommand, relayStopCommand, relayStatusCommand, relayModelsCommand, relayCreditsCommand, relayLogsCommand, } from './commands/relay.js';
 import { antigravityLoginCommand, antigravityStatusCommand, } from './commands/antigravity.js';
 import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
@@ -527,6 +527,20 @@ relay
         process.exit(1);
     }
 });
+relay
+    .command('logs')
+    .description('Tail the daemon log in real time (like `tail -f ~/.clawmoney/relay.log`)')
+    .option('-n, --lines <n>', 'Lines of history to show before following', '50')
+    .option('--no-follow', "Print and exit instead of following")
+    .action(async (options) => {
+    try {
+        await relayLogsCommand(options);
+    }
+    catch (err) {
+        console.error(err.message);
+        process.exit(1);
+    }
+});
 relay
     .command('models')
     .description('List available relay models')

package/package.json

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