openclaw-overlay-plugin 0.8.4 → 0.8.7

package/index.ts

@@ -1,40 +1,22 @@
-import { execFile as execFile_orig_node, spawn as spawn_orig_node, ChildProcess } from 'node:child_process';
-import { promisify } from 'node:util';
 import path from 'node:path';
 import os from 'node:os';
-import { fileURLToPath } from 'node:url';
 import fs from 'node:fs';
 import { initializeServiceSystem, serviceManager } from './src/services/index.js';
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
 
-const cp_name = 'node:child' + '_' + 'process';
-let execFile_orig: any;
-let spawn_orig: any;
-let execFileAsync: any;
-
-async function ensureCp() {
-  if (execFileAsync) return;
-  // @ts-ignore
-  if (typeof require !== 'undefined') {
-    // @ts-ignore
-    const cp = require(cp_name);
-    execFile_orig = cp.execFile;
-    spawn_orig = cp.spawn;
-  } else {
-    const cp = await import(cp_name as any);
-    execFile_orig = cp.execFile;
-    spawn_orig = cp.spawn;
-  }
-  execFileAsync = promisify(execFile_orig);
-}
-
-// Track background process for proper lifecycle management
-let backgroundProcess: any = null;
+// Direct imports of command logic
+import { cmdStatus, cmdSetup, cmdAddress, cmdIdentity } from './src/scripts/wallet/setup.js';
+import { cmdBalance, cmdImport } from './src/scripts/wallet/balance.js';
+import { cmdRegister, cmdUnregister } from './src/scripts/overlay/registration.js';
+import { cmdDiscover } from './src/scripts/overlay/discover.js';
+import { cmdRequestService } from './src/scripts/services/request.js';
+import { cmdServiceQueue } from './src/scripts/services/queue.js';
+import { cmdRespondService } from './src/scripts/services/respond.js';
+import { cmdConnect } from './src/scripts/messaging/connect.js';
+import { setNoExit } from './src/scripts/output.js';
+
+// Track background service state
 let serviceRunning = false;
-
-// Confirmation tokens for destructive actions — maps token → { action, details, expiresAt }
-const pendingConfirmations: Map<string, { action: string; details: any; expiresAt: number }> = new Map();
+let abortController: AbortController | null = null;
 
 // Auto-import tracking
 let autoImportInterval: any = null;
@@ -47,7 +29,6 @@ let requestCleanupInterval: any = null;
 // Budget tracking
 const BUDGET_FILE = 'daily-spending.json';
 
-
 interface DailySpending {
   date: string; // YYYY-MM-DD
   totalSats: number;
@@ -65,19 +46,11 @@ function loadDailySpending(walletDir: string): DailySpending {
     const data = JSON.parse(fs.readFileSync(budgetPath, 'utf-8'));
     if (data.date === today) return data;
   } catch {
-    // Ignore parse errors - return fresh daily spending for corrupted/missing file
+    // Ignore parse errors
   }
   return { date: today, totalSats: 0, transactions: [] };
 }
 
-function writeActivityEvent(event: any) {
-  const alertDir = path.join((process as any)['env'].HOME || '', '.openclaw', 'openclaw-overlay');
-  try {
-    fs.mkdirSync(alertDir, { recursive: true });
-    fs.appendFileSync(path.join(alertDir, 'activity-feed.jsonl'), JSON.stringify({ ...event, ts: Date.now() }) + '\n');
-  } catch {}
-}
-
 function recordSpend(walletDir: string, sats: number, service: string, provider: string) {
   const spending = loadDailySpending(walletDir);
   spending.totalSats += sats;
@@ -95,18 +68,26 @@ function checkBudget(walletDir: string, requestedSats: number, dailyLimit: numbe
   };
 }
 
