clawmoney 0.5.0 → 0.7.0

package/dist/commands/hire.d.ts

@@ -1,10 +1,14 @@
 interface SubmitOptions {
     url: string;
+    platform?: string;
     text?: string;
 }
 interface VerifyOptions {
     witness?: boolean;
+    relevance: string;
+    quality: string;
+    vote?: string;
 }
 export declare function hireSubmitCommand(taskId: string, options: SubmitOptions): Promise<void>;
-export declare function hireVerifyCommand(taskId: string, options: VerifyOptions): Promise<void>;
+export declare function hireVerifyCommand(submissionId: string, options: VerifyOptions): Promise<void>;
 export {};

package/dist/commands/hire.js

@@ -1,33 +1,44 @@
 import chalk from 'chalk';
 import ora from 'ora';
-import { apiPost } from '../utils/api.js';
+import { apiGet, apiPost } from '../utils/api.js';
 import { awalExec } from '../utils/awal.js';
 import { requireConfig } from '../utils/config.js';
-import { prompt, confirm } from '../utils/prompt.js';
 export async function hireSubmitCommand(taskId, options) {
     const config = requireConfig();
+    // 自动检测平台（从 task 获取）
+    let platform = options.platform;
+    if (!platform) {
+        try {
+            const taskResp = await apiGet(`/api/v1/hire/${taskId}`, config.api_key);
+            if (taskResp.ok && taskResp.data.platform) {
+                platform = taskResp.data.platform;
+            }
+        }
+        catch { /* ignore */ }
+    }
+    if (!platform)
+        platform = 'twitter';
     console.log('');
-    const spinner = ora(`Submitting proof for task ${taskId}...`).start();
+    const spinner = ora(`Submitting proof for task ${taskId.slice(0, 8)}...`).start();
     try {
         const body = {
+            platform,
             proof_url: options.url,
         };
         if (options.text) {
-            body.content = options.text;
+            body.content_text = options.text;
         }
         const resp = await apiPost(`/api/v1/hire/${taskId}/submit`, body, config.api_key);
         if (!resp.ok) {
             spinner.fail('Submission failed');
-            console.error(chalk.red(JSON.stringify(resp.data)));
+            const detail = typeof resp.data === 'object' ? (resp.data.detail || JSON.stringify(resp.data)) : String(resp.data);
+            console.error(chalk.red(`  ${detail}`));
             return;
         }
-        spinner.succeed('Proof submitted successfully');
+        spinner.succeed('Proof submitted');
         if (resp.data.id) {
             console.log(chalk.dim(`  Submission ID: ${resp.data.id}`));
         }
-        if (resp.data.message) {
-            console.log(chalk.dim(`  ${resp.data.message}`));
-        }
     }
     catch (err) {
         spinner.fail('Submission failed');
@@ -35,69 +46,118 @@ export async function hireSubmitCommand(taskId, options) {
     }
     console.log('');
 }
-export async function hireVerifyCommand(taskId, options) {
+export async function hireVerifyCommand(submissionId, options) {
     const config = requireConfig();
     console.log('');
     if (options.witness) {
-        // Witness verification via x402
-        const tweetUrl = await prompt(chalk.cyan('? ') + 'Enter the tweet URL to verify: ');
-        if (!tweetUrl) {
-            console.log(chalk.red('Tweet URL is required for witness verification.'));
-            return;
+        // Get submission to extract proof_url
+        const subSpinner = ora('Fetching submission...').start();
+        let proofUrl = '';
+        try {
+            // Try to get submission details - submissionId might be used directly
+            const resp = await apiGet(`/api/v1/hire/submissions/${submissionId}`, config.api_key);
+            if (resp.ok && resp.data.proof_url) {
+                proofUrl = resp.data.proof_url;
+                subSpinner.succeed(`Proof URL: ${proofUrl}`);
+            }
+            else {
+                subSpinner.warn('Could not fetch submission, will need tweet ID');
+            }
         }
-        // Extract tweet ID from URL
-        const tweetIdMatch = tweetUrl.match(/status\/(\d+)/);
-        if (!tweetIdMatch) {
-            console.log(chalk.red('Could not extract tweet ID from URL.'));
+        catch {
+            subSpinner.warn('Could not fetch submission');
+        }
+        // Extract tweet ID
+        let tweetId = '';
+        if (proofUrl) {
+            const match = proofUrl.match(/status\/(\d+)/);
+            if (match)
+                tweetId = match[1];
+        }
+        if (!tweetId) {
+            console.error(chalk.red('  Could not extract tweet ID from proof URL'));
             return;
         }
-        const tweetId = tweetIdMatch[1];
-        const witnessSpinner = ora('Paying for witness verification via x402...').start();
+        // Fetch witness proof via x402
+        const witnessSpinner = ora('Fetching witness proof via x402 ($0.01)...').start();
+        let witnessData;
         try {
-            const witnessResult = await awalExec([
-                'x402',
-                'pay',
-                `https://witness.bnbot.ai/x/${tweetId}`,
+            witnessData = await awalExec([
+                'x402', 'pay', `https://witness.bnbot.ai/x/${tweetId}`,
             ]);
-            witnessSpinner.succeed('Witness verification paid');
-            console.log(chalk.dim(`  Response: ${JSON.stringify(witnessResult.data)}`));
-            // Submit the witness proof
-            const submitSpinner = ora('Submitting witness proof...').start();
-            const resp = await apiPost(`/api/v1/hire/${taskId}/verify`, {
-                type: 'witness',
-                tweet_id: tweetId,
-                witness_data: witnessResult.data,
+            witnessSpinner.succeed('Witness proof obtained');
+        }
+        catch (err) {
+            witnessSpinner.fail('Witness fetch failed');
+            console.error(chalk.red(err.message));
+            return;
+        }
+        // Parse witness response
+        const proof = witnessData?.data?.proof || witnessData?.proof;
+        if (!proof) {
+            console.error(chalk.red('  No proof in witness response'));
+            console.log(chalk.dim(`  Raw: ${JSON.stringify(witnessData).slice(0, 200)}`));
+            return;
+        }
+        // Submit witness verification
+        const vote = options.vote || 'approve';
+        const relevanceScore = parseInt(options.relevance, 10);
+        const qualityScore = parseInt(options.quality, 10);
+        const verifySpinner = ora(`Submitting witness verification (${vote}, R:${relevanceScore} Q:${qualityScore})...`).start();
+        try {
+            const resp = await apiPost(`/api/v1/hire/submissions/${submissionId}/verify`, {
+                vote,
+                relevance_score: relevanceScore,
+                quality_score: qualityScore,
+                tweet_proof: {
+                    payload: proof.payload,
+                    signature: proof.signature,
+                    signer: proof.signer,
+                    timestamp: proof.timestamp,
+                },
             }, config.api_key);
             if (!resp.ok) {
-                submitSpinner.fail('Witness verification submission failed');
-                console.error(chalk.red(JSON.stringify(resp.data)));
+                verifySpinner.fail('Verification failed');
+                const detail = typeof resp.data === 'object' ? (resp.data.detail || JSON.stringify(resp.data)) : String(resp.data);
+                console.error(chalk.red(`  ${detail}`));
             }
             else {
-                submitSpinner.succeed('Witness verification submitted');
+                verifySpinner.succeed('Witness verification submitted');
+                if (resp.data.id) {
+                    console.log(chalk.dim(`  Verification ID: ${resp.data.id}`));
+                }
             }
         }
         catch (err) {
-            witnessSpinner.fail('Witness verification failed');
+            verifySpinner.fail('Verification failed');
             console.error(chalk.red(err.message));
         }
     }
     else {
         // Manual verification
-        console.log(chalk.bold(`  Manual verification for task ${taskId}`));
-        console.log('');
-        const approved = await confirm('Approve this submission?', false);
-        const spinner = ora('Submitting verification...').start();
+        const vote = options.vote || 'approve';
+        const relevanceScore = parseInt(options.relevance, 10);
+        const qualityScore = parseInt(options.quality, 10);
+        const spinner = ora(`Submitting manual verification (${vote}, R:${relevanceScore} Q:${qualityScore})...`).start();
         try {
-            const resp = await apiPost(`/api/v1/hire/${taskId}/verify`, {
-                type: 'manual',
-                approved,
+            const resp = await apiPost(`/api/v1/hire/submissions/${submissionId}/verify`, {
+                vote,
+                relevance_score: relevanceScore,
+                quality_score: qualityScore,
+                views: 0,
+                likes: 0,
+                comments: 0,
             }, config.api_key);
             if (!resp.ok) {
-                spinner.fail('Verification submission failed');
-                console.error(chalk.red(JSON.stringify(resp.data)));
+                spinner.fail('Verification failed');
+                const detail = typeof resp.data === 'object' ? (resp.data.detail || JSON.stringify(resp.data)) : String(resp.data);
+                console.error(chalk.red(`  ${detail}`));
             }
             else {
-                spinner.succeed(`Verification submitted: ${approved ? 'APPROVED' : 'REJECTED'}`);
+                spinner.succeed('Manual verification submitted');
+                if (resp.data.id) {
+                    console.log(chalk.dim(`  Verification ID: ${resp.data.id}`));
+                }
             }
         }
         catch (err) {

package/dist/index.js

@@ -45,6 +45,7 @@ hire
     .command('submit <task-id>')
     .description('Submit a proof for a hire task')
     .requiredOption('-u, --url <url>', 'Proof URL (tweet, post, etc.)')
+    .option('-p, --platform <platform>', 'Platform (auto-detected from task)')
     .option('--text <content>', 'Optional text content')
     .action(async (taskId, options) => {
     try {
@@ -56,9 +57,12 @@ hire
     }
 });
 hire
-    .command('verify <task-id>')
-    .description('Verify a hire task submission')
-    .option('-w, --witness', 'Use x402 witness verification')
+    .command('verify <submission-id>')
+    .description('Verify a hire submission')
+    .option('-w, --witness', 'Use x402 witness verification ($0.01)')
+    .requiredOption('-r, --relevance <score>', 'Relevance score (1-10)')
+    .requiredOption('-q, --quality <score>', 'Quality score (1-10)')
+    .option('-v, --vote <vote>', 'Vote: approve or reject', 'approve')
     .action(async (taskId, options) => {
     try {
         await hireVerifyCommand(taskId, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawmoney",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "ClawMoney CLI -- Earn crypto with your AI agent",
   "type": "module",
   "bin": {