clawmoney 0.9.2 → 0.9.4

package/dist/commands/hub.js

@@ -4,7 +4,7 @@ import { homedir } from "node:os";
 import chalk from "chalk";
 import ora from "ora";
 import { requireConfig } from "../utils/config.js";
-import { apiGet, apiPost, getApiBase } from "../utils/api.js";
+import { apiGet, apiPost } from "../utils/api.js";
 import { awalExec } from "../utils/awal.js";
 import { readPid, isPidAlive, removePid } from "../hub/provider.js";
 const LOG_FILE = join(homedir(), ".clawmoney", "provider.log");
@@ -157,10 +157,15 @@ export async function hubCallCommand(options) {
     const spinner = ora(`Calling ${options.agent}/${options.skill}...`).start();
     try {
         if (options.pay) {
-            // x402 payment: two steps
-            // Step 1: Pay via x402 to the payment endpoint (USDC → PaySplitter)
-            spinner.text = `Paying for ${options.agent}/${options.skill} via x402...`;
-            const payUrl = `${getApiBase()}/api/v1/hub/gateway/pay?agent_id=${encodeURIComponent(options.agent)}&skill=${encodeURIComponent(options.skill)}`;
+            // x402 payment flow via pay.clawmoney.ai Worker
+            // Step 1: Look up skill price
+            spinner.text = `Looking up price for ${options.agent}/${options.skill}...`;
+            const searchResp = await apiGet(`/api/v1/hub/skills/search?q=${encodeURIComponent(options.skill)}&agent_slug=${encodeURIComponent(options.agent)}&limit=1`);
+            const skills = searchResp.data?.data ?? [];
+            const skillPrice = skills[0]?.price ?? 0.01;
+            // Step 2: Pay via awal x402 → pay.clawmoney.ai Worker
+            spinner.text = `Paying $${skillPrice} USDC for ${options.agent}/${options.skill}...`;
+            const payUrl = `https://pay.clawmoney.ai/hub/${encodeURIComponent(options.agent)}/${encodeURIComponent(options.skill)}?price=${skillPrice}`;
             let payResult;
             try {
                 payResult = await awalExec(["x402", "pay", payUrl]);
@@ -169,13 +174,24 @@ export async function hubCallCommand(options) {
                 spinner.fail(chalk.red(`Payment failed: ${err.message}`));
                 process.exit(1);
             }
-            // Step 2: Call invoke with ledger (payment already settled on-chain)
+            // Extract payment_token from Worker response
+            // awal returns {status, statusText, data: {payment_token, ...}, headers}
+            const payData = payResult.data;
+            const innerData = payData.data ?? payData;
+            const paymentToken = innerData.payment_token ?? payData.payment_token;
+            if (!paymentToken) {
+                spinner.fail(chalk.red("Payment succeeded but no payment_token returned"));
+                console.error(chalk.dim(`  Raw response: ${JSON.stringify(payResult.data).slice(0, 200)}`));
+                process.exit(1);
+            }
+            // Step 3: Invoke with payment_token
             spinner.text = `Executing ${options.agent}/${options.skill}...`;
             const qs = new URLSearchParams({
                 agent_id: options.agent,
                 skill: options.skill,
                 timeout: String(timeout),
-                payment_method: "ledger",
+                payment_method: "x402",
+                payment_token: paymentToken,
             });
             const resp = await apiPost(`/api/v1/hub/gateway/invoke?${qs}`, inputData, config.api_key);
             if (!resp.ok) {
@@ -191,8 +207,7 @@ export async function hubCallCommand(options) {
             console.log("");
             console.log(`  ${chalk.bold("Order:")}    ${result.id ?? "-"}`);
             console.log(`  ${chalk.bold("Duration:")} ${typeof result.duration === "number" ? result.duration.toFixed(1) + "s" : "-"}`);
-            console.log(`  ${chalk.bold("Cost:")}     $${typeof result.price === "number" ? result.price.toFixed(3) : "-"} (USDC)`);
-            console.log(`  ${chalk.bold("Payment:")} ${JSON.stringify(payResult.data).slice(0, 100)}`);
+            console.log(`  ${chalk.bold("Cost:")}     $${skillPrice} USDC`);
             console.log("");
             console.log(chalk.bold("  Output:"));
             console.log(chalk.cyan("  " + JSON.stringify(result.output_data ?? result.output ?? {}, null, 2).replace(/\n/g, "\n  ")));

package/dist/hub/executor.js

@@ -192,6 +192,16 @@ export class Executor {
                 // Parse OpenClaw's response format: { payloads, meta }
                 const ocResult = parseOpenClawResponse(parsed);
                 output = ocResult.result;
+                // Check if the agent explicitly reported failure
+                if (output.success === false && typeof output.error === "string") {
+                    logger.error(`Agent reported failure for order=${call.order_id}: ${output.error}`);
+                    this.send({
+                        event: "deliver",
+                        order_id: call.order_id,
+                        error: output.error.slice(0, 2000),
+                    });
+                    return;
+                }
                 // Upload local files to R2
                 for (const filePath of ocResult.files) {
                     const cdnUrl = await uploadFile(filePath, this.config);

package/package.json

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