clawmoney 0.9.4 → 0.9.6

package/dist/commands/hub.js

@@ -141,6 +141,28 @@ export async function hubSearchCommand(options) {
         throw err;
     }
 }
+// ── poll order result ──
+async function pollOrderResult(orderId, apiKey, timeoutS, spinner) {
+    const POLL_INTERVAL = 3000;
+    const deadline = Date.now() + timeoutS * 1000;
+    while (Date.now() < deadline) {
+        const resp = await apiGet(`/api/v1/hub/orders/${orderId}`, apiKey);
+        if (!resp.ok) {
+            throw new Error(`Failed to poll order: ${resp.status}`);
+        }
+        const order = resp.data;
+        const status = order.status;
+        if (status === "completed") {
+            return order;
+        }
+        if (status === "failed" || status === "timeout") {
+            throw new Error(order.error_message || `Order ${status}`);
+        }
+        spinner.text = `Waiting for result... (${Math.round((deadline - Date.now()) / 1000)}s left)`;
+        await new Promise((r) => setTimeout(r, POLL_INTERVAL));
+    }
+    throw new Error("Timed out waiting for result");
+}
 export async function hubCallCommand(options) {
     const config = requireConfig();
     let inputData = {};
@@ -202,7 +224,11 @@ export async function hubCallCommand(options) {
                 spinner.fail(chalk.red(`Call failed (${resp.status}): ${detail}`));
                 process.exit(1);
             }
-            const result = resp.data;
+            const invokeResult = resp.data;
+            const orderId = invokeResult.id;
+            spinner.text = `Order ${orderId?.slice(0, 8)}... submitted, waiting for result...`;
+            // Poll for completion
+            const result = await pollOrderResult(orderId, config.api_key, timeout, spinner);
             spinner.succeed(chalk.green("Call completed (x402 paid)!"));
             console.log("");
             console.log(`  ${chalk.bold("Order:")}    ${result.id ?? "-"}`);
@@ -229,7 +255,11 @@ export async function hubCallCommand(options) {
                 spinner.fail(chalk.red(`Call failed (${resp.status}): ${detail}`));
                 process.exit(1);
             }
-            const result = resp.data;
+            const invokeResult = resp.data;
+            const orderId = invokeResult.id;
+            spinner.text = `Order ${orderId?.slice(0, 8)}... submitted, waiting for result...`;
+            // Poll for completion
+            const result = await pollOrderResult(orderId, config.api_key, timeout, spinner);
             spinner.succeed(chalk.green("Call completed!"));
             console.log("");
             console.log(`  ${chalk.bold("Order:")}    ${result.id ?? "-"}`);

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) {
@@ -202,18 +205,44 @@ export class Executor {
                     });
                     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;
                         }
@@ -222,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/dist/index.js

@@ -7,11 +7,14 @@ 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, } from './commands/hub.js';
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
+const pkg = require('../package.json');
 const program = new Command();
 program
     .name('clawmoney')
     .description('ClawMoney CLI -- Earn rewards with your AI agent')
-    .version('0.9.2');
+    .version(pkg.version);
 // setup
 program
     .command('setup')

package/package.json

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