clawmoney 0.15.21 → 0.15.23

package/dist/commands/relay-setup.js

@@ -5,7 +5,8 @@ import { join } from "node:path";
 import { intro, outro, multiselect, confirm, select, spinner, isCancel, cancel, log, } from "@clack/prompts";
 import chalk from "chalk";
 import { apiPost } from "../utils/api.js";
-import { requireConfig } from "../utils/config.js";
+import { loadConfig, requireConfig } from "../utils/config.js";
+import { setupCommand } from "./setup.js";
 import { API_PRICES, RELAY_DISCOUNT, PLATFORM_FEE } from "../relay/pricing.js";
 // ── Per-cli_type model catalogs ──
 //
@@ -119,9 +120,6 @@ function detectInstalledClis() {
     return results;
 }
 // ── Helpers ──
-function formatPrice(input, output) {
-    return `$${input}/$${output} per 1M`;
-}
 function formatBuyerPrice(input, output) {
     const buyerInput = (input * RELAY_DISCOUNT).toFixed(3);
     const buyerOutput = (output * RELAY_DISCOUNT).toFixed(3);
@@ -129,6 +127,27 @@ function formatBuyerPrice(input, output) {
 }
 // ── Main command ──
 export async function relaySetupCommand() {
+    // ── Step 0: ensure the agent is logged in ──
+    //
+    // Relay setup relies on an ACTIVE ClawMoney agent (api_key + agent_id
+    // in ~/.clawmoney/config.yaml) to register provider rows and to auth
+    // the daemon's WS connection. If the user runs `clawmoney relay setup`
+    // before ever running `clawmoney setup`, we inline the login flow
+    // here instead of throwing a raw "No config found" error. The nested
+    // setupCommand uses its own ora/prompt UI — visually different from
+    // the clack wizard below, but that's acceptable since it only runs on
+    // the first-time-user path.
+    let existing = loadConfig();
+    if (!existing) {
+        console.log(chalk.yellow("\n  You're not logged in yet — running `clawmoney setup` first.\n"));
+        await setupCommand();
+        existing = loadConfig();
+        if (!existing) {
+            console.log(chalk.red("\n  Login did not complete. Run `clawmoney setup` manually, then re-run `clawmoney relay setup`.\n"));
+            process.exit(1);
+        }
+        console.log("");
+    }
     const config = requireConfig();
     intro(chalk.cyan(" ClawMoney Relay Setup "));
     log.message("Sell your spare Claude Max / ChatGPT Pro / Google subscription capacity to other AI agents.");
@@ -173,44 +192,15 @@ export async function relaySetupCommand() {
     for (const cli of selectedClis) {
         const allModels = modelsForCli(cli);
         const recommended = (RECOMMENDED_MODELS[cli] ?? []).filter((m) => allModels.includes(m));
-        if (allModels.length === 0) {
-            log.warn(`${cli}: no models found in pricing table — skipping`);
+        if (allModels.length === 0 || recommended.length === 0) {
+            log.warn(`${cli}: no recommended models found — skipping`);
             continue;
         }
-        log.step(`${chalk.bold(cli)}: choose models`);
-        const useRecommended = await confirm({
-            message: `Register the ${recommended.length} recommended ${cli} models? (${recommended.join(", ")})`,
-            initialValue: true,
-        });
-        if (isCancel(useRecommended)) {
-            cancel("Setup cancelled");
-            process.exit(0);
-        }
-        let chosen;
-        if (useRecommended) {
-            chosen = recommended;
-        }
-        else {
-            const picked = await multiselect({
-                message: `Pick ${cli} models to register:`,
-                options: allModels.map((m) => {
-                    const p = API_PRICES[m];
-                    return {
-                        value: m,
-                        label: m,
-                        hint: formatPrice(p.input, p.output),
-                    };
-                }),
-                initialValues: recommended,
-                required: true,
-            });
-            if (isCancel(picked)) {
-                cancel("Setup cancelled");
-                process.exit(0);
-            }
-            chosen = picked;
+        log.step(`${chalk.bold(cli)}: auto-registering ${recommended.length} recommended models`);
+        for (const m of recommended) {
+            log.message(chalk.dim(`    · ${m}`));
         }
-        for (const model of chosen) {
+        for (const model of recommended) {
             const p = API_PRICES[model];
             registrations.push({
                 cli,

package/package.json

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