callme-openclaw-plugin 1.0.7 → 1.0.8

package/openclaw.plugin.json

@@ -25,7 +25,6 @@
         "description": "Language code"
       }
     },
-    "required": ["apiKey"],
     "additionalProperties": false
   },
   "uiHints": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "callme-openclaw-plugin",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "OpenClaw plugin for callme.ai - hands-free voice calls with your AI assistant",
   "main": "index.js",
   "bin": {

package/setup.js

@@ -13,7 +13,6 @@ const readline = require('readline');
 const execAsync = promisify(exec);
 
 const OPENCLAW_DIR = path.join(process.env.HOME, '.openclaw');
-const PLUGIN_DIR = path.join(OPENCLAW_DIR, 'plugins', 'callme');
 const CONFIG_FILE = path.join(OPENCLAW_DIR, 'config.yaml');
 
 const rl = readline.createInterface({
@@ -47,91 +46,74 @@ async function main() {
     process.exit(1);
   }
   
-  // Step 3: Clean stale config first
-  console.log('\n🧹 Cleaning stale config...');
+  // Step 3: Install plugin FIRST (apiKey is optional in schema, so install won't fail)
+  console.log('\n📦 Installing plugin...');
   
-  if (fs.existsSync(CONFIG_FILE)) {
-    let config = fs.readFileSync(CONFIG_FILE, 'utf8');
-    
-    // Remove old callme entries (wrong structure)
-    config = config.replace(
-      /# callme\.ai Voice Plugin\s*\n/g,
-      ''
-    );
-    config = config.replace(
-      /^plugins:\s*\n\s*callme:[\s\S]*?(?=\n[a-zA-Z]|\n\n|$)/gm,
-      ''
-    );
-    
-    // Remove from plugins.entries too (if malformed)
-    config = config.replace(
-      /(\s+callme:\s*\n(?:\s+\w+:.*\n)*?)(?=\n\s{0,4}\w|$)/g,
-      ''
-    );
-    
-    fs.writeFileSync(CONFIG_FILE, config);
-    console.log('✅ Stale config removed');
+  try {
+    await execAsync('openclaw plugins install callme-openclaw-plugin 2>&1');
+    console.log('✅ Plugin installed');
+  } catch (error) {
+    // Check if it's already installed
+    if (error.message.includes('already installed')) {
+      console.log('✅ Plugin already installed');
+    } else {
+      console.error('❌ Failed to install plugin:', error.message);
+      console.log('\n📋 Manual fallback:');
+      console.log('  1. Run: openclaw plugins install callme-openclaw-plugin');
+      console.log('  2. Edit ~/.openclaw/config.yaml manually');
+      process.exit(1);
+    }
   }
   
-  // Step 4: Update config FIRST (before install)
+  // Step 4: Write config AFTER plugin install
   console.log('\n⚙️  Writing plugin config...');
   
-  const configAddition = `\nplugins:
-  entries:
-    callme:
+  if (!fs.existsSync(CONFIG_FILE)) {
+    console.error('❌ Config file not found at:', CONFIG_FILE);
+    console.log('Run: openclaw config');
+    process.exit(1);
+  }
+  
+  let config = fs.readFileSync(CONFIG_FILE, 'utf8');
+  
+  // Strategy: Find and replace or append
+  const callmeConfig = `    callme:
       enabled: true
       config:
         apiKey: "${apiKey}"
         defaultVoice: "nova"
-        language: "en"
-`;
-  
-  if (fs.existsSync(CONFIG_FILE)) {
-    let config = fs.readFileSync(CONFIG_FILE, 'utf8');
-    
-    if (config.includes('plugins:') && config.includes('entries:')) {
-      // plugins.entries exists, add callme under it
-      config = config.replace(
-        /(plugins:\s*\n\s*entries:\s*\n)/,
-        `$1    callme:\n      enabled: true\n      config:\n        apiKey: "${apiKey}"\n        defaultVoice: "nova"\n        language: "en"\n`
-      );
-    } else if (config.includes('plugins:')) {
-      // plugins exists but no entries, add entries section
-      config = config.replace(
-        /(plugins:\s*\n)/,
-        `$1  entries:\n    callme:\n      enabled: true\n      config:\n        apiKey: "${apiKey}"\n        defaultVoice: "nova"\n        language: "en"\n`
-      );
-    } else {
-      // No plugins section, append
-      config += configAddition;
-    }
-    
-    fs.writeFileSync(CONFIG_FILE, config);
+        language: "en"`;
+  
+  if (config.match(/plugins:\s*\n.*entries:\s*\n.*callme:/s)) {
+    // Replace existing callme section
+    config = config.replace(
+      /(\s+)callme:\s*\n(?:\s+.*\n)*/,
+      callmeConfig + '\n'
+    );
+  } else if (config.match(/plugins:\s*\n.*entries:/s)) {
+    // Add callme under existing entries
+    config = config.replace(
+      /(plugins:\s*\n.*entries:\s*\n)/s,
+      `$1${callmeConfig}\n`
+    );
+  } else if (config.match(/plugins:/)) {
+    // Add entries section with callme
+    config = config.replace(
+      /(plugins:\s*\n)/,
+      `$1  entries:\n${callmeConfig}\n`
+    );
   } else {
-    fs.mkdirSync(path.dirname(CONFIG_FILE), { recursive: true });
-    fs.writeFileSync(CONFIG_FILE, configAddition);
+    // Append full plugins section
+    config += `\nplugins:\n  entries:\n${callmeConfig}\n`;
   }
-  console.log('✅ Config written');
-  
-  // Step 5: Install plugin via OpenClaw CLI
-  console.log('\n📦 Installing plugin...');
   
-  try {
-    // Use OpenClaw's plugin installer (official method)
-    await execAsync('openclaw plugins install callme-openclaw-plugin');
-    console.log('✅ Plugin installed');
-  } catch (error) {
-    console.error('❌ Failed to install plugin:', error.message);
-    console.log('\n📋 Manual fallback:');
-    console.log('  1. Run: openclaw plugins install callme-openclaw-plugin');
-    console.log('  2. Restart gateway: openclaw gateway restart');
-    process.exit(1);
-  }
+  fs.writeFileSync(CONFIG_FILE, config);
+  console.log('✅ Config updated');
   
   // Done!
   console.log('\n✨ \x1b[1;32mSetup complete!\x1b[0m\n');
   
-  // Step 6: Offer to restart gateway
+  // Step 5: Offer to restart gateway
   const shouldRestart = await question('🔄 Restart OpenClaw Gateway now? (y/n): ');
   
   if (shouldRestart.toLowerCase() === 'y' || shouldRestart.toLowerCase() === 'yes') {