clawmoney 0.9.3 → 0.9.5

package/dist/commands/hub.js

@@ -175,7 +175,10 @@ export async function hubCallCommand(options) {
                 process.exit(1);
             }
             // Extract payment_token from Worker response
-            const paymentToken = payResult.data?.payment_token;
+            // 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)}`));

package/dist/hub/executor.js

@@ -11,7 +11,7 @@ function buildPrompt(call, config) {
             .replace("{{skill}}", call.skill)
             .replace("{{input}}", JSON.stringify(call.input, null, 2));
     }
-    return [
+    const lines = [
         "You received a paid service request via ClawMoney Hub.",
         `Skill: ${call.skill}`,
         `Category: ${call.category}`,
@@ -19,10 +19,13 @@ function buildPrompt(call, config) {
         `Price: $${call.price}`,
         `Input: ${JSON.stringify(call.input, null, 2)}`,
         "",
-        "Execute this task and return the result as JSON.",
-        "If you generate any files (images, videos, etc.), save them and include their file paths in the output.",
-        "Return ONLY the JSON result, no other text.",
-    ].join("\n");
+    ];
+    // Category-specific instructions
+    if (call.category?.startsWith("generation/image")) {
+        lines.push("IMPORTANT: You MUST use an image generation tool (e.g. Gemini/Nano Banana image generation) to create a real image file.", "Do NOT write SVG, HTML, or any code to fake an image. If you do not have an image generation tool available, return {\"success\": false, \"error\": \"No image generation tool available\"}.", "Save the generated image and include the file path in your output.");
+    }
+    lines.push("Execute this task and return the result as JSON.", "If you generate any files (images, videos, etc.), save them and include their file paths in the output.", "Return ONLY the JSON result, no other text.");
+    return lines.join("\n");
 }
 // ── CLI execution (openclaw agent / claude -p) ──
 function runCli(command, prompt, timeoutMs, orderId) {
@@ -192,18 +195,54 @@ 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;
+                }
+                // Also extract file paths from nested result.files / result.primary_file
+                const allFiles = [...ocResult.files];
+                const nested = output.result;
+                if (nested && typeof nested === "object") {
+                    const nestedFiles = nested.files;
+                    if (Array.isArray(nestedFiles)) {
+                        for (const f of nestedFiles) {
+                            if (typeof f === "string" && f.startsWith("/") && !allFiles.includes(f)) {
+                                allFiles.push(f);
+                            }
+                        }
+                    }
+                    for (const key of ["primary_file", "image_path", "file_path"]) {
+                        const val = nested[key];
+                        if (typeof val === "string" && val.startsWith("/") && !allFiles.includes(val)) {
+                            allFiles.push(val);
+                        }
+                    }
+                }
                 // Upload local files to R2
-                for (const filePath of ocResult.files) {
+                for (const filePath of allFiles) {
                     const cdnUrl = await uploadFile(filePath, this.config);
                     if (cdnUrl) {
-                        // Replace local path with CDN URL in output
-                        const currentFiles = output.files ?? [];
-                        const idx = currentFiles.indexOf(filePath);
-                        if (idx >= 0) {
-                            currentFiles[idx] = cdnUrl;
-                            output.files = currentFiles;
+                        // Replace local path with CDN URL in output (top-level and nested)
+                        const replaceInArray = (arr) => {
+                            const idx = arr.indexOf(filePath);
+                            if (idx >= 0)
+                                arr[idx] = cdnUrl;
+                        };
+                        if (Array.isArray(output.files))
+                            replaceInArray(output.files);
+                        if (nested && Array.isArray(nested.files)) {
+                            replaceInArray(nested.files);
+                        }
+                        if (nested && nested.primary_file === filePath) {
+                            nested.primary_file = cdnUrl;
                         }
-                        // Also set a convenience url key
+                        // Set convenience url key
                         if (!output.image_url && filePath.match(/\.(png|jpg|jpeg|webp|gif)$/i)) {
                             output.image_url = cdnUrl;
                         }
@@ -212,6 +251,20 @@ export class Executor {
                         }
                     }
                 }
+                // Validate: generation/image must produce real image files, not SVG/code
+                if (call.category?.startsWith("generation/image")) {
+                    const hasRealImage = allFiles.some((f) => /\.(png|jpg|jpeg|webp|gif)$/i.test(f));
+                    if (!hasRealImage) {
+                        const errMsg = "No real image generated. Image generation tool may not be available.";
+                        logger.error(`Validation failed for order=${call.order_id}: ${errMsg}`);
+                        this.send({
+                            event: "deliver",
+                            order_id: call.order_id,
+                            error: errMsg,
+                        });
+                        return;
+                    }
+                }
                 // Attach compact meta
                 if (ocResult.meta) {
                     output._meta = ocResult.meta;

package/package.json

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