bb-signer 0.3.7 → 0.3.9

package/cli.js

@@ -27,6 +27,7 @@
 
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
 import { createInterface } from 'readline';
+import { execSync } from 'child_process';
 import { homedir } from 'os';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
@@ -39,6 +40,26 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
 const VERSION = JSON.parse(readFileSync(join(__dirname, 'package.json'), 'utf8')).version;
 
 // Editor definitions: paths, MCP config template, and detection directories
+function hasClaude() {
+  try {
+    execSync('claude --version', { stdio: 'pipe' });
+    return true;
+  } catch { return false; }
+}
+
+function installViaClaude(mcpConfig) {
+  // Remove existing servers first (ignore errors if they don't exist)
+  // Timeout prevents hanging when run from within a Claude Code session
+  for (const name of Object.keys(mcpConfig)) {
+    try { execSync(`claude mcp remove ${name}`, { stdio: 'pipe', timeout: 15000 }); } catch {}
+  }
+  // Add servers
+  for (const [name, config] of Object.entries(mcpConfig)) {
+    const args = config.args.map(a => `"${a}"`).join(' ');
+    execSync(`claude mcp add ${name} -- ${config.command} ${args}`, { stdio: 'pipe', timeout: 15000 });
+  }
+}
+
 const EDITORS = {
   'claude': {
     label: 'Claude Code',
@@ -48,6 +69,7 @@ const EDITORS = {
     ],
     detectDirs: [join(homedir(), '.claude')],
     configStyle: 'claude',
+    usesCli: true,  // prefer `claude mcp add` over settings.json
   },
   'claude-desktop': {
     label: 'Claude Desktop',
@@ -210,6 +232,15 @@ function applyEditorConfig(plan) {
   }
 }
 
+function fallbackToSettingsFile(ed, mcpConfig) {
+  const targetPath = ed.paths[0];
+  console.log(`\n${ed.label} config not found. Creating at ${targetPath}...`);
+  ensureDir(targetPath);
+  const settings = { mcpServers: { ...mcpConfig } };
+  writeFileSync(targetPath, JSON.stringify(settings, null, 2) + '\n');
+  console.log(`  ✅ ${ed.label}: Configured`);
+}
+
 async function resolveEditorFilter() {
   // Look for a non-flag argument after "install", e.g. `install gemini --yes`
   const installIdx = process.argv.indexOf('install');
@@ -276,57 +307,65 @@ async function install() {
     saveConfig({ ...config, proxy_url: "https://mcp.bb.org.ai" });
   }
 
-  // Step 3: Detect and plan config changes
+  // Step 3: Configure MCP servers
   const autoYes = process.argv.includes('--yes') || process.argv.includes('-y');
-
-  const editorKeys = [editorFilter];
-
-  const plans = editorKeys.map(key => {
-    const ed = EDITORS[key];
-    return planEditorConfig(ed.label, ed.paths, getMcpConfig(ed), ed.detectDirs);
-  }).filter(Boolean);
-
-  const changes = plans.filter(p => p.action !== 'up-to-date');
-  const upToDate = plans.filter(p => p.action === 'up-to-date');
-
-  if (changes.length === 0 && plans.length > 0) {
-    // Everything already configured
-    console.log('\nAI agent configs:');
-    for (const plan of upToDate) {
-      console.log(`  ✅ ${plan.name}: Up to date`);
+  const ed = EDITORS[editorFilter];
+  const mcpConfig = getMcpConfig(ed);
+
+  // For Claude Code: try `claude mcp add`, always also write settings.json as fallback.
+  // `claude mcp add` can hang when run from within a Claude Code bash session,
+  // so the settings.json write ensures config is always persisted.
+  if (ed.usesCli && hasClaude()) {
+    console.log('\nConfiguring via Claude CLI...');
+    try {
+      installViaClaude(mcpConfig);
+      console.log(`  ✅ ${ed.label}: Configured via \`claude mcp add\``);
+    } catch (e) {
+      console.error(`  ⚠️  \`claude mcp add\` failed: ${e.message}`);
     }
-  } else if (changes.length > 0) {
-    // Show what will change and ask confirmation
-    console.log('\nThe following config files will be modified:\n');
-    for (const plan of changes) {
-      const label = plan.action === 'create' ? 'create' : 'update bb + bb_signer';
-      console.log(`  ${plan.path}  (${label})`);
-    }
-    for (const plan of upToDate) {
-      console.log(`  ${plan.path}  (no changes needed)`);
+    // Always also write settings.json — belt and suspenders
+    const plan = planEditorConfig(ed.label, ed.paths, mcpConfig, ed.detectDirs);
+    if (plan) {
+      applyEditorConfig(plan);
+    } else {
+      fallbackToSettingsFile(ed, mcpConfig);
     }
+  } else {
+    // All other editors: write to config file
+    const plans = [planEditorConfig(ed.label, ed.paths, mcpConfig, ed.detectDirs)].filter(Boolean);
+    const changes = plans.filter(p => p.action !== 'up-to-date');
+    const upToDate = plans.filter(p => p.action === 'up-to-date');
+
+    if (changes.length === 0 && plans.length > 0) {
+      console.log('\nAI agent configs:');
+      for (const plan of upToDate) {
+        console.log(`  ✅ ${plan.name}: Up to date`);
+      }
+    } else if (changes.length > 0) {
+      console.log('\nThe following config files will be modified:\n');
+      for (const plan of changes) {
+        const label = plan.action === 'create' ? 'create' : 'update bb + bb_signer';
+        console.log(`  ${plan.path}  (${label})`);
+      }
+      for (const plan of upToDate) {
+        console.log(`  ${plan.path}  (no changes needed)`);
+      }
 
-    if (!autoYes) {
-      const proceed = await confirm('\nProceed? [Y/n] ');
-      if (!proceed) {
-        console.log('\nAborted. Run `npx bb-signer install` when ready.');
-        process.exit(0);
+      if (!autoYes) {
+        const proceed = await confirm('\nProceed? [Y/n] ');
+        if (!proceed) {
+          console.log('\nAborted. Run `npx bb-signer install` when ready.');
+          process.exit(0);
+        }
       }
-    }
 
-    console.log('\nConfiguring AI agents...');
-    for (const plan of plans) {
-      applyEditorConfig(plan);
+      console.log('\nConfiguring AI agents...');
+      for (const plan of plans) {
+        applyEditorConfig(plan);
+      }
+    } else {
+      fallbackToSettingsFile(ed, mcpConfig);
     }
-  } else {
-    // Specific editor requested but not detected — force create
-    const ed = EDITORS[editorFilter];
-    const targetPath = ed.paths[0];
-    console.log(`\n${ed.label} config not found. Creating at ${targetPath}...`);
-    ensureDir(targetPath);
-    const settings = { mcpServers: { ...getMcpConfig(ed) } };
-    writeFileSync(targetPath, JSON.stringify(settings, null, 2) + '\n');
-    console.log(`  ✅ ${ed.label}: Configured`);
   }
 
   // Step 4: Quick connectivity check
@@ -548,7 +587,7 @@ async function verifySocial() {
     const status = data.is_new_account ? 'New account created' : 'Agent linked to existing account';
     console.log('\n🎉 VERIFICATION SUCCESSFUL!\n');
     console.log(`${status}.`);
-    console.log(`Verified via ${data.platform} (@${data.username}).`);
+    console.log(`Verified via ${data.platform} (@${data.platform_handle}).`);
     console.log(`Credits: ${data.credits}`);
     console.log('\nYou can now publish events, create requests, and post bounties!');
   } catch (e) {

package/index.js

@@ -581,7 +581,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         success: true,
         status,
         platform: result.platform,
-        username: result.username,
+        username: result.platform_handle,
         credits: result.credits,
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bb-signer",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "description": "Minimal local signer for BB - signs events for the agent collaboration network",
   "type": "module",
   "main": "index.js",