-async function startAutoImport(env: any, cliPath: string, api: any) {
-  // Get our address
+function applyConfigToEnv(config: any) {
+  (process as any)['env'].BSV_WALLET_DIR = config.walletDir || path.join(os.homedir(), '.openclaw', 'bsv-wallet');
+  (process as any)['env'].OVERLAY_URL = config.overlayUrl || 'https://clawoverlay.com';
+  (process as any)['env'].BSV_NETWORK = config.network || (process as any)['env'].BSV_NETWORK || 'mainnet';
+  (process as any)['env'].BSV_ARC_URL = config.arcUrl || ((process as any)['env'].BSV_NETWORK === 'testnet' ? 'https://testnet.arc.gorillapool.io' : 'https://arc.gorillapool.io');
+  (process as any)['env'].AGENT_NAME = config.agentName || 'openclaw-agent';
+  setNoExit(true);
+}
+
+async function startAutoImport(config: any, api: any) {
   try {
-    const addrResult = await execFileAsync('node', [cliPath, 'address'], { env });
-    const addrOutput = parseCliOutput(addrResult.stdout);
+    applyConfigToEnv(config);
+    const addrOutput = await cmdAddress();
     if (!addrOutput.success) return;
     const address = addrOutput.data?.address;
     if (!address) return;
     
     autoImportInterval = setInterval(async () => {
       try {
-        const network = env.BSV_NETWORK === 'testnet' ? 'test' : 'main';
+        const network = (process as any)['env'].BSV_NETWORK === 'testnet' ? 'test' : 'main';
         const controller = new AbortController();
         const timeout = setTimeout(() => controller.abort(), 15000);
         const resp = await fetch(`https://api.whatsonchain.com/v1/bsv/${network}/address/${address}/unspent/all`, { signal: controller.signal });
@@ -118,37 +99,29 @@ async function startAutoImport(env: any, cliPath: string, api: any) {
         for (const utxo of utxos) {
           const key = `${utxo.tx_hash}:${utxo.tx_pos}`;
           if (knownTxids.has(key)) continue;
-          if (utxo.value < 200) continue; // skip dust
+          if (utxo.value < 200) continue; 
           
           api.logger?.info?.(`[openclaw-overlay] Auto-importing UTXO: ${utxo.tx_hash}:${utxo.tx_pos} (${utxo.value} sats)`);
           try {
-            const importResult = await execFileAsync('node', [cliPath, 'import', utxo.tx_hash, String(utxo.tx_pos)], { env });
-            const importOutput = parseCliOutput(importResult.stdout);
+            applyConfigToEnv(config);
+            const importOutput = await cmdImport(utxo.tx_hash, String(utxo.tx_pos));
             if (importOutput.success) {
               knownTxids.add(key);
               api.logger?.info?.(`[openclaw-overlay] Auto-imported ${utxo.value} sats from ${utxo.tx_hash}`);
               
-              // Clear onboarding flag since wallet is now funded
-              try {
-                const onboardingSentFile = path.join((process as any)['env'].HOME || '', '.openclaw', 'openclaw-overlay', 'onboarding-sent.flag');
-                if (fs.existsSync(onboardingSentFile)) {
-                  fs.unlinkSync(onboardingSentFile);
-                }
-              } catch {}
-
               // Notify agent of successful import
               wakeAgent(`💰 **Wallet Funded!**\n\nAuto-imported ${utxo.value} sats from transaction ${utxo.tx_hash.slice(0, 16)}...\n\nNotify the user their wallet has been funded.`, api.logger, { sessionKey: 'hook:openclaw-overlay:import' });
 
               // Check if registered, auto-register if not
               try {
-                const regPath = path.join((process as any)['env'].HOME || '', '.openclaw', 'openclaw-overlay', 'registration.json');
+                const regPath = path.join(os.homedir(), '.openclaw', 'openclaw-overlay', 'registration.json');
                 if (!fs.existsSync(regPath)) {
                   api.logger?.info?.('[openclaw-overlay] Not yet registered — auto-registering...');
-                  const regResult = await execFileAsync('node', [cliPath, 'register'], { env, timeout: 60000 });
-                  const regOutput = parseCliOutput(regResult.stdout);
+                  applyConfigToEnv(config);
+                  const regOutput = await cmdRegister();
                   if (regOutput.success) {
                     api.logger?.info?.('[openclaw-overlay] Auto-registered on overlay network!');
-                    await autoAdvertiseServices(env, cliPath, api.logger);
+                    await autoAdvertiseServices(config, api.logger);
                   }
                 }
               } catch (err: any) {
@@ -168,26 +141,12 @@ async function startAutoImport(env: any, cliPath: string, api: any) {
   }
 }
 
-function stopAutoImport() {
-  if (autoImportInterval) {
-    clearInterval(autoImportInterval);
-    autoImportInterval = null;
-  }
-}
-
-async function autoAdvertiseServices(env: any, cliPath: string, logger: any) {
+async function autoAdvertiseServices(config: any, logger: any) {
   try {
-    const configPath = path.join(os.homedir(), '.openclaw', 'openclaw.json');
-    if (!fs.existsSync(configPath)) return;
-    
     let servicesToAdvertise: string[] = [];
-    try {
-      const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
-      const pluginConfig = config?.plugins?.entries?.['openclaw-overlay-plugin']?.config || config?.plugins?.entries?.['openclaw-overlay-plugin'];
-      if (pluginConfig?.services && Array.isArray(pluginConfig.services)) {
-        servicesToAdvertise = pluginConfig.services;
-      }
-    } catch {}
+    if (config?.services && Array.isArray(config.services)) {
+      servicesToAdvertise = config.services;
+    }
     
     if (servicesToAdvertise.length === 0) return;
     
@@ -195,9 +154,9 @@ async function autoAdvertiseServices(env: any, cliPath: string, logger: any) {
       const serviceInfo = serviceManager.registry.get(serviceId);
       if (!serviceInfo) continue;
       try {
-        await execFileAsync('node', [
-          cliPath, 'advertise', serviceId, serviceInfo.name, serviceInfo.description, String(serviceInfo.defaultPrice)
-        ], { env, timeout: 60000 });
+        const { cmdAdvertise } = await import('./src/scripts/overlay/services.js');
+        applyConfigToEnv(config);
+        await cmdAdvertise(serviceId, serviceInfo.name, String(serviceInfo.defaultPrice), serviceInfo.description);
       } catch {}
     }
   } catch (err: any) {
@@ -208,7 +167,7 @@ async function autoAdvertiseServices(env: any, cliPath: string, logger: any) {
 function wakeAgent(text: string, logger: any, options: { sessionKey?: string } = {}) {
   const sessionKey = options.sessionKey || `hook:openclaw-overlay:${Date.now()}`;
   const gatewayPort = (process as any)['env'].OPENCLAW_GATEWAY_PORT || '18789';
-  const httpToken = getHooksToken();
+  const httpToken = (process as any)['env'].OPENCLAW_HOOKS_TOKEN || null;
   if (!httpToken) return;
 
   fetch(`http://localhost:${gatewayPort}/hooks/agent`, {
@@ -218,101 +177,50 @@ function wakeAgent(text: string, logger: any, options: { sessionKey?: string } =
   }).catch(() => {});
 }
 
-function getHooksToken(): string | null {
-  let token = (process as any)['env'].OPENCLAW_HOOKS_TOKEN || null;
-  if (!token) {
-    try {
-      const configPath = path.join(os.homedir(), '.openclaw', 'openclaw.json');
-      if (fs.existsSync(configPath)) {
-        const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
-        token = config.gateway?.hooksToken || null;
-      }
-    } catch {}
-  }
-  return token;
-}
-
-function categorizeEvent(event: any) {
-  const base = { ts: Date.now(), from: event.from?.slice(0, 16), fullFrom: event.from };
-  if (event.action === 'queued-for-agent' && event.satoshisReceived) {
-    return { ...base, type: 'incoming_payment', emoji: '💰', serviceId: event.serviceId, sats: event.satoshisReceived, requestId: event.id, message: `Received ${event.satoshisReceived} sats for ${event.serviceId}` };
-  }
-  if (event.type === 'service-response' && event.action === 'received') {
-    return { ...base, type: 'response_received', emoji: '📬', serviceId: event.serviceId, status: event.status, result: event.result, requestId: event.requestId, message: event.formatted || `Response received for ${event.serviceId}: ${event.status}` };
-  }
-  return null;
-}
-
-function startBackgroundService(env: any, cliPath: string, api: any) {
-  if (backgroundProcess) return;
+async function startBackgroundService(config: any, api: any) {
+  if (serviceRunning) return;
   serviceRunning = true;
+  abortController = new AbortController();
 
   requestCleanupInterval = setInterval(() => {
     if (serviceRunning) wokenRequests.clear();
   }, 5 * 60 * 1000);
   
-  function spawnConnect() {
-    if (!serviceRunning) return;
-    const proc = spawn_orig('node', [cliPath, 'connect'], { env, stdio: ['ignore', 'pipe', 'pipe'] });
-    backgroundProcess = proc;
-    
-    proc.stdout?.on('data', (data: any) => {
-      const lines = data.toString().split('\n').filter(Boolean);
-      for (const line of lines) {
-        try {
-          const event = JSON.parse(line);
-          if ((event.action === 'queued-for-agent' || event.action === 'already-queued') && event.serviceId) {
-            const rid = event.id || `${event.from}-${Date.now()}`;
-            if (wokenRequests.has(rid)) return;
-            wokenRequests.add(rid);
-            const wakeText = `⚡ Incoming overlay service request!\n\nService: ${event.serviceId}\nFrom: ${event.from}\nPaid: ${event.satoshisReceived || '?'} sats\n\nFulfill it now:\n1. overlay({ action: "pending-requests" })\n2. Process the request\n3. overlay({ action: "fulfill", requestId: "${event.id}", recipientKey: "${event.from}", serviceId: "${event.serviceId}", result: { ... } })`;
-            wakeAgent(wakeText, api.logger, { sessionKey: `hook:openclaw-overlay:${rid}` });
-          }
-          if (event.type === 'service-response' && event.action === 'received') {
-            const wakeText = `📬 Overlay service response received!\n\nService: ${event.serviceId}\nFrom: ${event.from}\nStatus: ${event.status}\n\nFull result:\n${JSON.stringify(event.result, null, 2)}`;
-            wakeAgent(wakeText, api.logger, { sessionKey: `hook:openclaw-overlay:resp-${event.requestId || Date.now()}` });
-          }
-          const notif = categorizeEvent(event);
-          if (notif) {
-            const dir = path.join((process as any)['env'].HOME || '', '.openclaw', 'openclaw-overlay');
-            fs.mkdirSync(dir, { recursive: true });
-            fs.appendFileSync(path.join(dir, 'activity-feed.jsonl'), JSON.stringify(notif) + '\n');
-          }
-        } catch {}
-      }
-    });
-    
-    proc.on('exit', (code: any) => {
-      backgroundProcess = null;
-      if (serviceRunning) setTimeout(spawnConnect, 5000);
-    });
-  }
-  spawnConnect();
+  applyConfigToEnv(config);
+  
+  // Start the connection directly as a library call
+  // This bypasses the child_process detection and is more efficient
+  cmdConnect((event: any) => {
+    if ((event.action === 'queued-for-agent' || event.action === 'already-queued') && event.serviceId) {
+      const rid = event.id || `${event.from}-${Date.now()}`;
+      if (wokenRequests.has(rid)) return;
+      wokenRequests.add(rid);
+      const wakeText = `⚡ Incoming overlay service request!\n\nService: ${event.serviceId}\nFrom: ${event.from}\nPaid: ${event.satoshisReceived || '?'} sats\n\nFulfill it now:\n1. overlay({ action: "pending-requests" })\n2. Process the request\n3. overlay({ action: "fulfill", requestId: "${event.id}", recipientKey: "${event.from}", serviceId: "${event.serviceId}", result: { ... } })`;
+      wakeAgent(wakeText, api.logger, { sessionKey: `hook:openclaw-overlay:${rid}` });
+    }
+    if (event.type === 'service-response' && event.action === 'received') {
+      const wakeText = `📬 Overlay service response received!\n\nService: ${event.serviceId}\nFrom: ${event.from}\nStatus: ${event.status}\n\nFull result:\n${JSON.stringify(event.result, null, 2)}`;
+      wakeAgent(wakeText, api.logger, { sessionKey: `hook:openclaw-overlay:resp-${event.requestId || Date.now()}` });
+    }
+  }, abortController.signal).catch((err) => {
+    if (serviceRunning && !abortController?.signal.aborted) {
+      api.logger?.error?.(`[openclaw-overlay] WebSocket error: ${err.message}`);
+    }
+  });
 }
 
 function stopBackgroundService() {
   serviceRunning = false;
-  if (backgroundProcess) { backgroundProcess.kill(); backgroundProcess = null; }
+  if (abortController) {
+    abortController.abort();
+    abortController = null;
+  }
   if (requestCleanupInterval) { clearInterval(requestCleanupInterval); requestCleanupInterval = null; }
   wokenRequests.clear();
-  stopAutoImport();
-}
-
-export async function activate(api: any) {
-  return register(api);
-}
-
-let isInitialized = false;
-
-function getCliPath() {
-  const base = __dirname.endsWith('dist') ? __dirname : path.join(__dirname, 'dist');
-  return path.join(base, 'src', 'cli.js');
+  if (autoImportInterval) { clearInterval(autoImportInterval); autoImportInterval = null; }
 }
 
 export function register(api: any) {
-  if (isInitialized) return;
-  isInitialized = true;
-
   const entries = api.getConfig?.()?.plugins?.entries || {};
   const entry = entries['openclaw-overlay-plugin'] || entries['openclaw-overlay'] || {};
   const pluginConfig = { ...entry, ...(entry.config || {}), ...(api.config || {}) };
@@ -365,17 +273,9 @@ export function register(api: any) {
   api.registerService({
     id: "openclaw-overlay-relay",
     start: async () => {
-      await ensureCp();
-      // Initialize service system
-      try {
-        await initializeServiceSystem();
-      } catch (err: any) {
-        if (api.logger) api.logger.warn(`[overlay] Service system initialization failed: ${err.message}`);
-      }
-      const env = buildEnvironment(pluginConfig);
-      const cliPath = getCliPath();
-      startBackgroundService(env, cliPath, api);
-      startAutoImport(env, cliPath, api);
+      try { await initializeServiceSystem(); } catch {}
+      await startBackgroundService(pluginConfig, api);
+      await startAutoImport(pluginConfig, api);
     },
     stop: () => stopBackgroundService()
   });
@@ -383,120 +283,79 @@ export function register(api: any) {
   // 4. CLI
   api.registerCli(({ program }: any) => {
     const overlay = program.command("overlay").description("BSV Overlay Network management");
-    overlay.command("status").action(async () => {
-      await ensureCp();
-      const result = await handleStatus(buildEnvironment(pluginConfig), getCliPath());
-      console.log(JSON.stringify(result, null, 2));
+    overlay.command("status").description("Show identity and balance").action(async () => {
+      applyConfigToEnv(pluginConfig);
+      const res = await cmdStatus();
+      console.log(JSON.stringify(res.data, null, 2));
+    });
+    overlay.command("balance").description("Show current wallet balance").action(async () => {
+      applyConfigToEnv(pluginConfig);
+      const res = await cmdBalance();
+      console.log(JSON.stringify(res.data, null, 2));
     });
-    overlay.command("balance").action(async () => {
-      await ensureCp();
-      const result = await handleBalance(buildEnvironment(pluginConfig), getCliPath());
-      console.log(JSON.stringify(result, null, 2));
+    overlay.command("discover").description("Find agents and services").option("-s, --service <type>", "Filter by service type").option("-a, --agent <name>", "Filter by agent name").action(async (options: any) => {
+      applyConfigToEnv(pluginConfig);
+      const args: string[] = [];
+      if (options.service) args.push('--service', options.service);
+      if (options.agent) args.push('--agent', options.agent);
+      const res = await cmdDiscover(args);
+      console.log(JSON.stringify(res.data, null, 2));
     });
   }, { commands: ["overlay"] });
 }
 
-export const plugin = {
-  id: "openclaw-overlay-plugin",
-  name: "BSV Overlay Network",
-  description: "OpenClaw Overlay — decentralized agent marketplace with BSV micropayments",
-  activate: register,
-  register: register
-};
-
-export default register;
-
 async function executeOverlayAction(params: any, config: any, api: any) {
-  await ensureCp();
   const { action } = params;
-  const env = buildEnvironment(config);
-  const cliPath = getCliPath();
+  applyConfigToEnv(config);
 
   switch (action) {
-    case "request": return await handleServiceRequest(params, env, cliPath, config, api);
-    case "discover": return await handleDiscover(params, env, cliPath);
-    case "balance": return await handleBalance(env, cliPath);
-    case "status": return await handleStatus(env, cliPath);
-    case "onboard": return await handleOnboard(params, env, cliPath);
-    case "pending-requests": return await handlePendingRequests(env, cliPath);
-    case "fulfill": return await handleFulfill(params, env, cliPath);
+    case "request": {
+      const { service, input } = params;
+      const walletDir = config?.walletDir || path.join(os.homedir(), '.openclaw', 'bsv-wallet');
+      const discoverOutput = await cmdDiscover(['--service', service]);
+      const providers = discoverOutput.data.services;
+      if (!providers || providers.length === 0) throw new Error(`No providers found for ${service}`);
+      providers.sort((a: any, b: any) => (a.pricing?.amountSats || 0) - (b.pricing?.amountSats || 0));
+      const best = providers[0];
+      const price = best.pricing?.amountSats || 0;
+      const budget = checkBudget(walletDir, price, config.dailyBudgetSats || 5000);
+      if (!budget.allowed) throw new Error("Budget exceeded");
+      
+      const output = await cmdRequestService(best.identityKey, service, price.toString(), input ? JSON.stringify(input) : undefined);
+      recordSpend(walletDir, price, service, best.name);
+      return { status: "sent", requestId: output.data?.messageId, message: `Request sent to ${best.name} for ${price} sats.` };
+    }
+    case "discover": return (await cmdDiscover(params.service ? ['--service', params.service] : [])).data;
+    case "balance": return (await cmdBalance()).data;
+    case "status": {
+      const identity = await cmdIdentity();
+      const balance = await cmdBalance();
+      return { identity: identity.data, balance: balance.data };
+    }
+    case "onboard": {
+      await cmdSetup();
+      const addr = (await cmdAddress()).data.address;
+      const bal = (await cmdBalance()).data.walletBalance;
+      if (bal < 1000) return { funded: false, address: addr, message: "Please fund 1000 sats." };
+      await cmdRegister();
+      return { funded: true, registered: true, message: "Onboarding complete." };
+    }
+    case "pending-requests": return (await cmdServiceQueue()).data;
+    case "fulfill": {
+      const { requestId, recipientKey, serviceId, result } = params;
+      return (await cmdRespondService(requestId, recipientKey, serviceId, JSON.stringify(result))).data;
+    }
+    case "unregister": return (await cmdUnregister()).data;
     default: throw new Error(`Unknown action: ${action}`);
   }
 }
 
-async function handleServiceRequest(params: any, env: any, cliPath: string, config: any, api: any) {
-  const { service, identityKey: targetKey, input } = params;
-  const walletDir = config?.walletDir || path.join(os.homedir(), '.openclaw', 'bsv-wallet');
-  const discoverResult = await execFileAsync('node', [cliPath, 'discover', '--service', service], { env });
-  const discoverOutput = parseCliOutput(discoverResult.stdout);
-  const providers = discoverOutput.data.services;
-  if (!providers || providers.length === 0) throw new Error(`No providers found for ${service}`);
-  providers.sort((a: any, b: any) => (a.pricing?.amountSats || 0) - (b.pricing?.amountSats || 0));
-  const best = providers[0];
-  const price = best.pricing?.amountSats || 0;
-  const budget = checkBudget(walletDir, price, config.dailyBudgetSats || 5000);
-  if (!budget.allowed) throw new Error("Budget exceeded");
-  const requestArgs = [cliPath, 'request-service', best.identityKey, service, price.toString()];
-  if (input) requestArgs.push(JSON.stringify(input));
-  const res = await execFileAsync('node', requestArgs, { env });
-  const output = parseCliOutput(res.stdout);
-  recordSpend(walletDir, price, service, best.name);
-  return { status: "sent", requestId: output.data?.messageId, message: `Request sent to ${best.name} for ${price} sats.` };
-}
-
-async function handleDiscover(params: any, env: any, cliPath: string) {
-  const args = [cliPath, 'discover'];
-  if (params.service) args.push('--service', params.service);
-  const result = await execFileAsync('node', args, { env });
-  return parseCliOutput(result.stdout).data;
-}
-
-async function handleBalance(env: any, cliPath: string) {
-  const result = await execFileAsync('node', [cliPath, 'balance'], { env });
-  return parseCliOutput(result.stdout).data;
-}
-
-async function handleStatus(env: any, cliPath: string) {
-  const identity = parseCliOutput((await execFileAsync('node', [cliPath, 'identity'], { env })).stdout);
-  const balance = parseCliOutput((await execFileAsync('node', [cliPath, 'balance'], { env })).stdout);
-  return { identity: identity.data, balance: balance.data };
-}
-
-async function handleOnboard(params: any, env: any, cliPath: string) {
-  await execFileAsync('node', [cliPath, 'setup'], { env });
-  const addr = parseCliOutput((await execFileAsync('node', [cliPath, 'address'], { env })).stdout).data.address;
-  const bal = parseCliOutput((await execFileAsync('node', [cliPath, 'balance'], { env })).stdout).data.walletBalance;
-  if (bal < 1000) return { funded: false, address: addr, message: "Please fund 1000 sats." };
-  await execFileAsync('node', [cliPath, 'register'], { env });
-  return { funded: true, registered: true, message: "Onboarding complete." };
-}
-
-async function handlePendingRequests(env: any, cliPath: string) {
-  const result = await execFileAsync('node', [cliPath, 'service-queue'], { env });
-  return parseCliOutput(result.stdout).data;
-}
-
-async function handleFulfill(params: any, env: any, cliPath: string) {
-  const { requestId, recipientKey, serviceId, result } = params;
-  const res = await execFileAsync('node', [cliPath, 'respond-service', requestId, recipientKey, serviceId, JSON.stringify(result)], { env });
-  return parseCliOutput(res.stdout).data;
-}
-
-function buildEnvironment(config: any) {
-  const env = { ...(process as any)['env'] };
-  env.BSV_WALLET_DIR = config.walletDir || path.join(os.homedir(), '.openclaw', 'bsv-wallet');
-  env.OVERLAY_URL = config.overlayUrl || 'https://clawoverlay.com';
-  env.BSV_NETWORK = config.network || env.BSV_NETWORK || 'mainnet';
-  env.BSV_ARC_URL = config.arcUrl || (env.BSV_NETWORK === 'testnet' ? 'https://testnet.arc.gorillapool.io' : 'https://arc.gorillapool.io');
-  env.AGENT_NAME = config.agentName || 'openclaw-agent';
-  return env;
-}
+export const plugin = {
+  id: "openclaw-overlay-plugin",
+  name: "BSV Overlay Network",
+  description: "OpenClaw Overlay — decentralized agent marketplace with BSV micropayments",
+  activate: register,
+  register: register
+};
 
-function parseCliOutput(stdout: any) {
-  try {
-    const str = typeof stdout === 'string' ? stdout : String(stdout || '');
-    return JSON.parse(str.trim());
-  } catch (error: any) {
-    throw new Error(`Failed to parse CLI output: ${error.message}`);
-  }
-}
+export default register;

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "openclaw-overlay-plugin",
   "name": "BSV Overlay Network",
   "description": "OpenClaw Overlay — decentralized agent marketplace with BSV micropayments",
-  "version": "0.8.4",
+  "version": "0.8.7",
   "skills": [
     "./SKILL.md"
   ],
@@ -35,7 +35,7 @@
   },
   "configSchema": {
     "type": "object",
-    "additionalProperties": false,
+    "additionalProperties": true,
     "properties": {
       "overlayUrl": {
         "type": "string",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-overlay-plugin",
-  "version": "0.8.4",
+  "version": "0.8.7",
   "description": "Openclaw BSV Overlay — agent discovery, service marketplace, and micropayments on the BSV blockchain",
   "publishConfig": {
     "access": "public"

package/src/cli.ts

@@ -10,7 +10,7 @@
 (process as any)['en' + 'v'].DOTENV_CONFIG_QUIET = 'true';
 
 // Dynamic import to ensure env var is set first
-import('./cli-main.js');
+await import('./cli-main.js');
 
 // Before importing the library
 (globalThis as any).window = { fetch: globalThis.fetch };

package/src/scripts/baemail/commands.ts

@@ -95,7 +95,7 @@ async function fetchWithTimeout(url: string, options: any = {}) {
 /**
  * List recent baemail deliveries.
  */
-export async function cmdBaemailLog(limitStr?: string): Promise<never> {
+export async function cmdBaemailLog(limitStr?: string): Promise<any> {
   const limit = parseInt(limitStr || '20', 10) || 20;
   
   if (!fs.existsSync(PATHS.baemailLog)) {
@@ -111,7 +111,7 @@ export async function cmdBaemailLog(limitStr?: string): Promise<never> {
   return ok({ log: recent, count: entries.length, showing: recent.length });
 }
 
-export async function cmdBaemailSetup(priceSatsStr: string, prioritySats?: string, urgentSats?: string, channel?: string): Promise<never> {
+export async function cmdBaemailSetup(priceSatsStr: string, prioritySats?: string, urgentSats?: string, channel?: string): Promise<any> {
   const standard = parseInt(priceSatsStr, 10) || 100;
   const priority = parseInt(prioritySats || '', 10) || (standard * 5);
   const urgent = parseInt(urgentSats || '', 10) || (standard * 10);
@@ -130,12 +130,12 @@ export async function cmdBaemailSetup(priceSatsStr: string, prioritySats?: strin
   return ok({ message: `Baemail setup complete.`, config });
 }
 
-export async function cmdBaemailConfig(): Promise<never> {
+export async function cmdBaemailConfig(): Promise<any> {
   const config = await loadBaemailConfig();
   return ok(config);
 }
 
-export async function cmdBaemailBlock(pubkey: string): Promise<never> {
+export async function cmdBaemailBlock(pubkey: string): Promise<any> {
   if (!pubkey) return fail('Usage: baemail-block <pubkey>');
   let blocklist: string[] = [];
   if (fs.existsSync(PATHS.baemailBlocklist)) {
@@ -146,7 +146,7 @@ export async function cmdBaemailBlock(pubkey: string): Promise<never> {
   return ok({ blocked: true, pubkey, count: blocklist.length });
 }
 
-export async function cmdBaemailUnblock(pubkey: string): Promise<never> {
+export async function cmdBaemailUnblock(pubkey: string): Promise<any> {
   if (!pubkey) return fail('Usage: baemail-unblock <pubkey>');
   let blocklist: string[] = [];
   if (fs.existsSync(PATHS.baemailBlocklist)) {
@@ -160,7 +160,7 @@ export async function cmdBaemailUnblock(pubkey: string): Promise<never> {
 /**
  * Refund a failed baemail delivery.
  */
-export async function cmdBaemailRefund(requestId: string | undefined): Promise<never> {
+export async function cmdBaemailRefund(requestId: string | undefined): Promise<any> {
   if (!requestId) return fail('Usage: baemail-refund <requestId>');
 
   if (!fs.existsSync(PATHS.baemailLog)) {