openclaw-overlay-plugin 0.7.44 → 0.7.46

package/dist/index.js

@@ -7,6 +7,17 @@ import fs from 'node:fs';
 import { initializeServiceSystem, serviceManager } from './src/services/index.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
+/**
+ * Helper to correctly locate the CLI script.
+ * If running from dist/index.js, CLI is in ./src/cli.js
+ * If running from index.ts, CLI is in ./dist/src/cli.js
+ */
+function getCliPath() {
+    const localCli = path.join(__dirname, 'src', 'cli.js');
+    if (fs.existsSync(localCli))
+        return localCli;
+    return path.join(__dirname, 'dist', 'src', 'cli.js');
+}
 const execFileAsync = promisify(execFile);
 // Track background process for proper lifecycle management
 let backgroundProcess = null;
@@ -555,7 +566,7 @@ export default function register(api) {
             try {
                 api.logger.info("Starting BSV overlay WebSocket relay...");
                 const env = buildEnvironment(pluginConfig);
-                const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+                const cliPath = getCliPath();
                 // Initialize the service system if available
                 try {
                     await initializeServiceSystem();
@@ -584,7 +595,7 @@ export default function register(api) {
             (async () => {
                 try {
                     const env = buildEnvironment(pluginConfig);
-                    const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+                    const cliPath = getCliPath();
                     const regPath = path.join(process.env.HOME || '', '.openclaw', 'openclaw-overlay', 'registration.json');
                     const onboardSentFile = path.join(process.env.HOME || '', '.openclaw', 'openclaw-overlay', 'onboarding-sent.flag');
                     if (!fs.existsSync(regPath) && !fs.existsSync(onboardSentFile)) {
@@ -629,7 +640,7 @@ export default function register(api) {
             .action(async () => {
             try {
                 const env = buildEnvironment(pluginConfig);
-                const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+                const cliPath = getCliPath();
                 const result = await handleStatus(env, cliPath);
                 console.log(JSON.stringify(result, null, 2));
             }
@@ -643,7 +654,7 @@ export default function register(api) {
             .action(async () => {
             try {
                 const env = buildEnvironment(pluginConfig);
-                const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+                const cliPath = getCliPath();
                 const result = await handleBalance(env, cliPath);
                 console.log(JSON.stringify(result, null, 2));
             }
@@ -657,7 +668,7 @@ export default function register(api) {
             .action(async () => {
             try {
                 const env = buildEnvironment(pluginConfig);
-                const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+                const cliPath = getCliPath();
                 const result = await handleAddress(env, cliPath);
                 console.log(JSON.stringify(result, null, 2));
             }
@@ -673,7 +684,7 @@ export default function register(api) {
             .action(async (options) => {
             try {
                 const env = buildEnvironment(pluginConfig);
-                const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+                const cliPath = getCliPath();
                 const result = await handleDiscover(options, env, cliPath);
                 if (result.agents) {
                     console.log("\nAgents:");
@@ -700,7 +711,7 @@ export default function register(api) {
             .action(async () => {
             try {
                 const env = buildEnvironment(pluginConfig);
-                const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+                const cliPath = getCliPath();
                 const result = await handleRegister(env, cliPath);
                 console.log(JSON.stringify(result, null, 2));
             }
@@ -716,7 +727,7 @@ export default function register(api) {
             .action(async (options) => {
             try {
                 const env = buildEnvironment(pluginConfig);
-                const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+                const cliPath = getCliPath();
                 const result = await handleOnboard(options, env, cliPath);
                 console.log(JSON.stringify(result, null, 2));
             }
@@ -730,7 +741,7 @@ export default function register(api) {
             .action(async () => {
             try {
                 const env = buildEnvironment(pluginConfig);
-                const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+                const cliPath = getCliPath();
                 const result = await handlePendingRequests(env, cliPath);
                 console.log(JSON.stringify(result, null, 2));
             }
@@ -743,7 +754,7 @@ export default function register(api) {
 async function executeOverlayAction(params, config, api) {
     const { action } = params;
     const env = buildEnvironment(config);
-    const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+    const cliPath = getCliPath();
     switch (action) {
         case "request":
             return await handleServiceRequest(params, env, cliPath, config, api);

package/dist/src/core/wallet.d.ts

@@ -41,7 +41,9 @@ export declare class BSVAgentWallet {
      * Load an existing agent wallet from its storage directory.
      * Reads the persisted identity file and re-initializes the wallet.
      */
-    static load(config: WalletConfig): Promise<BSVAgentWallet>;
+    static load(config: WalletConfig & {
+        createIfMissing?: boolean;
+    }): Promise<BSVAgentWallet>;
     /**
      * Get this wallet's public identity key (compressed hex, 33 bytes).
      * This is the key other agents use to send payments to you.

package/dist/src/core/wallet.js

@@ -53,7 +53,7 @@ export class BSVAgentWallet {
         // Generate a new root key (or use one provided in config)
         const rootKeyHex = config.rootKeyHex ?? PrivateKey.fromRandom().toHex();
         const rootKey = PrivateKey.fromHex(rootKeyHex);
-        const identityKey = rootKey.toPublicKey().toString();
+        const identityKey = rootKey.toPublicKey().toString(); // toString() defaults to compressed hex
         // Ensure the storage directory exists
         fs.mkdirSync(config.storageDir, { recursive: true });
         // Persist identity for later loading
@@ -75,6 +75,9 @@ export class BSVAgentWallet {
     static async load(config) {
         const identityPath = path.join(config.storageDir, IDENTITY_FILE);
         if (!fs.existsSync(identityPath)) {
+            if (config.createIfMissing === false) {
+                throw new Error(`No wallet found in ${config.storageDir}`);
+            }
             return this.create(config);
         }
         const identity = JSON.parse(fs.readFileSync(identityPath, 'utf-8'));
@@ -106,7 +109,13 @@ export class BSVAgentWallet {
      * stopping the background monitor.
      */
     async destroy() {
-        await this._setup.wallet.destroy();
+        if (this._setup.monitor) {
+            await this._setup.monitor.destroy();
+        }
+        if (this._setup.wallet) {
+            await this._setup.wallet.destroy();
+        }
+        await this._setup.storage.destroy();
     }
     // ---------------------------------------------------------------------------
     // Payment creation (sender/payer side)

package/dist/src/test/wallet.test.js

@@ -103,7 +103,7 @@ async function run() {
     await test('BSVAgentWallet.load throws for missing wallet', async () => {
         const tmpDir = path.join(os.tmpdir(), 'a2a-nonexistent-' + Date.now());
         try {
-            await BSVAgentWallet.load({ network: 'testnet', storageDir: tmpDir });
+            await BSVAgentWallet.load({ network: 'testnet', storageDir: tmpDir, createIfMissing: false });
             throw new Error('Should have thrown');
         }
         catch (err) {

package/index.ts

@@ -8,6 +8,17 @@ import { initializeServiceSystem, serviceManager } from './src/services/index.js
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
+/**
+ * Helper to correctly locate the CLI script.
+ * If running from dist/index.js, CLI is in ./src/cli.js
+ * If running from index.ts, CLI is in ./dist/src/cli.js
+ */
+function getCliPath(): string {
+  const localCli = path.join(__dirname, 'src', 'cli.js');
+  if (fs.existsSync(localCli)) return localCli;
+  return path.join(__dirname, 'dist', 'src', 'cli.js');
+}
+
 const execFileAsync = promisify(execFile);
 
 // Track background process for proper lifecycle management
@@ -601,7 +612,7 @@ export default function register(api: any) {
       try {
         api.logger.info("Starting BSV overlay WebSocket relay...");
         const env = buildEnvironment(pluginConfig);
-        const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+        const cliPath = getCliPath();
         
         // Initialize the service system if available
         try {
@@ -633,7 +644,7 @@ export default function register(api: any) {
       (async () => {
         try {
           const env = buildEnvironment(pluginConfig);
-          const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+          const cliPath = getCliPath();
           
           const regPath = path.join(process.env.HOME || '', '.openclaw', 'openclaw-overlay', 'registration.json');
           const onboardSentFile = path.join(process.env.HOME || '', '.openclaw', 'openclaw-overlay', 'onboarding-sent.flag');
@@ -682,7 +693,7 @@ export default function register(api: any) {
       .action(async () => {
         try {
           const env = buildEnvironment(pluginConfig);
-          const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+          const cliPath = getCliPath();
           const result = await handleStatus(env, cliPath);
           console.log(JSON.stringify(result, null, 2));
         } catch (error: any) {
@@ -696,7 +707,7 @@ export default function register(api: any) {
       .action(async () => {
         try {
           const env = buildEnvironment(pluginConfig);
-          const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+          const cliPath = getCliPath();
           const result = await handleBalance(env, cliPath);
           console.log(JSON.stringify(result, null, 2));
         } catch (error: any) {
@@ -710,7 +721,7 @@ export default function register(api: any) {
       .action(async () => {
         try {
           const env = buildEnvironment(pluginConfig);
-          const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+          const cliPath = getCliPath();
           const result = await handleAddress(env, cliPath);
           console.log(JSON.stringify(result, null, 2));
         } catch (error: any) {
@@ -726,7 +737,7 @@ export default function register(api: any) {
       .action(async (options: any) => {
         try {
           const env = buildEnvironment(pluginConfig);
-          const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+          const cliPath = getCliPath();
           const result = await handleDiscover(options, env, cliPath);
           
           if (result.agents) {
@@ -755,7 +766,7 @@ export default function register(api: any) {
       .action(async () => {
         try {
           const env = buildEnvironment(pluginConfig);
-          const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+          const cliPath = getCliPath();
           const result = await handleRegister(env, cliPath);
           console.log(JSON.stringify(result, null, 2));
         } catch (error: any) {
@@ -771,7 +782,7 @@ export default function register(api: any) {
       .action(async (options: any) => {
         try {
           const env = buildEnvironment(pluginConfig);
-          const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+          const cliPath = getCliPath();
           const result = await handleOnboard(options, env, cliPath);
           console.log(JSON.stringify(result, null, 2));
         } catch (error: any) {
@@ -785,7 +796,7 @@ export default function register(api: any) {
       .action(async () => {
         try {
           const env = buildEnvironment(pluginConfig);
-          const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+          const cliPath = getCliPath();
           const result = await handlePendingRequests(env, cliPath);
           console.log(JSON.stringify(result, null, 2));
         } catch (error: any) {
@@ -798,7 +809,7 @@ export default function register(api: any) {
 async function executeOverlayAction(params: any, config: any, api: any) {
   const { action } = params;
   const env = buildEnvironment(config);
-  const cliPath = path.join(__dirname, 'dist', 'src', 'cli.js');
+  const cliPath = getCliPath();
 
   switch (action) {
     case "request":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-overlay-plugin",
-  "version": "0.7.44",
+  "version": "0.7.46",
   "description": "Openclaw BSV Overlay — agent discovery, service marketplace, and micropayments on the BSV blockchain",
   "publishConfig": {
     "access": "public"
@@ -24,7 +24,7 @@
     "cli": "node dist/cli.js",
     "test": "npx tsx src/**/*.test.ts",
     "lint": "eslint src/**/*.ts",
-    "postinstall": "node-gyp rebuild || echo 'Native build failed, see README'"
+    "postinstall": "node -e \"try{require('better-sqlite3')}catch{console.log('Note: better-sqlite3 requires build tools. If install failed, ensure python3 and a C++ compiler are available.')}\""
   },
   "dependencies": {
     "@bsv/sdk": "^2.0.13",
@@ -71,7 +71,7 @@
       "./dist/index.js"
     ],
     "hooks": [
-      "./"
+      "./dist/index.js"
     ],
     "compat": {
       "pluginApi": "1",

package/src/core/wallet.ts

@@ -79,7 +79,7 @@ export class BSVAgentWallet {
     // Generate a new root key (or use one provided in config)
     const rootKeyHex = config.rootKeyHex ?? PrivateKey.fromRandom().toHex();
     const rootKey = PrivateKey.fromHex(rootKeyHex);
-    const identityKey = rootKey.toPublicKey().toString();
+    const identityKey = rootKey.toPublicKey().toString(); // toString() defaults to compressed hex
 
     // Ensure the storage directory exists
     fs.mkdirSync(config.storageDir, { recursive: true });
@@ -103,9 +103,12 @@ export class BSVAgentWallet {
    * Load an existing agent wallet from its storage directory.
    * Reads the persisted identity file and re-initializes the wallet.
    */
-  static async load(config: WalletConfig): Promise<BSVAgentWallet> {
+  static async load(config: WalletConfig & { createIfMissing?: boolean }): Promise<BSVAgentWallet> {
     const identityPath = path.join(config.storageDir, IDENTITY_FILE);
     if (!fs.existsSync(identityPath)) {
+      if (config.createIfMissing === false) {
+        throw new Error(`No wallet found in ${config.storageDir}`);
+      }
       return this.create(config);
     }
 
@@ -146,7 +149,13 @@ export class BSVAgentWallet {
    * stopping the background monitor.
    */
   async destroy(): Promise<void> {
-    await this._setup.wallet.destroy();
+    if (this._setup.monitor) {
+      await this._setup.monitor.destroy();
+    }
+    if (this._setup.wallet) {
+      await this._setup.wallet.destroy();
+    }
+    await this._setup.storage.destroy();
   }
 
   // ---------------------------------------------------------------------------

package/src/test/wallet.test.ts

@@ -121,7 +121,7 @@ async function run() {
   await test('BSVAgentWallet.load throws for missing wallet', async () => {
     const tmpDir = path.join(os.tmpdir(), 'a2a-nonexistent-' + Date.now());
     try {
-      await BSVAgentWallet.load({ network: 'testnet', storageDir: tmpDir });
+      await BSVAgentWallet.load({ network: 'testnet', storageDir: tmpDir, createIfMissing: false } as any);
       throw new Error('Should have thrown');
     } catch (err: unknown) {
       const msg = err instanceof Error ? err.message : String(err);