payment-skill 1.1.17 → 1.1.19

package/src/cli.ts

@@ -24,7 +24,7 @@ const program = new Command();
 
 program
   .name('payment-skill')
-  .description('Self-hosted payment orchestration for OpenClaw')
+  .description('Self-hosted payment skill for OpenClaw')
   .version('1.0.0')
   .option('-v, --verbose', 'Enable verbose output')
   .option('-j, --json', 'Output in JSON format')

package/src/commands/config.ts

@@ -14,8 +14,45 @@ export const configCommands = new Command('config')
 configCommands
   .command('get')
   .description('Get configuration value')
-  .argument('<key>', 'Configuration key')
+  .argument('<key>', 'Configuration key (e.g., providers.wise.environment)')
   .action((key) => {
+    // Handle provider-specific keys
+    if (key.startsWith('providers.')) {
+      const parts = key.split('.');
+      const providerName = parts[1];
+      const providerKey = parts[2];
+      
+      const provider = configManager.getProvider(providerName);
+      if (provider && providerKey) {
+        const value = (provider as any)[providerKey];
+        if (value !== undefined) {
+          console.log(JSON.stringify(value, null, 2));
+          return;
+        }
+      }
+      console.log(chalk.yellow(`Key '${key}' not found`));
+      return;
+    }
+    
+    // Handle nested keys
+    if (key.includes('.')) {
+      const parts = key.split('.');
+      const config = configManager.getConfig();
+      let current = config;
+      
+      for (const part of parts) {
+        if (current && typeof current === 'object' && part in current) {
+          current = current[part];
+        } else {
+          console.log(chalk.yellow(`Key '${key}' not found`));
+          return;
+        }
+      }
+      console.log(JSON.stringify(current, null, 2));
+      return;
+    }
+    
+    // Simple key
     const config = configManager.getConfig();
     const value = config[key];
     if (value !== undefined) {
@@ -31,39 +68,47 @@ configCommands
   .argument('<key>', 'Configuration key (e.g., providers.wise.environment)')
   .argument('<value>', 'Configuration value')
   .action((key, value) => {
-    const setNestedValue = (obj: any, keys: string[], val: any) => {
-      let current = obj;
-      for (let i = 0; i < keys.length - 1; i++) {
-        if (!current[keys[i]]) current[keys[i]] = {};
-        current = current[keys[i]];
-      }
-      current[keys[keys.length - 1]] = val;
-    };
-    
+    // Parse the value (try JSON first, then use as string)
+    let parsedValue: any;
     try {
-      const parsedValue = JSON.parse(value);
-      const config = configManager.getConfig();
+      parsedValue = JSON.parse(value);
+    } catch {
+      parsedValue = value;
+    }
+    
+    // Handle nested keys like providers.wise.environment
+    if (key.startsWith('providers.')) {
+      const parts = key.split('.');
+      const providerName = parts[1];
+      const providerKey = parts[2];
       
-      if (key.includes('.')) {
-        const parts = key.split('.');
-        setNestedValue(config, parts, parsedValue);
-        configManager.setConfig(parts[0], config[parts[0]]);
-      } else {
-        configManager.setConfig(key, parsedValue);
-      }
+      const provider = configManager.getProvider(providerName) || { name: providerName };
+      (provider as any)[providerKey] = parsedValue;
+      configManager.setProvider(providerName, provider as any);
       console.log(chalk.green(`✓ Set ${key} = ${value}`));
-    } catch {
+      return;
+    }
+    
+    // Handle other nested keys
+    if (key.includes('.')) {
+      const parts = key.split('.');
       const config = configManager.getConfig();
+      let current = config;
       
-      if (key.includes('.')) {
-        const parts = key.split('.');
-        setNestedValue(config, parts, value);
-        configManager.setConfig(parts[0], config[parts[0]]);
-      } else {
-        configManager.setConfig(key, value);
+      for (let i = 0; i < parts.length - 1; i++) {
+        if (!current[parts[i]]) current[parts[i]] = {};
+        current = current[parts[i]];
       }
+      current[parts[parts.length - 1]] = parsedValue;
+      
+      configManager.setConfig(parts[0], config[parts[0]]);
       console.log(chalk.green(`✓ Set ${key} = ${value}`));
+      return;
     }
+    
+    // Simple key
+    configManager.setConfig(key, parsedValue);
+    console.log(chalk.green(`✓ Set ${key} = ${value}`));
   });
 
 configCommands

package/src/commands/wise.ts

@@ -113,11 +113,16 @@ wiseCommands
       const client = new WiseClient(config as any);
       const profileId = options.profile || config.profileId;
       
+      const txnId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+        var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+      });
       const transfer = await client.createTransfer(
         profileId,
         options.quote,
         options.recipient,
-        options.reference
+        options.reference,
+        txnId
       );
       
       transactionManager.updateTransactionStatus(tx.id, 'initiated');
@@ -170,6 +175,43 @@ wiseCommands
     }
   });
 
