@paytaca/opencode-plugin 0.1.4 → 0.1.6

package/dist/proxy.js

@@ -48,10 +48,55 @@ const proxy_1 = require("./bundled/proxy");
 const wrapper_1 = require("./bundled/wrapper");
 // Store heartbeat interval reference
 let heartbeatInterval = null;
-// Get path to local paytaca binary
+// Get path to paytaca binary (multi-strategy resolution)
 function getPaytacaCommand() {
+    // Priority 1: Local node_modules (via require.resolve)
+    try {
+        const paytacaCliPkg = require.resolve('paytaca-cli/package.json');
+        return path.resolve(path.dirname(paytacaCliPkg), 'bin', 'paytaca.js');
+    }
+    catch { }
+    // Priority 2: Local .bin symlink
     const localPaytaca = path.join(__dirname, '..', 'node_modules', '.bin', 'paytaca');
-    return fs.existsSync(localPaytaca) ? localPaytaca : 'paytaca';
+    if (fs.existsSync(localPaytaca)) {
+        return localPaytaca;
+    }
+    // Priority 3: Global npm root
+    try {
+        const globalRoot = (0, child_process_1.execSync)('npm root -g', { encoding: 'utf8' }).trim();
+        const pathsToCheck = [
+            path.join(globalRoot, 'paytaca-cli', 'bin', 'paytaca.js'),
+            path.join(globalRoot, '@paytaca', 'opencode-plugin', 'node_modules', 'paytaca-cli', 'bin', 'paytaca.js'),
+        ];
+        for (const p of pathsToCheck) {
+            if (fs.existsSync(p)) {
+                return p;
+            }
+        }
+    }
+    catch { }
+    // Priority 4: Common global installation paths
+    const commonPaths = [
+        '/usr/lib/node_modules/paytaca-cli/bin/paytaca.js',
+        '/usr/local/lib/node_modules/paytaca-cli/bin/paytaca.js',
+        '/opt/homebrew/lib/node_modules/paytaca-cli/bin/paytaca.js',
+    ];
+    for (const p of commonPaths) {
+        if (fs.existsSync(p)) {
+            return p;
+        }
+    }
+    // Priority 5: which/where on PATH
+    try {
+        const which = process.platform === 'win32' ? 'where' : 'which';
+        const result = (0, child_process_1.execSync)(`${which} paytaca`, { encoding: 'utf8' }).trim().split('\n')[0];
+        if (result) {
+            return result;
+        }
+    }
+    catch { }
+    // Priority 6: Bare command (rely on PATH at runtime)
+    return 'paytaca';
 }
 async function isPortAvailable(port) {
     return new Promise((resolve) => {

package/dist/wallet.js

@@ -42,20 +42,65 @@ exports.importWallet = importWallet;
 exports.extractWalletHash = extractWalletHash;
 exports.getReceivingAddress = getReceivingAddress;
 exports.getWalletBalance = getWalletBalance;
+const child_process_1 = require("child_process");
 const fs = __importStar(require("fs"));
+const os = __importStar(require("os"));
 const util_1 = require("util");
 const path = __importStar(require("path"));
 const execAsync = (0, util_1.promisify)(require('child_process').exec);
+function getGlobalNpmRoot() {
+    try {
+        return (0, child_process_1.execSync)('npm root -g', { encoding: 'utf8' }).trim();
+    }
+    catch {
+        return null;
+    }
+}
 function getPaytacaCommand() {
+    // Priority 1: Local node_modules (via require.resolve)
     try {
         const paytacaCliPkg = require.resolve('paytaca-cli/package.json');
         return path.resolve(path.dirname(paytacaCliPkg), 'bin', 'paytaca.js');
     }
     catch { }
+    // Priority 2: Local .bin symlink
     const localPaytaca = path.join(__dirname, '..', 'node_modules', '.bin', 'paytaca');
     if (fs.existsSync(localPaytaca)) {
         return localPaytaca;
     }
+    // Priority 3: Global npm root
+    const globalRoot = getGlobalNpmRoot();
+    if (globalRoot) {
+        const globalPaytaca = path.join(globalRoot, 'paytaca-cli', 'bin', 'paytaca.js');
+        if (fs.existsSync(globalPaytaca)) {
+            return globalPaytaca;
+        }
+        const scopedPaytaca = path.join(globalRoot, '@paytaca', 'opencode-plugin', 'node_modules', 'paytaca-cli', 'bin', 'paytaca.js');
+        if (fs.existsSync(scopedPaytaca)) {
+            return scopedPaytaca;
+        }
+    }
+    // Priority 4: Common global installation paths
+    const commonPaths = [
+        '/usr/lib/node_modules/paytaca-cli/bin/paytaca.js',
+        '/usr/local/lib/node_modules/paytaca-cli/bin/paytaca.js',
+        '/opt/homebrew/lib/node_modules/paytaca-cli/bin/paytaca.js',
+    ];
+    for (const p of commonPaths) {
+        if (fs.existsSync(p)) {
+            return p;
+        }
+    }
+    // Priority 5: which/where on PATH
+    try {
+        const which = process.platform === 'win32' ? 'where' : 'which';
+        const result = (0, child_process_1.execSync)(`${which} paytaca`, { encoding: 'utf8' }).trim().split('\n')[0];
+        if (result) {
+            return result;
+        }
+    }
+    catch { }
+    // Priority 6: Bare command (rely on PATH at runtime)
     return 'paytaca';
 }
 const PAYTACA_CMD = getPaytacaCommand();
@@ -88,19 +133,47 @@ async function checkWallet() {
         };
     }
 }
+function addToPath(dir) {
+    if (dir && fs.existsSync(dir) && !process.env.PATH?.includes(dir)) {
+        process.env.PATH = `${dir}${path.delimiter}${process.env.PATH}`;
+    }
+}
 function ensurePaytacaOnPath() {
+    // Priority 1: Local node_modules .bin dir
     try {
         const paytacaCliPkg = require.resolve('paytaca-cli/package.json');
         const binDir = path.resolve(path.dirname(paytacaCliPkg), '..', '.bin');
         const paytacaBin = path.join(binDir, 'paytaca');
         if (fs.existsSync(paytacaBin)) {
-            if (!process.env.PATH?.includes(binDir)) {
-                process.env.PATH = `${binDir}${path.delimiter}${process.env.PATH}`;
-            }
+            addToPath(binDir);
             return binDir;
         }
     }
     catch { }
+    // Priority 2: Global npm root .bin dir
+    const globalRoot = getGlobalNpmRoot();
+    if (globalRoot) {
+        const globalBinDir = path.resolve(globalRoot, '..', '.bin');
+        const globalPaytaca = path.join(globalBinDir, 'paytaca');
+        if (fs.existsSync(globalPaytaca)) {
+            addToPath(globalBinDir);
+            return globalBinDir;
+        }
+    }
+    // Priority 3: Common global bin directories
+    const commonBinDirs = [
+        '/usr/local/bin',
+        '/usr/bin',
+        path.join(os.homedir(), '.npm-global', 'bin'),
+        process.env.NVM_BIN,
+    ].filter((p) => !!p);
+    for (const binDir of commonBinDirs) {
+        const paytacaBin = path.join(binDir, 'paytaca');
+        if (fs.existsSync(paytacaBin)) {
+            addToPath(binDir);
+            return binDir;
+        }
+    }
     return null;
 }
 async function checkPaytacaCli() {
@@ -116,44 +189,32 @@ async function createWallet() {
     try {
         // Generate a new wallet using paytaca CLI
         // This will create a wallet and display the mnemonic
-        const { stdout, stderr } = await execAsync(`"${PAYTACA_CMD}" wallet create --json`);
+        const { stdout, stderr } = await execAsync(`"${PAYTACA_CMD}" wallet create`);
         let output = stdout.toString();
         if (!output && stderr) {
             output = stderr.toString();
         }
-        // Try to parse JSON output if available
-        try {
-            const jsonOutput = JSON.parse(output);
-            if (jsonOutput.mnemonic) {
-                // Show warning to user
-                console.log('\\n⚠️  IMPORTANT: Your wallet has been created!');
-                console.log('\\nSAVE THIS RECOVERY PHRASE SECURELY:');
-                console.log('═'.repeat(60));
-                console.log(jsonOutput.mnemonic);
-                console.log('═'.repeat(60));
-                console.log('\\nWithout this phrase, you CANNOT recover your funds if you');
-                console.log('lose access to this device. Write it down and store it safely.\\n');
-                return {
-                    exists: true,
-                    hash: jsonOutput.hash,
-                    address: jsonOutput.address,
-                    balance: '0 BCH',
-                    mnemonic: jsonOutput.mnemonic
-                };
-            }
-        }
-        catch {
-            // Fall through to regex parsing
-        }
         // Parse from text output
         const hashMatch = output.match(/Wallet hash:\s*(.+)/i);
         const addressMatch = output.match(/Address:\s*(.+)/i);
-        const mnemonicMatch = output.match(/Recovery phrase[\s\S]*?([a-z]+(?:\s+[a-z]+){11,23})/i);
-        if (mnemonicMatch) {
+        // Extract mnemonic from numbered seed phrase list
+        const phraseSection = output.match(/Seed phrase:\s*\n([\s\S]*?)(?=\n\s*Wallet hash)/i);
+        let mnemonic = undefined;
+        if (phraseSection) {
+            const words = [];
+            for (const line of phraseSection[1].trim().split('\n')) {
+                const m = line.match(/^\s*\d+\.\s+(\w+)/);
+                if (m)
+                    words.push(m[1]);
+            }
+            if (words.length >= 12)
+                mnemonic = words.join(' ');
+        }
+        if (mnemonic) {
             console.log('\\n⚠️  IMPORTANT: Your wallet has been created!');
             console.log('\\nSAVE THIS RECOVERY PHRASE SECURELY:');
             console.log('═'.repeat(60));
-            console.log(mnemonicMatch[1]);
+            console.log(mnemonic);
             console.log('═'.repeat(60));
             console.log('\\nWithout this phrase, you CANNOT recover your funds if you');
             console.log('lose access to this device. Write it down and store it safely.\\n');
@@ -163,7 +224,7 @@ async function createWallet() {
             hash: hashMatch ? hashMatch[1].trim() : undefined,
             address: addressMatch ? addressMatch[1].trim() : undefined,
             balance: '0 BCH',
-            mnemonic: mnemonicMatch ? mnemonicMatch[1] : undefined
+            mnemonic
         };
     }
     catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paytaca/opencode-plugin",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "OpenCode plugin for Paytaca AI - AI inference provider powered by Bitcoin Cash micropayments",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/proxy.ts

@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import { spawn } from 'child_process';
+import { spawn, execSync } from 'child_process';
 import { Config, ProxyInfo } from './types';
 import { 
   getConfigDir, 
@@ -19,10 +19,57 @@ import { WRAPPER_SCRIPT_CONTENT } from './bundled/wrapper';
 // Store heartbeat interval reference
 let heartbeatInterval: NodeJS.Timeout | null = null;
 
-// Get path to local paytaca binary
+// Get path to paytaca binary (multi-strategy resolution)
 function getPaytacaCommand(): string {
+  // Priority 1: Local node_modules (via require.resolve)
+  try {
+    const paytacaCliPkg = require.resolve('paytaca-cli/package.json');
+    return path.resolve(path.dirname(paytacaCliPkg), 'bin', 'paytaca.js');
+  } catch {}
+
+  // Priority 2: Local .bin symlink
   const localPaytaca = path.join(__dirname, '..', 'node_modules', '.bin', 'paytaca');
-  return fs.existsSync(localPaytaca) ? localPaytaca : 'paytaca';
+  if (fs.existsSync(localPaytaca)) {
+    return localPaytaca;
+  }
+
+  // Priority 3: Global npm root
+  try {
+    const globalRoot = execSync('npm root -g', { encoding: 'utf8' }).trim();
+    const pathsToCheck = [
+      path.join(globalRoot, 'paytaca-cli', 'bin', 'paytaca.js'),
+      path.join(globalRoot, '@paytaca', 'opencode-plugin', 'node_modules', 'paytaca-cli', 'bin', 'paytaca.js'),
+    ];
+    for (const p of pathsToCheck) {
+      if (fs.existsSync(p)) {
+        return p;
+      }
+    }
+  } catch {}
+
+  // Priority 4: Common global installation paths
+  const commonPaths = [
+    '/usr/lib/node_modules/paytaca-cli/bin/paytaca.js',
+    '/usr/local/lib/node_modules/paytaca-cli/bin/paytaca.js',
+    '/opt/homebrew/lib/node_modules/paytaca-cli/bin/paytaca.js',
+  ];
+  for (const p of commonPaths) {
+    if (fs.existsSync(p)) {
+      return p;
+    }
+  }
+
+  // Priority 5: which/where on PATH
+  try {
+    const which = process.platform === 'win32' ? 'where' : 'which';
+    const result = execSync(`${which} paytaca`, { encoding: 'utf8' }).trim().split('\n')[0];
+    if (result) {
+      return result;
+    }
+  } catch {}
+
+  // Priority 6: Bare command (rely on PATH at runtime)
+  return 'paytaca';
 }
 
 export async function isPortAvailable(port: number): Promise<boolean> {

package/src/wallet.ts

@@ -1,22 +1,68 @@
-import { spawn } from 'child_process';
+import { spawn, execSync } from 'child_process';
 import * as fs from 'fs';
+import * as os from 'os';
 import { promisify } from 'util';
 import * as path from 'path';
 import { WalletInfo } from './types';
 
 const execAsync = promisify(require('child_process').exec);
 
+function getGlobalNpmRoot(): string | null {
+  try {
+    return execSync('npm root -g', { encoding: 'utf8' }).trim();
+  } catch {
+    return null;
+  }
+}
+
 function getPaytacaCommand(): string {
+  // Priority 1: Local node_modules (via require.resolve)
   try {
     const paytacaCliPkg = require.resolve('paytaca-cli/package.json');
     return path.resolve(path.dirname(paytacaCliPkg), 'bin', 'paytaca.js');
   } catch {}
 
+  // Priority 2: Local .bin symlink
   const localPaytaca = path.join(__dirname, '..', 'node_modules', '.bin', 'paytaca');
   if (fs.existsSync(localPaytaca)) {
     return localPaytaca;
   }
 
+  // Priority 3: Global npm root
+  const globalRoot = getGlobalNpmRoot();
+  if (globalRoot) {
+    const globalPaytaca = path.join(globalRoot, 'paytaca-cli', 'bin', 'paytaca.js');
+    if (fs.existsSync(globalPaytaca)) {
+      return globalPaytaca;
+    }
+    const scopedPaytaca = path.join(globalRoot, '@paytaca', 'opencode-plugin', 'node_modules', 'paytaca-cli', 'bin', 'paytaca.js');
+    if (fs.existsSync(scopedPaytaca)) {
+      return scopedPaytaca;
+    }
+  }
+
+  // Priority 4: Common global installation paths
+  const commonPaths = [
+    '/usr/lib/node_modules/paytaca-cli/bin/paytaca.js',
+    '/usr/local/lib/node_modules/paytaca-cli/bin/paytaca.js',
+    '/opt/homebrew/lib/node_modules/paytaca-cli/bin/paytaca.js',
+  ];
+  for (const p of commonPaths) {
+    if (fs.existsSync(p)) {
+      return p;
+    }
+  }
+
+  // Priority 5: which/where on PATH
+  try {
+    const which = process.platform === 'win32' ? 'where' : 'which';
+    const result = execSync(`${which} paytaca`, { encoding: 'utf8' }).trim().split('\n')[0];
+    if (result) {
+      return result;
+    }
+  } catch {}
+
+  // Priority 6: Bare command (rely on PATH at runtime)
   return 'paytaca';
 }
 
@@ -56,18 +102,51 @@ export async function checkWallet(): Promise<WalletInfo> {
   }
 }
 
+function addToPath(dir: string): void {
+  if (dir && fs.existsSync(dir) && !process.env.PATH?.includes(dir)) {
+    process.env.PATH = `${dir}${path.delimiter}${process.env.PATH}`;
+  }
+}
+
 export function ensurePaytacaOnPath(): string | null {
+  // Priority 1: Local node_modules .bin dir
   try {
     const paytacaCliPkg = require.resolve('paytaca-cli/package.json');
     const binDir = path.resolve(path.dirname(paytacaCliPkg), '..', '.bin');
     const paytacaBin = path.join(binDir, 'paytaca');
     if (fs.existsSync(paytacaBin)) {
-      if (!process.env.PATH?.includes(binDir)) {
-        process.env.PATH = `${binDir}${path.delimiter}${process.env.PATH}`;
-      }
+      addToPath(binDir);
       return binDir;
     }
   } catch {}
+
+  // Priority 2: Global npm root .bin dir
+  const globalRoot = getGlobalNpmRoot();
+  if (globalRoot) {
+    const globalBinDir = path.resolve(globalRoot, '..', '.bin');
+    const globalPaytaca = path.join(globalBinDir, 'paytaca');
+    if (fs.existsSync(globalPaytaca)) {
+      addToPath(globalBinDir);
+      return globalBinDir;
+    }
+  }
+
+  // Priority 3: Common global bin directories
+  const commonBinDirs = [
+    '/usr/local/bin',
+    '/usr/bin',
+    path.join(os.homedir(), '.npm-global', 'bin'),
+    process.env.NVM_BIN,
+  ].filter((p): p is string => !!p);
+
+  for (const binDir of commonBinDirs) {
+    const paytacaBin = path.join(binDir, 'paytaca');
+    if (fs.existsSync(paytacaBin)) {
+      addToPath(binDir);
+      return binDir;
+    }
+  }
+
   return null;
 }
 
@@ -84,48 +163,34 @@ export async function createWallet(): Promise<WalletInfo> {
   try {
     // Generate a new wallet using paytaca CLI
     // This will create a wallet and display the mnemonic
-    const { stdout, stderr } = await execAsync(`"${PAYTACA_CMD}" wallet create --json`);
+    const { stdout, stderr } = await execAsync(`"${PAYTACA_CMD}" wallet create`);
     
     let output = stdout.toString();
     if (!output && stderr) {
       output = stderr.toString();
     }
     
-    // Try to parse JSON output if available
-    try {
-      const jsonOutput = JSON.parse(output);
-      if (jsonOutput.mnemonic) {
-        // Show warning to user
-        console.log('\\n⚠️  IMPORTANT: Your wallet has been created!');
-        console.log('\\nSAVE THIS RECOVERY PHRASE SECURELY:');
-        console.log('═'.repeat(60));
-        console.log(jsonOutput.mnemonic);
-        console.log('═'.repeat(60));
-        console.log('\\nWithout this phrase, you CANNOT recover your funds if you');
-        console.log('lose access to this device. Write it down and store it safely.\\n');
-        
-        return {
-          exists: true,
-          hash: jsonOutput.hash,
-          address: jsonOutput.address,
-          balance: '0 BCH',
-          mnemonic: jsonOutput.mnemonic
-        };
-      }
-    } catch {
-      // Fall through to regex parsing
-    }
-    
     // Parse from text output
     const hashMatch = output.match(/Wallet hash:\s*(.+)/i);
     const addressMatch = output.match(/Address:\s*(.+)/i);
-    const mnemonicMatch = output.match(/Recovery phrase[\s\S]*?([a-z]+(?:\s+[a-z]+){11,23})/i);
     
-    if (mnemonicMatch) {
+    // Extract mnemonic from numbered seed phrase list
+    const phraseSection = output.match(/Seed phrase:\s*\n([\s\S]*?)(?=\n\s*Wallet hash)/i);
+    let mnemonic = undefined;
+    if (phraseSection) {
+      const words = [];
+      for (const line of phraseSection[1].trim().split('\n')) {
+        const m = line.match(/^\s*\d+\.\s+(\w+)/);
+        if (m) words.push(m[1]);
+      }
+      if (words.length >= 12) mnemonic = words.join(' ');
+    }
+    
+    if (mnemonic) {
       console.log('\\n⚠️  IMPORTANT: Your wallet has been created!');
       console.log('\\nSAVE THIS RECOVERY PHRASE SECURELY:');
       console.log('═'.repeat(60));
-      console.log(mnemonicMatch[1]);
+      console.log(mnemonic);
       console.log('═'.repeat(60));
       console.log('\\nWithout this phrase, you CANNOT recover your funds if you');
       console.log('lose access to this device. Write it down and store it safely.\\n');
@@ -136,7 +201,7 @@ export async function createWallet(): Promise<WalletInfo> {
       hash: hashMatch ? hashMatch[1].trim() : undefined,
       address: addressMatch ? addressMatch[1].trim() : undefined,
       balance: '0 BCH',
-      mnemonic: mnemonicMatch ? mnemonicMatch[1] : undefined
+      mnemonic
     };
   } catch (err: any) {
     console.error('Failed to create wallet:', err.message || err);

package/dist/package.json

@@ -1,43 +0,0 @@
-{
-  "name": "@paytaca/opencode-plugin",
-  "version": "0.1.0",
-  "description": "OpenCode plugin for Paytaca AI - BCH micropayment provider for DeepSeek V4 Flash",
-  "main": "index.js",
-  "types": "index.d.ts",
-  "engines": {
-    "node": ">=20.0.0"
-  },
-  "scripts": {
-    "build": "tsc",
-    "prepare": "npm run build"
-  },
-  "keywords": [
-    "opencode",
-    "plugin",
-    "paytaca",
-    "bch",
-    "ai",
-    "provider"
-  ],
-  "author": "Paytaca",
-  "license": "MIT",
-  "dependencies": {
-    "@opencode-ai/plugin": "^1.16.0",
-    "paytaca-cli": "^0.3.2"
-  },
-  "devDependencies": {
-    "@types/node": "^20.0.0",
-    "typescript": "^5.0.0"
-  },
-  "peerDependencies": {
-    "opencode": ">=1.0.0"
-  },
-  "peerDependenciesMeta": {
-    "opencode": {
-      "optional": true
-    }
-  },
-  "publishConfig": {
-    "access": "public"
-  }
-}