+// Create recipient
+wiseCommands
+  .command('create-recipient')
+  .description('Create a recipient account')
+  .requiredOption('-n, --name <name>', 'Account holder name')
+  .requiredOption('-c, --currency <currency>', 'Currency (EUR, USD, etc)')
+  .requiredOption('--iban <iban>', 'IBAN number')
+  .option('-p, --profile <id>', 'Profile ID')
+  .action(async (options) => {
+    const spinner = ora('Creating recipient...').start();
+    try {
+      const config = configManager.getProvider('wise');
+      if (!config) {
+        throw new Error('Wise not configured');
+      }
+      
+      const client = new WiseClient(config as any);
+      const profileId = options.profile || config.profileId;
+      
+      const recipient = await client.createRecipient(
+        profileId,
+        options.currency,
+        options.name,
+        { iban: options.iban }
+      );
+      
+      spinner.stop();
+      console.log(chalk.green('✓ Recipient created'));
+      console.log(`  ID: ${recipient.id}`);
+      console.log(`  Name: ${recipient.accountHolderName}`);
+      console.log(`  IBAN: ${recipient.details.iban}`);
+    } catch (error: any) {
+      spinner.fail(error.message);
+      process.exit(1);
+    }
+  });
+
 // List transfers
 wiseCommands
   .command('list')

package/src/core/config.ts

@@ -15,7 +15,15 @@ import {
   BunqConfig 
 } from '../types';
 
-const CONFIG_DIR = path.join(process.env.HOME || process.env.USERPROFILE || '.', '.payment-skill');
+// Support both old location (~/.payment-skill) and new location (./data)
+const OLD_CONFIG_DIR = path.join(process.env.HOME || process.env.USERPROFILE || '.', '.payment-skill');
+const NEW_CONFIG_DIR = path.join(__dirname, '..', '..', 'data');
+
+// Use new location if it exists and has config, otherwise fall back to old location
+const CONFIG_DIR = fs.existsSync(path.join(NEW_CONFIG_DIR, 'config.json')) 
+  ? NEW_CONFIG_DIR 
+  : (fs.existsSync(OLD_CONFIG_DIR) ? OLD_CONFIG_DIR : NEW_CONFIG_DIR);
+
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
 const EMERGENCY_FILE = path.join(CONFIG_DIR, 'emergency.json');
 

package/src/core/transaction.ts

@@ -9,7 +9,15 @@ import * as path from 'path';
 import { Transaction, TransactionStatus } from '../types';
 import { configManager } from './config';
 
-const DATA_DIR = path.join(process.env.HOME || process.env.USERPROFILE || '.', '.payment-skill');
+// Support both old location (~/.payment-skill) and new location (./data)
+const OLD_DATA_DIR = path.join(process.env.HOME || process.env.USERPROFILE || '.', '.payment-skill');
+const NEW_DATA_DIR = path.join(__dirname, '..', '..', 'data');
+
+// Use new location if it exists and has config, otherwise fall back to old location
+const DATA_DIR = fs.existsSync(path.join(NEW_DATA_DIR, 'config.json'))
+  ? NEW_DATA_DIR
+  : (fs.existsSync(OLD_DATA_DIR) ? OLD_DATA_DIR : NEW_DATA_DIR);
+
 const TRANSACTIONS_FILE = path.join(DATA_DIR, 'transactions.json');
 
 export class TransactionManager {

package/src/server/server.ts

@@ -8,6 +8,7 @@ import express from 'express';
 import cors from 'cors';
 import helmet from 'helmet';
 import path from 'path';
+import * as fs from 'fs-extra';
 import { configManager } from '../core/config';
 import { transactionManager } from '../core/transaction';
 import { fetchAndSaveWiseProfile } from '../api/wise-profile';
@@ -16,7 +17,7 @@ export class PaymentSkillServer {
   private app: express.Application;
   private port: number;
 
-  constructor(port: number = 8080) {
+  constructor(port: number = 18790) {
     this.app = express();
     this.port = port;
     this.setupMiddleware();
@@ -250,6 +251,24 @@ export class PaymentSkillServer {
       res.status(200).send('OK');
     });
 
+    // Verified Merchants
+    this.app.get('/api/verified-merchants', (req, res) => {
+      try {
+        const merchantsPath = path.join(__dirname, '../../verified-merchants.json');
+        console.log('Looking for verified merchants at:', merchantsPath);
+        if (fs.existsSync(merchantsPath)) {
+          const data = fs.readJsonSync(merchantsPath);
+          res.json(data);
+        } else {
+          console.log('File not found, returning empty list');
+          res.json({ merchants: [], version: '1.0.0' });
+        }
+      } catch (error: any) {
+        console.error('Error loading verified merchants:', error.message);
+        res.status(500).json({ error: 'Failed to load verified merchants', details: error.message });
+      }
+    });
+
     // Dashboard route - serve dashboard.html
     this.app.get('/', (req, res) => {
       res.sendFile(path.join(__dirname, '../../dashboard.html'));
@@ -270,7 +289,7 @@ export class PaymentSkillServer {
 
 // Start server if run directly
 if (require.main === module) {
-  const port = parseInt(process.env.PORT || '8080');
+  const port = parseInt(process.env.PORT || '18790');
   const server = new PaymentSkillServer(port);
   server.start();
 }

package/verified-merchants.json

@@ -38,8 +38,8 @@
     },
     {
       "id": "clickclack-market",
-      "name": "ClickClack Market",
-      "domains": ["clickclack.market"],
+      "name": "ManyClaws",
+      "domains": ["manyclaws.store"],
       "categories": ["marketplace", "shopping"],
       "verified": true,
       "riskLevel": "low",

package/Wise_test_environment_API_token.rtf

@@ -1,8 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf2822
-\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-{\*\expandedcolortbl;;}
-\paperw11900\paperh16840\margl1440\margr1440\vieww11520\viewh8400\viewkind0
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
-
-\f0\fs24 \cf0 53704ee2-f996-4081-9a29-4f094f6744d2}

package/fix-payment-skill.sh

@@ -1,80 +0,0 @@
-#!/bin/bash
-cd /Users/apple/.openclaw/workspace/payment-skill-app
-
-# Fix 1: wise.ts - Add customerTransactionId
-cat > /tmp/fix_wise.py << 'PYEOF'
-import re
-with open('src/api/wise.ts', 'r') as f:
-    content = f.read()
-
-# Fix createTransfer
-content = content.replace(
-    '''async createTransfer(
-    profileId: string,
-    quoteId: string,
-    targetAccountId: string,
-    reference?: string
-  ) {
-    const body: any = {
-      targetAccount: targetAccountId,
-      quoteUuid: quoteId
-    };''',
-    '''async createTransfer(
-    profileId: string,
-    quoteId: string,
-    targetAccountId: string,
-    reference?: string,
-    customerTransactionId?: string
-  ) {
-    const body: any = {
-      targetAccount: targetAccountId,
-      quoteUuid: quoteId,
-      customerTransactionId: customerTransactionId or f"txn-{int(time.time())}"
-    };'''
-)
-
-# Fix fundTransfer URL
-content = content.replace(
-    '/v3/profiles/${profileId}/transfers/${transferId}/payments',
-    '/v1/transfers/${transferId}/payments'
-)
-
-with open('src/api/wise.ts', 'w') as f:
-    f.write(content)
-print("Fixed wise.ts")
-PYEOF
-
-python3 /tmp/fix_wise.py
-
-# Fix 2: Add updateProvider to config.ts
-cat > /tmp/fix_config.py << 'PYEOF'
-with open('src/core/config.ts', 'r') as f:
-    content = f.read()
-
-if 'updateProvider' not in content:
-    method = '''
-  // Update provider without overwriting
-  updateProvider(name: string, updates: Partial<ProviderConfig>): void {
-    const current = this.config.providers[name];
-    if (!current) throw new Error(`Provider ${name} not found`);
-    this.config.providers[name] = { ...current, ...updates };
-    this.saveConfig();
-  }'''
-    
-    # Insert before last closing brace
-    pos = content.rfind('}')
-    content = content[:pos] + method + '\n' + content[pos:]
-    
-    with open('src/core/config.ts', 'w') as f:
-        f.write(content)
-    print("Fixed config.ts")
-else:
-    print("Already fixed")
-PYEOF
-
-python3 /tmp/fix_config.py
-
-# Rebuild
-npm run build && npm link
-
-echo "✅ All fixes applied!"